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

Sync 1.5 excluders with master #4266

Merged

Conversation

ingvagabund
Copy link
Member

@ingvagabund ingvagabund commented May 23, 2017

Updating excluders in 1.5 so they are in sync with master.
Supporting PRs:

This will require a lot of testing:

  • - test 3.3 deployment
  • - test 3.4 deployment
  • - test 3.5 deployment
  • - test 3.3 -> 3.4 upgrade
  • - test 3.3 -> 3.4 upgrade (node only)
  • - test 3.3 -> 3.4 upgrade (control plane only)
  • - test 3.4 -> 3.5 upgrade
  • - test 3.4 -> 3.5 upgrade (node only)
  • - test 3.4 -> 3.5 upgrade (control plane only)
  • - test 3.5 -> 3.5 upgrade
  • - test 3.5 -> 3.5 upgrade (node only)
  • - test 3.5 -> 3.5 upgrade (control plane only)
  • - test 3.3 node scale up
  • - test 3.4 node scale up
  • - test 3.5 node scale up
  • - test 3.3 master scale up
  • - test 3.4 master scale up
  • - test 3.5 master scale up

Questions:

  • - do we have python-ruamel-yaml in 3.3 and 3.4 repos?

Issues to open:

  • - extend repoquery to cover dnf as well (currently, it is yum based systems only)
  • - docker excluder is not correctly upgraded from 3.3 to 3.4 (3.3 docker excluder excludes 1.12, once it gets updated to 3.4, the 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)

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.
@ingvagabund
Copy link
Member Author

aos-ci-test

@ingvagabund ingvagabund changed the title Sync excluders with master Sync 1.5 excluders with master May 23, 2017
@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for 427ec67 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for 427ec67 (logs)

@ingvagabund ingvagabund changed the title Sync 1.5 excluders with master WIP: Sync 1.5 excluders with master May 23, 2017
@ingvagabund ingvagabund force-pushed the sync-excluders-with-master branch from 34a0e68 to abfb6e7 Compare May 31, 2017 11:25
@ingvagabund
Copy link
Member Author

aos-ci-test

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for f9c243e (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for f9c243e (logs)

@ingvagabund ingvagabund changed the title WIP: Sync 1.5 excluders with master Sync 1.5 excluders with master Jun 1, 2017
@ingvagabund ingvagabund requested review from sdodson and mtnbikenc June 1, 2017 13:27
@ingvagabund
Copy link
Member Author

@sdodson once atomic-openshift 3.3 is built with updates spec files, I will remove disable docker-excluder during its upgrade commit.

Copy link
Member

@mtnbikenc mtnbikenc 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. 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.

@ingvagabund
Copy link
Member Author

[merge]

@ingvagabund
Copy link
Member Author

I will integrate #3938 in a separate PR. I believe there will be more improvements to backport to 1.5 and lower branches.

@openshift-bot
Copy link

Evaluated for openshift ansible merge up to f9c243e

@openshift-bot
Copy link

[test]ing while waiting on the merge queue

@openshift-bot
Copy link

Evaluated for openshift ansible test up to f9c243e

@openshift-bot
Copy link

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible/176/) (Base Commit: b5ce040)

@openshift-bot
Copy link

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/499/) (Base Commit: 82d88c6)

@sdodson sdodson merged commit 5966de8 into openshift:release-1.5 Jun 2, 2017
@sdodson
Copy link
Member

sdodson commented Jun 2, 2017

That's a defect in the CI jobs.

@ingvagabund ingvagabund deleted the sync-excluders-with-master branch June 3, 2017 08:48
This was referenced Jun 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants