-
Notifications
You must be signed in to change notification settings - Fork 60
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
Fixing platform jobs to a set version of adop-platform-management #11
Conversation
@nickdgriffin as far as i see, dependencies already was merged, could you please provide an update here to understand what's left to let this PR to be merged. Thank you. |
Going to mark this as WIP, because I think there was an issue with a similar change in Load_Platform that I haven't solved yet. |
44496e5
to
14e0fbb
Compare
I think this is ready for review/testing now, I'll remove the WIP marker once someone has given it a look over and I've had a think about if there are likely to be any backwards compatibility issues. Once this is ready to be merged I will submit a PR to change this line to the correct commit ID first so that we don't immediately break the jobs: https://github.com/Accenture/adop-docker-compose/blob/master/docker-compose.yml#L213 |
Accenture/adop-jenkins#41 has been merged, so I'll retest this soon. |
I've finally removed the WIP flag! I think this is ready for review, there are details above but please point out if I've left any gaping holes. Once this has been merged I'll prepare a PR to adop-docker-compose that includes the addition of ADOP_PLATFORM_MANAGEMENT_VERSION set to the commit ID of the merge commit that results from this PR, and then the only other dependency required is Accenture/adop-docker-compose#253. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested all mentioned scenarios with Jenkins image version 0.2.7. Load Platform works as expected. Dependency required - Accenture/adop-docker-compose#253
Test 1
Results:
|
Test 2
All jobs were successful:
|
Test 3
Results: All jobs were successful on each run of Load_Platform once ADOP_PLATFORM_MANAGEMENT_VERSION was changed:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are missing some jobs from the "Platform Management" folder which also need the snippet of code in there to checkout the set version:
- Job_Runner
- Load_Platform_Extension
- Load_Platform_Extension_Collection
- Setup_Pluggable_Library
@dsingh07 : None of those jobs use adop-platform-management, but they'll be generated from the version of adop-platform-management that is checked out when Load_Platform is run.
|
Thanks @nickdgriffin. This looks good to me. The only thing I noticed, was that upgrading from adop-jenkins 0.2.6 to 0.2.7 the Load_Platform job is not updated. To solve this, in the future, I suggest the Load_Platform job is copied as part of the adop-jenkins entry-point. I have tested this with DOA and it's backwards compatible. Merging! |
Updating the platform jobs to use the ADOP_PLATFORM_MANAGEMENT_VERSION to know what to checkout from adop-platform-management. If ADOP_PLATFORM_MANAGEMENT_VERSION has not been set in Jenkins then it will default to the old value of "*/master".
Originally I wanted to support using tags, but there's a problem with that because whilst the jobs that consume this repository can checkout a tag Load_Platform won't be able to push the tags because Gerrit won't allow it when it is first launched and I'm not keen on running another job after the access control job has run. So for now it will support commit IDs in ADOP_PLATFORM_MANAGEMENT_VERSION.
This depends on the following PRs:
Adding ADOP_PLATFORM_MANAGEMENT_VERSION global variable & tag pushing in Load_Platform adop-jenkins#12Adding ADOP_PLATFORM_MANAGEMENT_VERSION to Jenkins adop-docker-compose#61Removing ADOP_PLATFORM_MANAGEMENT_VERSION adop-docker-compose#185Load_Platform: Using ADOP_PLATFORM_MANAGEMENT_VERSION if specified adop-jenkins#41Expected behaviour:
To test:
To test and simulate the adop-docker-compose PR that will come from this?