Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CDN in a Box Makefile directory check #5653

Merged
merged 7 commits into from Mar 30, 2021

Conversation

@zrhoffman
Copy link
Member

@zrhoffman zrhoffman commented Mar 18, 2021

What does this PR (Pull Request) do?

This PR includes various improvements to the CDN in a Box Makefile:

  • Allows you to use the Makefile even if a parent directory name contains a space

  • Allows you to run the Makefile without needing to be in the CDN in a Box directory

  • This PR is not related to any Issue

Which Traffic Control components are affected by this PR?

  • CDN in a Box

What is the best way to verify this PR?

  • In ${GOPATH}/src/github.com/apache, rename the trafficcontrol directory to Traffic Control with a space.
  • In the Traffic Control directory, use the CDN in a Box Makefile to build the RPMs:
    make -f infrastructure/cdn-in-a-box/Makefile
  • Test the RPMs in CDN in a Box

If this is a bug fix, what versions of Traffic Control are affected?

The following criteria are ALL met by this PR

  • Building CDN in a Box is a sufficient test, additional tests are unnecessary
  • The CDN in a Box documentation page does not mention not being able to use spaces, documentation is unnecessary
  • An update to CHANGELOG.md is not necessary
  • This PR includes any and all required license headers
  • This PR DOES NOT FIX A SERIOUS SECURITY VULNERABILITY (see the Apache Software Foundation's security guidelines for details)
zrhoffman added 4 commits Mar 17, 2021
@zrhoffman zrhoffman changed the title Remove makefile dir check Remove CDN in a Box Makefile directory check Mar 18, 2021
Copy link
Contributor

@ocket8888 ocket8888 left a comment

make fails when run outside of the CDN-in-a-Box directory:

make: *** No rule to make target '../../dist/tomcat-9.0.43-11235.596a95d7.el8.x86_64.rpm', needed by 'traffic_router/tomcat.rpm'.  Stop.
infrastructure/cdn-in-a-box/Makefile Outdated Show resolved Hide resolved
@zrhoffman
Copy link
Member Author

@zrhoffman zrhoffman commented Mar 19, 2021

make fails when run outside of the CDN-in-a-Box directory:

make: *** No rule to make target '../../dist/tomcat-9.0.43-11235.596a95d7.el8.x86_64.rpm', needed by 'traffic_router/tomcat.rpm'.  Stop.

Fixed the Tomcat RPM target path in f7414d9.

@zrhoffman zrhoffman requested a review from ocket8888 Mar 19, 2021
@zrhoffman zrhoffman added the build label Mar 28, 2021
Copy link
Contributor

@ocket8888 ocket8888 left a comment

This works now

@ocket8888 ocket8888 merged commit 150cbdc into apache:master Mar 30, 2021
10 checks passed
10 checks passed
traffic_monitor
Details
weasel
Details
traffic_ops
Details
traffic_ops_ort
Details
traffic_portal
Details
traffic_router
Details
traffic_stats
Details
grove
Details
grovetccfg
Details
ciab-build
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants