OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844 #2866

ormergi · 2025-11-19T18:20:34Z

📑 Description

Release-4.20 wont pass CI linter job causing PRs to fail on CI e.g.: #2827

This PR add the missing bits for the cherry-pick that introduced by #2844

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 · 2025-11-19T18:20:41Z

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

expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified 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:

📑 Description

Release-4.20 wont pass CI linter job causing PRs to fail on CI e.g.: #2827

This PR add the missing bits for the cherry-pick that introduced by #2844

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 · 2025-11-19T18:22:29Z

@ricky-rav @jcaamano could you please have a look?
@kyrtapz @maiqueb FYI

ricky-rav

/LGTM

ricky-rav

Actually, when we add or modify code that involves ocp hacks, we should prefix the commit with CARRY:. Let's do it here too please.

Relax linter CI job by adding the missing bits of cherry-pick conflicts introduced by openshift#2844 Signed-off-by: Or Mergi <[email protected]>

ormergi · 2025-11-20T18:50:40Z

Actually, when we add or modify code that involves ocp hacks, we should prefix the commit with CARRY:. Let's do it here too please.

Done
@ricky-rav PTAL 🙏

ormergi · 2025-11-20T18:57:06Z

@ricky-rav tide is not happy with the spesified OCPBUG, do we really need another one or can we replace it to NO-JIRA?

ricky-rav · 2025-11-20T20:19:59Z

/retitle NO-JIRA: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844

openshift-ci-robot · 2025-11-20T20:20:07Z

@ormergi: This pull request explicitly references no jira issue.

In response to this:

📑 Description

Release-4.20 wont pass CI linter job causing PRs to fail on CI e.g.: #2827

This PR add the missing bits for the cherry-pick that introduced by #2844

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.

ricky-rav

/LGTM

ricky-rav · 2025-11-20T20:21:23Z

@ricky-rav tide is not happy with the spesified OCPBUG, do we really need another one or can we replace it to NO-JIRA?

No need for a jira ticket here, especially since 4.21 is not affected. (somehow my git cherry-pick totally overlooked this, while the automatic merge upstream->downstream did it correctly)

(Jira automation would work with a brand new 4.21 bug that we close as done right away and then a separate 4.20 bug linked to this...)

jluhrsen · 2025-11-22T01:29:55Z

/retest

ormergi · 2025-11-23T08:53:27Z

/retest-required

jluhrsen · 2025-11-23T17:11:12Z

/retest

kyrtapz · 2025-11-24T10:42:38Z

/override ci/prow/e2e-aws-ovn-windows
/lgtm
/label i/prow/e2e-aws-ovn-windows

kyrtapz · 2025-11-24T10:46:37Z

/verified by ci/prow/lint

openshift-ci-robot · 2025-11-24T10:46:50Z

@kyrtapz: This PR has been marked as verified by ci/prow/lint.

In response to this:

/verified by ci/prow/lint

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.

jluhrsen · 2025-11-24T21:34:39Z

/retitle OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844

openshift-ci-robot · 2025-11-24T21:34:47Z

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

expected the bug to target the "4.20.z" version, but no target version was set
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-65951 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.

In response to this:

📑 Description

Release-4.20 wont pass CI linter job causing PRs to fail on CI e.g.: #2827

This PR add the missing bits for the cherry-pick that introduced by #2844

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.

jluhrsen · 2025-11-24T21:35:54Z

/jira refresh

openshift-ci-robot · 2025-11-24T21:35:58Z

@jluhrsen: This pull request references Jira Issue OCPBUGS-65951, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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.

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.

jluhrsen · 2025-11-24T21:37:15Z

/jira refresh

openshift-ci-robot · 2025-11-24T21:37:22Z

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

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.20.z) matches configured target version for branch (4.20.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-59552 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-59552 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

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.

openshift-ci-robot · 2025-11-24T23:09:37Z

/retest-required

Remaining retests: 0 against base HEAD 60e7759 and 2 for PR HEAD 85fa1bb in total

ormergi · 2025-11-25T06:39:06Z

/retest-required

openshift-ci · 2025-11-25T10:58:50Z

@ormergi: 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/security	`85fa1bb`	link	false	`/test security`

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

ormergi · 2025-11-25T11:45:02Z

/retest-required

kyrtapz · 2025-11-25T11:52:06Z

this is a linter fix not affecting logic
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw

openshift-ci · 2025-11-25T11:52:22Z

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw

In response to this:

this is a linter fix not affecting logic
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw

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-robot · 2025-11-25T11:56:51Z

@ormergi: Jira Issue Verification Checks: Jira Issue OCPBUGS-65951
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-65951 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

📑 Description

Release-4.20 wont pass CI linter job causing PRs to fail on CI e.g.: #2827

This PR add the missing bits for the cherry-pick that introduced by #2844

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 bot requested review from kyrtapz and martinkennelly November 19, 2025 18:22

ricky-rav mentioned this pull request Nov 19, 2025

OCPBUGS-65658, CORENET-6055, OCPBUGS-65909, OCPBUGS-65956: Branch Sync release-4.20 to release-4.19 [11-14-2025] #2862

Closed

ricky-rav approved these changes Nov 20, 2025

View reviewed changes

openshift-ci bot assigned ricky-rav Nov 20, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2025

ricky-rav suggested changes Nov 20, 2025

View reviewed changes

CARRY: Fix linter issues

85fa1bb

Relax linter CI job by adding the missing bits of cherry-pick conflicts introduced by openshift#2844 Signed-off-by: Or Mergi <[email protected]>

ormergi force-pushed the fix-cp-conflict-pr2844 branch from ef663d4 to 85fa1bb Compare November 20, 2025 18:46

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2025

ormergi mentioned this pull request Nov 20, 2025

[release-4.20] OCPBUGS-64836: back-port IP & MAC conflict detection #2827

Open

5 tasks

openshift-ci bot changed the title ~~OCPBUGS-64697: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844~~ NO-JIRA: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844 Nov 20, 2025

openshift-ci-robot removed jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Nov 20, 2025

ricky-rav approved these changes Nov 20, 2025

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2025

openshift-ci bot assigned asood-rh, barbora137, huiran0826, jechen0648, Meina-rh, mffiedler and qiowang721 Nov 24, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 24, 2025

openshift-ci bot changed the title ~~NO-JIRA: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844~~ OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844 Nov 24, 2025

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 24, 2025

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 24, 2025

openshift-ci bot requested a review from anuragthehatter November 24, 2025 21:37

openshift-merge-bot bot merged commit ecb7aac into openshift:release-4.20 Nov 25, 2025
28 of 29 checks passed

ormergi deleted the fix-cp-conflict-pr2844 branch November 25, 2025 12:25

OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844 #2866

OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844 #2866

Conversation

ormergi commented Nov 19, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

openshift-ci-robot commented Nov 19, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

ormergi commented Nov 19, 2025

Uh oh!

ricky-rav left a comment

Choose a reason for hiding this comment

Uh oh!

ricky-rav left a comment

Choose a reason for hiding this comment

Uh oh!

ormergi commented Nov 20, 2025

Uh oh!

ormergi commented Nov 20, 2025

Uh oh!

ricky-rav commented Nov 20, 2025

Uh oh!

openshift-ci-robot commented Nov 20, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

ricky-rav left a comment

Choose a reason for hiding this comment

Uh oh!

ricky-rav commented Nov 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jluhrsen commented Nov 22, 2025

Uh oh!

ormergi commented Nov 23, 2025

Uh oh!

jluhrsen commented Nov 23, 2025

Uh oh!

kyrtapz commented Nov 24, 2025

Uh oh!

kyrtapz commented Nov 24, 2025

Uh oh!

openshift-ci-robot commented Nov 24, 2025

Uh oh!

jluhrsen commented Nov 24, 2025

Uh oh!

openshift-ci-robot commented Nov 24, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

jluhrsen commented Nov 24, 2025

Uh oh!

openshift-ci-robot commented Nov 24, 2025

Uh oh!

jluhrsen commented Nov 24, 2025

Uh oh!

openshift-ci-robot commented Nov 24, 2025

Uh oh!

openshift-ci-robot commented Nov 24, 2025

Uh oh!

ormergi commented Nov 25, 2025

Uh oh!

openshift-ci bot commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ormergi commented Nov 25, 2025

Uh oh!

kyrtapz commented Nov 25, 2025

Uh oh!

ricky-rav commented Nov 20, 2025 •

edited

Loading

openshift-ci bot commented Nov 25, 2025 •

edited

Loading