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

Ensure atomic hosts prepull node image during pre-upgrade #10125

Merged

Conversation

michaelgugino
Copy link
Contributor

Currently, atomic hosts do not prepull the node image
during pre-upgrade step. This commit refactors image
prepulling to ensure it happens at the approriate times
for both install and upgrades and properly accounts for
atomic host.

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

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 18, 2018
@vrutkovs
Copy link
Member

/test gcp-major-upgrade

@@ -70,9 +69,11 @@
msg: "Restarting dnsmasq"
# changed_when: True required for debug tasks to trigger handlers.
changed_when: True
notify: restart dnsmasq
notify:
- systemctl daemon-reload
Copy link
Member

Choose a reason for hiding this comment

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

handler name should be reload systemd units

Currently, atomic hosts do not prepull the node image
during pre-upgrade step.  This commit refactors image
prepulling to ensure it happens at the approriate times
for both install and upgrades and properly accounts for
atomic host.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1629558
@michaelgugino
Copy link
Contributor Author

/test gcp-major-upgrade

@michaelgugino
Copy link
Contributor Author

/test gcp

Copy link
Member

@sdodson sdodson 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 Sep 18, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michaelgugino, sdodson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [michaelgugino,sdodson]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@michaelgugino
Copy link
Contributor Author

/cherrypick release-3.11

@openshift-cherrypick-robot

@michaelgugino: once the present PR merges, I will cherry-pick it on top of release-3.11 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.11

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.

@michaelgugino
Copy link
Contributor Author

/cherrypick release-3.10

@openshift-cherrypick-robot

@michaelgugino: once the present PR merges, I will cherry-pick it on top of release-3.10 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.10

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.

@michaelgugino
Copy link
Contributor Author

Looks like flake.

/test gcp-major-upgrade

@openshift-cherrypick-robot

@michaelgugino: new pull request created: #10135

In response to this:

/cherrypick release-3.11

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.

@openshift-cherrypick-robot

@michaelgugino: #10125 failed to apply on top of branch "release-3.10":

Using index info to reconstruct a base tree...
M	roles/openshift_node/tasks/config.yml
M	roles/openshift_node/tasks/main.yml
M	roles/openshift_node/tasks/node_system_container.yml
A	roles/openshift_node/tasks/prepull.yml
M	roles/openshift_node/tasks/upgrade.yml
M	roles/openshift_node/tasks/upgrade/config_changes.yml
M	roles/openshift_node/tasks/upgrade_pre.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/openshift_node/tasks/upgrade_pre.yml
CONFLICT (content): Merge conflict in roles/openshift_node/tasks/upgrade_pre.yml
Auto-merging roles/openshift_node/tasks/upgrade/config_changes.yml
Auto-merging roles/openshift_node/tasks/upgrade.yml
CONFLICT (modify/delete): roles/openshift_node/tasks/prepull.yml deleted in HEAD and modified in Ensure atomic hosts prepull node image during pre-upgrade. Version Ensure atomic hosts prepull node image during pre-upgrade of roles/openshift_node/tasks/prepull.yml left in tree.
Auto-merging roles/openshift_node/tasks/node_system_container.yml
CONFLICT (content): Merge conflict in roles/openshift_node/tasks/node_system_container.yml
Auto-merging roles/openshift_node/tasks/main.yml
Auto-merging roles/openshift_node/tasks/config.yml
error: Failed to merge in the changes.
Patch failed at 0001 Ensure atomic hosts prepull node image during pre-upgrade

In response to this:

/cherrypick release-3.10

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.

@openshift-ci-robot
Copy link

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

Test name Commit Details Rerun command
ci/prow/gcp 783085a link /test gcp

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants