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

[release-4.10] Bug 2089757: configure-ovs: avoid restarting NetworkManager #3159

Merged

Conversation

jcaamano
Copy link
Contributor

Cherry-pick of #3120 c6c9288

Signed-off-by: Jaime Caamaño Ruiz jcaamano@redhat.com
(cherry picked from commit cc8a2c5)

- What I did

- How to verify it

- Description for the changelog

@jcaamano
Copy link
Contributor Author

/cherry-pick release-4.9

@openshift-ci openshift-ci bot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label May 24, 2022
@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-4.9

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 openshift-ci bot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 24, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 24, 2022

@jcaamano: This pull request references Bugzilla bug 2089757, which is invalid:

  • expected dependent Bugzilla bug 2078866 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.10] Bug 2089757: configure-ovs: avoid restarting NetworkManager

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.

Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

general sanity check seems fine. I see this also brings in a few bits from jcaamano@ebf1072

Which is I guess why you had to manually cherry pick?

I see this also removes the changes in #3154. Should that PR be consolidated?

@jcaamano
Copy link
Contributor Author

general sanity check seems fine. I see this also brings in a few bits from jcaamano@ebf1072

Which is I guess why you had to manually cherry pick?

Yup, I picked a couple of things from there.

I see this also removes the changes in #3154. Should that PR be consolidated?

Yup, that's a good idea. I will.

@jcaamano
Copy link
Contributor Author

I see this also removes the changes in #3154. Should that PR be consolidated?

Yup, that's a good idea. I will.

As clarification, the changes on this PR supersede #3154.

@jcaamano
Copy link
Contributor Author

/test ?

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 25, 2022

@jcaamano: The following commands are available to trigger required jobs:

  • /test 4.10-upgrade-from-stable-4.9-images
  • /test cluster-bootimages
  • /test e2e-agnostic-upgrade
  • /test e2e-aws
  • /test e2e-gcp-op
  • /test images
  • /test okd-images
  • /test unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test 4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
  • /test bootstrap-unit
  • /test e2e-aws-disruptive
  • /test e2e-aws-ovn-workers-rhel8
  • /test e2e-aws-proxy
  • /test e2e-aws-serial
  • /test e2e-aws-single-node
  • /test e2e-aws-upgrade
  • /test e2e-aws-upgrade-single-node
  • /test e2e-aws-workers-rhel8
  • /test e2e-azure
  • /test e2e-azure-ovn-upgrade
  • /test e2e-azure-upgrade
  • /test e2e-gcp-op-single-node
  • /test e2e-gcp-single-node
  • /test e2e-gcp-upgrade
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-openstack
  • /test e2e-openstack-parallel
  • /test e2e-ovirt
  • /test e2e-ovirt-upgrade
  • /test e2e-ovn-step-registry
  • /test e2e-vsphere
  • /test e2e-vsphere-upgrade
  • /test e2e-vsphere-upi
  • /test okd-e2e-aws
  • /test okd-e2e-gcp-op
  • /test okd-e2e-upgrade
  • /test okd-e2e-vsphere

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-machine-config-operator-release-4.10-4.10-upgrade-from-stable-4.9-images
  • pull-ci-openshift-machine-config-operator-release-4.10-bootstrap-unit
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-agnostic-upgrade
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-aws
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-aws-disruptive
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-aws-ovn-workers-rhel8
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-aws-serial
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-aws-single-node
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-aws-upgrade-single-node
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-aws-workers-rhel8
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-gcp-op
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-gcp-op-single-node
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-metal-ipi
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-ovn-step-registry
  • pull-ci-openshift-machine-config-operator-release-4.10-e2e-vsphere-upgrade
  • pull-ci-openshift-machine-config-operator-release-4.10-images
  • pull-ci-openshift-machine-config-operator-release-4.10-okd-e2e-aws
  • pull-ci-openshift-machine-config-operator-release-4.10-okd-e2e-gcp-op
  • pull-ci-openshift-machine-config-operator-release-4.10-okd-e2e-upgrade
  • pull-ci-openshift-machine-config-operator-release-4.10-okd-images
  • pull-ci-openshift-machine-config-operator-release-4.10-unit
  • pull-ci-openshift-machine-config-operator-release-4.10-verify

In response to this:

/test ?

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.

@jcaamano
Copy link
Contributor Author

/test 4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
/test e2e-aws-ovn-workers-rhel8
/test e2e-azure-ovn-upgrade
/test e2e-metal-ipi-ovn-dualstack
/test e2e-metal-ipi-ovn-ipv6
/test e2e-ovn-step-registry

@jcaamano
Copy link
Contributor Author

/test e2e-aws-ovn-workers-rhel8
/test e2e-azure-ovn-upgrade

@andreaskaris
Copy link
Contributor

andreaskaris commented May 27, 2022

