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

OCPBUGS-22324: Revert "Revert "Merge pull request #4028 from cybertron/wait-for-br-ex"" #4079

Merged

Conversation

cybertron
Copy link
Member

This reverts commit c558cc6 and adds a commit to fix the problem that prompted the revert in the first place. Now the service will be disabled for all CNI plugins except OVNKubernetes.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 14, 2023
Copy link
Contributor

openshift-ci bot commented Dec 14, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@cybertron cybertron changed the title Revert "Revert "Merge pull request #4028 from cybertron/wait-for-br-ex"" OCPBUGS-22324: Revert "Revert "Merge pull request #4028 from cybertron/wait-for-br-ex"" Dec 14, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 14, 2023
@openshift-ci-robot
Copy link
Contributor

@cybertron: This pull request references Jira Issue OCPBUGS-22324, which is invalid:

  • expected the bug to target either version "4.16." or "openshift-4.16.", but it targets "4.15.0" instead

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This reverts commit c558cc6 and adds a commit to fix the problem that prompted the revert in the first place. Now the service will be disabled for all CNI plugins except OVNKubernetes.

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.

@cybertron
Copy link
Member Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 14, 2023
@openshift-ci-robot
Copy link
Contributor

@cybertron: This pull request references Jira Issue OCPBUGS-22324, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (yprokule@redhat.com), skipping review request.

In response to this:

/jira refresh

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.

@cybertron
Copy link
Member Author

/test e2e-metal-ipi
/test e2e-metal-ipi-ovn-dualstack

Leaving as draft until I confirm that we've run the necessary payload jobs to verify the fix.

@cybertron
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.15-e2e-metal-ipi-sdn-bm

Looks like the metal-ipi jobs failed to acquire a test env. Unrelated to this change.

Copy link
Contributor

openshift-ci bot commented Dec 14, 2023

@cybertron: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.15-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2ec02870-9ad9-11ee-83b0-f56a0071c00a-0

@neisw
Copy link
Contributor

neisw commented Dec 15, 2023

@cybertron - I missed this in my slack comment but your probably need to run the 4.16 job now sorry about that.

payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

@cybertron
Copy link
Member Author

Ah, yeah that makes sense.

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

Copy link
Contributor

openshift-ci bot commented Dec 15, 2023

@cybertron: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/34f58760-9b71-11ee-910c-9784f1475145-0

@cybertron
Copy link
Member Author

/test e2e-metal-ipi-ovn-dualstack
/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

Looks like there were metal infra issues around the time these jobs were last run. Let's see if they pass now.

Copy link
Contributor

openshift-ci bot commented Jan 2, 2024

@cybertron: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/bdc4b320-a9ba-11ee-960e-5f3a9df97ee3-0

@cybertron
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

Copy link
Contributor

openshift-ci bot commented Jan 15, 2024

@cybertron: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/542f5d60-b3ca-11ee-9e77-3535e5226427-0

@cybertron
Copy link
Member Author

/test e2e-metal-ipi

@cybertron
Copy link
Member Author

Looks like the e2e jobs are passing now. The payload job failed on a name mismatch which has nothing to do with this. I'll have to see what's going on there.

@cybertron
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

Copy link
Contributor

openshift-ci bot commented Jan 18, 2024

@cybertron: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2863d650-b629-11ee-8c26-402fb7586591-0

@cybertron
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

Looks like node provisioning failed this time, so we never got to the point where this would run.

Copy link
Contributor

openshift-ci bot commented Jan 19, 2024

@cybertron: trigger 1 job(s) for the /payload-(job|aggregate|job-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5d6b11f0-b6e8-11ee-8ec2-3377fa9cb686-0

@cybertron
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

Failed later in the process, but seems to have gotten past where this change would be relevant. No logs captured that I can find so hard to say more than that.

Copy link
Contributor

openshift-ci bot commented Jan 22, 2024

@cybertron: trigger 1 job(s) for the /payload-(job|aggregate|job-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5522e0b0-b952-11ee-9e3b-4c3bbb7c1bea-0

@cybertron
Copy link
Member Author

Payload job finally passed: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-machine-config-operator-4079-nightly-4.16-e2e-metal-ipi-sdn-bm/1749496228007120896

Looks like we should be good to go, pending the other jobs passing.

@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 22, 2024
Copy link
Contributor

@mkowalski mkowalski left a comment

Choose a reason for hiding this comment

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

/lgtm
/test unit

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2024
@cybertron
Copy link
Member Author

/assign @sinnykumari

The original version of this patch caused OpenShiftSDN to fail because
it doesn't create br-ex so the interface never comes up. This commit
fixes that by disabling the wait service when any CNI plugin other
than OVNKubernetes is used.
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 2, 2024
@mkowalski
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 2, 2024
@cybertron
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm
/test e2e-metal-ipi
/test e2e-metal-ipi-ovn-ipv6

Just a rebase, but let's make sure it still passes everything.

Copy link
Contributor

openshift-ci bot commented Feb 2, 2024

@cybertron: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/4518edf0-c1e4-11ee-8eb2-048dc045ec55-0

Copy link
Contributor

openshift-ci bot commented Feb 2, 2024

@cybertron: The following test 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/okd-scos-e2e-aws-ovn 7e2e27a link false /test okd-scos-e2e-aws-ovn

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

sinnykumari commented Feb 13, 2024

Required payload job periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-sdn-bm is passing
/approve

Copy link
Contributor

openshift-ci bot commented Feb 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cybertron, mkowalski, sinnykumari

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 Feb 13, 2024
@sinnykumari
Copy link
Contributor

/test e2e-gcp-op-single-node

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD b8d339c and 2 for PR HEAD 7e2e27a in total

@openshift-merge-bot openshift-merge-bot bot merged commit 4e12d91 into openshift:master Feb 13, 2024
18 of 19 checks passed
@openshift-ci-robot
Copy link
Contributor

@cybertron: Jira Issue OCPBUGS-22324: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-22324 has been moved to the MODIFIED state.

In response to this:

This reverts commit c558cc6 and adds a commit to fix the problem that prompted the revert in the first place. Now the service will be disabled for all CNI plugins except OVNKubernetes.

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 openshift-eng/jira-lifecycle-plugin repository.

dgoodwin added a commit to dgoodwin/machine-config-operator that referenced this pull request Feb 16, 2024
…ex-unrevert"

This reverts commit 4e12d91, reversing
changes made to b8d339c.
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-02-17-013806

@cybertron
Copy link
Member Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@cybertron: new pull request created: #4232

In response to this:

/cherry-pick release-4.15

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. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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

7 participants