-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Sync 1.5 excluders with master #4266
Sync 1.5 excluders with master #4266
Conversation
Two tasks for initializing group names for the byo playbooks was located in the common folder in the std_include.yml file. Byo dependencies should not be in the common folder. The two tasks have been removed from common/openshift-cluster/std_include.yml to a new file byo/openshift-cluster/initialize_groups.yml. All references where these tasks were included from either std_include.yml or other various files have been updated to use the byo initialize_groups.yml. The methodology implemented follows the pattern of having groups set up in byo then calling out to playbooks in common, which are common to all deployments.
aos-ci-test |
…ing control_plane/node upgrade' to 1.5
… to ignore excluders' to 1.5
34a0e68
to
abfb6e7
Compare
aos-ci-test |
@sdodson once atomic-openshift 3.3 is built with updates spec files, I will remove |
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.
This looks good. With backporting the intialize_groups.yml work, it might be advantageous to also include the CI syntax checking in #3938, maybe a separate PR since this is already so large.
[merge] |
I will integrate #3938 in a separate PR. I believe there will be more improvements to backport to 1.5 and lower branches. |
Evaluated for openshift ansible merge up to f9c243e |
[test]ing while waiting on the merge queue |
Evaluated for openshift ansible test up to f9c243e |
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible/176/) (Base Commit: b5ce040) |
continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/499/) (Base Commit: 82d88c6) |
That's a defect in the CI jobs. |
Updating excluders in 1.5 so they are in sync with master.
Supporting PRs:
This will require a lot of testing:
Questions:
Issues to open:
docker*1.12*
is still left inside/etc/yum.conf
even if 3.4 docker excluder excludes from 1.13. The docker-excluder needs to be unexcluded before it is upgraded and then re-excluded back). This needs to be catched in the CI for various upgrade scenarious (3.d -> 3.d, 3.3 -> 3.4, 3.4 -> 3.5)