/lgtm

Nit: can you change the commit message to add

Conflicts:
 <file name> 

or something else to indicate that this is not a clean bp (for future time travelers)?

The conflicts that I found are minor and are around:

  • line 205 connection.autoconnect-slaves 1
  • around line 360, 385, 397, 425 where you brought 4.10 and 4.11 in line

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 27, 2022
@openshift-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 28, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 28, 2022

@openshift-bot: This pull request references Bugzilla bug 2089757, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.z) matches configured target release for branch (4.10.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2078866 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2078866 targets the "4.11.0" release, which is one of the valid target releases: 4.11.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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.

Conflicts:
  templates/common/_base/files/configure-ovs-network.yaml

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit cc8a2c5)
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 30, 2022
@jcaamano
Copy link
Contributor Author

/test 4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
/test e2e-aws-ovn-workers-rhel8
/test e2e-azure-ovn-upgrade
/test e2e-metal-ipi-ovn-dualstack
/test e2e-metal-ipi-ovn-ipv6
/test e2e-ovn-step-registry

@andreaskaris
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 30, 2022
@yuqi-zhang
Copy link
Contributor

testing if lgtm applies approval now
/label backport-risk-assessed
/lgtm

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 30, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 30, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andreaskaris, jcaamano, yuqi-zhang

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 30, 2022
@sinnykumari
Copy link
Contributor

Needs cherry-pick approval
/assign @rbbratta

@rbbratta
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 31, 2022
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 2 against base HEAD 677c385 and 8 for PR HEAD 715393a in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 1 against base HEAD 677c385 and 7 for PR HEAD 715393a in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 677c385 and 6 for PR HEAD 715393a in total

@jcaamano
Copy link
Contributor Author

jcaamano commented Jun 1, 2022

/retest-required

@jcaamano
Copy link
Contributor Author

jcaamano commented Jun 1, 2022

@sinnykumari we may need an override on the e2e-agnostic-upgrade jobs, it's been failing for a while.

@sinnykumari
Copy link
Contributor

/skip
Before overriding will let upgrade test run once more since this has never passed on this PR.
/retest

@sinnykumari
Copy link
Contributor

Checking if upgrade passes at least on one of the platform
/test e2e-gcp-upgrade
/test e2e-aws-upgrade

@sinnykumari
Copy link
Contributor

Both e2e-aws-upgrade and e2e-gcp-upgrade test passed on this PR. Overriding flaky e2e-agnostic-upgrade test(runs on Azure) test so that this important fix can get merged.
/override ci/prow/e2e-agnostic-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2022

@sinnykumari: Overrode contexts on behalf of sinnykumari: ci/prow/e2e-agnostic-upgrade

In response to this:

Both e2e-aws-upgrade and e2e-gcp-upgrade test passed on this PR. Overriding flaky e2e-agnostic-upgrade test(runs on Azure) test so that this important fix can get merged.
/override ci/prow/e2e-agnostic-upgrade

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
Copy link
Contributor

openshift-ci bot commented Jun 1, 2022

@jcaamano: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-agnostic-upgrade 715393a link true /test e2e-agnostic-upgrade
ci/prow/e2e-azure-ovn-upgrade 715393a link false /test e2e-azure-ovn-upgrade
ci/prow/e2e-aws-disruptive 715393a link false /test e2e-aws-disruptive
ci/prow/e2e-aws-upgrade-single-node 715393a link false /test e2e-aws-upgrade-single-node
ci/prow/okd-e2e-gcp-op 715393a link false /test okd-e2e-gcp-op

Full PR test history. Your PR dashboard.

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.

@sinnykumari
Copy link
Contributor

Skip optional tests
/skip

@openshift-merge-robot openshift-merge-robot merged commit 7152adb into openshift:release-4.10 Jun 1, 2022
29 checks passed
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2022

@jcaamano: All pull requests linked via external trackers have merged:

Bugzilla bug 2089757 has been moved to the MODIFIED state.

In response to this:

[release-4.10] Bug 2089757: configure-ovs: avoid restarting NetworkManager

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

@jcaamano: #3159 failed to apply on top of branch "release-4.9":

Applying: configure-ovs: avoid restarting NetworkManager
.git/rebase-apply/patch:183: trailing whitespace.
    
.git/rebase-apply/patch:193: trailing whitespace.
          # keep track if a profile by the same name as the device existed 
.git/rebase-apply/patch:196: trailing whitespace.
          
.git/rebase-apply/patch:242: trailing whitespace.
      
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	templates/common/_base/files/configure-ovs-network.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/common/_base/files/configure-ovs-network.yaml
CONFLICT (content): Merge conflict in templates/common/_base/files/configure-ovs-network.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 configure-ovs: avoid restarting NetworkManager
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.9

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.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants