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

Run init/facts for docker upgrade #7026

Conversation

michaelgugino
Copy link
Contributor

playbooks/init fact plays must almost always
be run.

This commit adds the init code in the necessary
position to ensure that the facts are run.

This commit also cleans up booleans to use
multi-line lists instead of 'and' conditions.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542397

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 6, 2018
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.

Bringing init/main.yml in at this point causes evaluate_groups.yml to be run a third time. It might be better to move init/main.yml up to byo/openshift-cluster/upgrades/docker/upgrade.yml and pass in the vars for keeping g_new_*_hosts empty. That way we run through evaluate_groups once. Ultimately, I think this docker upgrade stuff should be refactored to go into the playbooks/container_runtime component once we get to upgrade refactoring.

@michaelgugino
Copy link
Contributor Author

Bringing init/main.yml in at this point causes evaluate_groups.yml to be run a third time. It might be better to move init/main.yml up to byo/openshift-cluster/upgrades/docker/upgrade.yml and pass in the vars for keeping g_new_*_hosts empty. That way we run through evaluate_groups once. Ultimately, I think this docker upgrade stuff should be refactored to go into the playbooks/container_runtime component once we get to upgrade refactoring.

@mtnbikenc evaluate_groups runs as an action on localhost. Running evaluate_groups multiple times adds a very trivial amount of tasks and runtime.

I don't want to do any more refactoring this cycle. The alternative to this patch would be to manually include the facts plays. Which do you prefer?

@mtnbikenc
Copy link
Member

I'd like this approach to change when we refactor upgrades. For now, I think the evaluate_groups.yml should be removed from the byo entry point because not allowing hosts to be added is not being enforced.

https://github.com/openshift/openshift-ansible/blob/master/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml#L3

playbooks/init fact plays must almost always
be run.

This commit adds the init code in the necessary
position to ensure that the facts are run.

This commit also cleans up booleans to use
multi-line lists instead of 'and' conditions.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542397
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 15, 2018
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.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2018
@michaelgugino
Copy link
Contributor Author

/test gcp

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-ci-robot
Copy link

@michaelgugino: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/gcp 4317a7b link /test gcp
ci/openshift-jenkins/logging 4317a7b link /test logging

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@michaelgugino michaelgugino merged commit 408bc7e into openshift:master Feb 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants