Skip to content

Conversation

@ormergi
Copy link
Contributor

@ormergi ormergi commented Oct 23, 2025

📑 Description

This is manual cherry-pick of IP conflict detection [1] (commits 1-3) and MAC conflict detection [2] (commits 4-12).
Commits were cherry-picked from release-4.21 branch, one by one, using git cherry-pick -x.

[1] ovn-kubernetes/ovn-kubernetes#5411
[2] ovn-kubernetes/ovn-kubernetes#5492

Fixes #

Additional Information for reviewers

✅ Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 23, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 23, 2025

@ormergi: This pull request references CORENET-6475 which is a valid jira issue.

Details

In response to this:

📑 Description

This is manual cherry-pick of IP conflict detection [1] and MAC conflict detection [2].
Commits were cherry-picked from release-4.21 branch.

[1] ovn-kubernetes/ovn-kubernetes#5411
[2] ovn-kubernetes/ovn-kubernetes#5492

Fixes #

Additional Information for reviewers

✅ Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

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.

@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 Oct 23, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 23, 2025

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

@ormergi
Copy link
Contributor Author

ormergi commented Oct 23, 2025

/test unit

@ormergi
Copy link
Contributor Author

ormergi commented Oct 23, 2025

/test lint

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 23, 2025

@ormergi: This pull request references CORENET-6475 which is a valid jira issue.

Details

In response to this:

📑 Description

This is manual cherry-pick of IP conflict detection [1] (commits 1-3) and MAC conflict detection [2] (commits 4-12).
Commits were cherry-picked from release-4.21 branch.

[1] ovn-kubernetes/ovn-kubernetes#5411
[2] ovn-kubernetes/ovn-kubernetes#5492

Fixes #

Additional Information for reviewers

✅ Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

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.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 23, 2025

@ormergi: This pull request references CORENET-6475 which is a valid jira issue.

Details

In response to this:

📑 Description

This is manual cherry-pick of IP conflict detection [1] (commits 1-3) and MAC conflict detection [2] (commits 4-12).
Commits were cherry-picked from release-4.21 branch, one by one, using git cherry-pick -x.
The last commit "utils,multinet: GetPodNADToNetworkMappingWithActiveNetwork CUDN support" introduced conflicts that were resolved manually.

[1] ovn-kubernetes/ovn-kubernetes#5411
[2] ovn-kubernetes/ovn-kubernetes#5492

Fixes #

Additional Information for reviewers

✅ Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

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.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 23, 2025

@ormergi: This pull request references CORENET-6475 which is a valid jira issue.

Details

In response to this:

📑 Description

This is manual cherry-pick of IP conflict detection [1] (commits 1-3) and MAC conflict detection [2] (commits 4-12).
Commits were cherry-picked from release-4.21 branch, one by one, using git cherry-pick -x.

[1] ovn-kubernetes/ovn-kubernetes#5411
[2] ovn-kubernetes/ovn-kubernetes#5492

Fixes #

Additional Information for reviewers

✅ Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

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.

@ormergi ormergi marked this pull request as ready for review October 23, 2025 14:21
@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 Oct 23, 2025
@ormergi
Copy link
Contributor Author

ormergi commented Nov 5, 2025

/jira refresh

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 5, 2025

@ormergi: This pull request references CORENET-6475 which is a valid jira issue.

Details

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

@maiqueb
Copy link
Contributor

maiqueb commented Nov 5, 2025

@ormergi: This pull request references CORENET-6475 which is a valid jira issue.

I think you need to link CORENET-6475 to a verified 4.21 bug. @kyrtapz could you help us figure out what we're missing for the valid-bug label ? I remember the bot being more verbose, and instructing what we're missing.

@ormergi
Copy link
Contributor Author

ormergi commented Nov 5, 2025

I think you need to link CORENET-6475 to a verified 4.21 bug.

Done

/jira refresh

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 5, 2025

@ormergi: This pull request references CORENET-6475 which is a valid jira issue.

Details

In response to this:

I think you need to link CORENET-6475 to a verified 4.21 bug.

Done

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

@ormergi
Copy link
Contributor Author

ormergi commented Nov 6, 2025

/retest-required

1 similar comment
@ormergi
Copy link
Contributor Author

ormergi commented Nov 9, 2025

/retest-required

@ormergi
Copy link
Contributor Author

ormergi commented Nov 9, 2025

/retitle [release-4.20] OCPBUGS-64836: back-port IP & MAC conflict detection

@openshift-ci openshift-ci bot changed the title [release-4.20] CORENET-6475: back-port IP & MAC conflict detection [release-4.20] OCPBUGS-64836: back-port IP & MAC conflict detection Nov 9, 2025
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 9, 2025
@openshift-ci-robot
Copy link
Contributor

@ormergi: This pull request references Jira Issue OCPBUGS-64836, which is invalid:

  • expected Jira Issue OCPBUGS-64836 to depend on a bug targeting a version in 4.21.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

Details

In response to this:

📑 Description

This is manual cherry-pick of IP conflict detection [1] (commits 1-3) and MAC conflict detection [2] (commits 4-12).
Commits were cherry-picked from release-4.21 branch, one by one, using git cherry-pick -x.

[1] ovn-kubernetes/ovn-kubernetes#5411
[2] ovn-kubernetes/ovn-kubernetes#5492

Fixes #

Additional Information for reviewers

✅ Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

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.

@ormergi
Copy link
Contributor Author

ormergi commented Nov 9, 2025

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@ormergi: This pull request references Jira Issue OCPBUGS-64836, which is invalid:

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.

Details

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

@ormergi
Copy link
Contributor Author

ormergi commented Nov 9, 2025

/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 Nov 9, 2025
@ormergi
Copy link
Contributor Author

ormergi commented Nov 25, 2025

/test lint

@maiqueb
Copy link
Contributor

maiqueb commented Nov 25, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 25, 2025
@maiqueb
Copy link
Contributor

maiqueb commented Nov 26, 2025

@kyrtapz can you review / approve ? Please also remember the backport risk assessed label.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 26, 2025

@kyrtapz: This PR was included in a payload test run from openshift/origin#30414
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-ovn-kubernetes-release-4.20-periodics-e2e-metal-ipi-ovn-bgp-virt-ipv4

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8e561e00-cac2-11f0-8b5c-27bdd4756740-0

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 26, 2025

@ormergi: This PR was included in a payload test run from openshift/origin#30414
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-ovn-kubernetes-release-4.20-periodics-e2e-metal-ipi-ovn-bgp-virt-ipv4

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e92188b0-cad1-11f0-8cd9-dae09023cc0f-0

@kyrtapz
Copy link
Contributor

kyrtapz commented Nov 26, 2025

/approve
/label backport-risk-assessed

@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 Nov 26, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 26, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kyrtapz, maiqueb, ormergi, RamLavi

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

The pull request process is described here

Details 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 Nov 26, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD ecb7aac and 2 for PR HEAD 46b708b in total

@ormergi
Copy link
Contributor Author

ormergi commented Nov 27, 2025

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 1b4dc2f and 1 for PR HEAD 46b708b in total

@kyrtapz
Copy link
Contributor

kyrtapz commented Nov 28, 2025

/override ci/prow/e2e-aws-ovn-windows
https://issues.redhat.com/browse/OCPBUGS-66070

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 28, 2025

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/e2e-aws-ovn-windows

Details

In response to this:

/override ci/prow/e2e-aws-ovn-windows
https://issues.redhat.com/browse/OCPBUGS-66070

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-sigs/prow repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 28, 2025

@ormergi: 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/security 46b708b link false /test security
ci/prow/e2e-aws-ovn-windows 46b708b link true /test e2e-aws-ovn-windows

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@ormergi
Copy link
Contributor Author

ormergi commented Nov 29, 2025

/retest-required

@openshift-merge-bot openshift-merge-bot bot merged commit 6c78b6d into openshift:release-4.20 Nov 30, 2025
29 of 30 checks passed
@openshift-ci-robot
Copy link
Contributor

@ormergi: Jira Issue OCPBUGS-64836: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

📑 Description

This is manual cherry-pick of IP conflict detection [1] (commits 1-3) and MAC conflict detection [2] (commits 4-12).
Commits were cherry-picked from release-4.21 branch, one by one, using git cherry-pick -x.

[1] ovn-kubernetes/ovn-kubernetes#5411
[2] ovn-kubernetes/ovn-kubernetes#5492

Fixes #

Additional Information for reviewers

✅ Checks

  • My code requires changes to the documentation
  • if so, I have updated the documentation as required
  • My code requires tests
  • if so, I have added and/or updated the tests as required
  • All the tests have passed in the CI

How to verify it

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 30, 2025

@ormergi: This PR was included in a payload test run from openshift/origin#30414
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-ovn-kubernetes-release-4.20-periodics-e2e-metal-ipi-ovn-bgp-virt-ipv4

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/9c223a80-cdbc-11f0-9edc-4c3e8d9ddb8c-0

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.20.0-0.nightly-2025-12-11-233406

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. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.