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

Giving ort its own build #2776

Merged
merged 18 commits into from
Jun 11, 2020
Merged

Conversation

ocket8888
Copy link
Contributor

@ocket8888 ocket8888 commented Aug 30, 2018

What does this PR do?

Pulls the build for a traffic_ops_ort.*.rpm out of the build for a traffic_ops.*.rpm and
makes it its own build process. This won't affect a full build of the entire project, but
building Traffic Ops won't build the ort rpm anymore. That must be done explicitly with
the traffic_ops_ort_build job.

Which TC components are affected by this PR?

  • Documentation
  • Grove
  • Traffic Analytics
  • Traffic Monitor
  • Traffic Ops
  • Traffic Ops ORT
  • Traffic Portal
  • Traffic Router
  • Traffic Stats
  • Traffic Vault
  • Other _________

What is the best way to verify this PR?

sudo ./pkg traffic_ops_build traffic_ops_ort_build

and then verify each generated rpm is valid by e.g. installing it and running any/all tests

Check all that apply

  • This PR includes tests
  • This PR includes documentation updates
  • This PR includes an update to CHANGELOG.md
  • This PR includes all required license headers
  • This PR includes a database migration (ensure that migration sequence is correct)
  • This PR fixes a serious security flaw. Read more: www.apache.org/security

@mitchell852 mitchell852 added Traffic Ops related to Traffic Ops Traffic Ops ORT *DEPRECATED* related to the traffic_ops_ort.pl script labels Aug 30, 2018
@asfgit
Copy link
Contributor

asfgit commented Aug 31, 2018

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/trafficcontrol-PR/2370/
Test PASSed.

@mitchell852 mitchell852 added the build related to the build process label Mar 6, 2019
@zrhoffman
Copy link
Member

zrhoffman commented May 1, 2020

This is a good idea. Happy to review once the merge conflicts are fixed.

@zrhoffman zrhoffman mentioned this pull request May 1, 2020
7 tasks
@ocket8888 ocket8888 force-pushed the giving-ort-its-own-build branch from d4962ab to 66dd0d9 Compare May 1, 2020 22:03
@ocket8888
Copy link
Contributor Author

conflicts have been fixed.

Copy link
Member

@zrhoffman zrhoffman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything changed looks good (still need to test). Verified that all of the import path changes are correct by dragging/dropping traffic_ops/ort/atstccfg to traffic_ops_ort in Goland and letting it resolve references.

In addition to the files changed, the ORT path still needs to be changed in 2 files:

  • tools/golang/unit-tests.sh
  • docs/source/tools/atstccfg.rst

traffic_ops_ort/build/build_rpm.sh Outdated Show resolved Hide resolved
Copy link
Member

@zrhoffman zrhoffman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In addition to the TO build script changes mentioned, pkg should now have a docker-compose pull right before the docker-compose build so people with an older prebuilt trafficcontrol/traffic_ops_builder image do not get Traffic Ops build failures. That addition can be a separate PR but needs to be added before this PR is merged to avoid an unnecessary breaking change.

traffic_ops/build/build_rpm.sh Outdated Show resolved Hide resolved
traffic_ops/build/build_rpm.sh Outdated Show resolved Hide resolved
@zrhoffman
Copy link
Member

This PR has merge conflicts since #4557 was merged.

@ocket8888 ocket8888 force-pushed the giving-ort-its-own-build branch from 96a71e7 to 3bb88f6 Compare June 11, 2020 03:27
@ocket8888 ocket8888 force-pushed the giving-ort-its-own-build branch from 1974752 to bbba3c1 Compare June 11, 2020 20:25
pkg Outdated Show resolved Hide resolved
Copy link
Member

@zrhoffman zrhoffman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good.

  • Verified import changes
  • No ORT-related files left behind (except ToORTCheck.pl, which is a TO extension)
  • Traffic Ops and Traffic Ops ORT RPMs build
  • RPM file lists are identical, including source RPMs
  • Disabling compiler optimizations for debug builds still works for Traffic Ops and Traffic Ops ORT
  • Traffic Ops ORT unit tests pass (no need to test Traffic Ops, there were no TO code changes)

@mitchell852 mitchell852 merged commit aa03fd3 into apache:master Jun 11, 2020
@ocket8888 ocket8888 deleted the giving-ort-its-own-build branch June 11, 2020 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build related to the build process Traffic Ops ORT *DEPRECATED* related to the traffic_ops_ort.pl script Traffic Ops related to Traffic Ops
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants