Skip to content

TRT-2243: Revert "OCPBUGS-56202: DownStream Merge [07-25-2025]"#2706

Merged
sdodson merged 1 commit intoopenshift:masterfrom
xueqzhan:revert-2693-d/s-merge-07-25-2025
Aug 12, 2025
Merged

TRT-2243: Revert "OCPBUGS-56202: DownStream Merge [07-25-2025]"#2706
sdodson merged 1 commit intoopenshift:masterfrom
xueqzhan:revert-2693-d/s-merge-07-25-2025

Conversation

@xueqzhan
Copy link
Copy Markdown
Contributor

@xueqzhan xueqzhan commented Aug 11, 2025

Reverts #2693; tracked by 



Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

This PR has caused disruptions with ingress that are affecting massive number of GCP upgrade jobs. You can see the above jira case for examples. This is also blocking payloads.

Slack thread: https://redhat-internal.slack.com/archives/C01CQA76KMX/p1754918087727769

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR:

/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade 10
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade 10

Please make sure there is no ingress related disruptions with the test jobs.

CC: @jcaamano @jluhrsen

@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical 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 Aug 11, 2025
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@xueqzhan: This pull request references Jira Issue OCPBUGS-56202, which is invalid:

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

Details

In response to this:

Reverts #2693

TRT is going to test a GCP disruption issue with this. Please ignore for now.

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.

@xueqzhan
Copy link
Copy Markdown
Contributor Author

/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade 3

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 11, 2025

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

  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/80df21d0-76f4-11f0-967d-4b5739387f61-0

@xueqzhan
Copy link
Copy Markdown
Contributor Author

/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade 3

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 11, 2025

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

  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a62dc2c0-76f4-11f0-8f78-b7b524af5f47-0

@sdodson
Copy link
Copy Markdown
Member

sdodson commented Aug 12, 2025

/retest-required

@sdodson sdodson removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 12, 2025
@sdodson
Copy link
Copy Markdown
Member

sdodson commented Aug 12, 2025

/retitle TRT-2243: Revert "OCPBUGS-56202: DownStream Merge [07-25-2025]"

@openshift-ci openshift-ci bot changed the title Revert "OCPBUGS-56202: DownStream Merge [07-25-2025]" TRT-2243: Revert "OCPBUGS-56202: DownStream Merge [07-25-2025]" Aug 12, 2025
@openshift-ci-robot openshift-ci-robot removed the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Aug 12, 2025
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Aug 12, 2025

@xueqzhan: This pull request references TRT-2243 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Reverts #2693; tracked by 



Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

This PR has caused disruptions with ingress that are affecting massive number of GCP upgrade jobs. You can see the above jira case for examples. This is also blocking payloads.

Slack thread: https://redhat-internal.slack.com/archives/C01CQA76KMX/p1754918087727769

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR:

/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade 10
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade 10

Please make sure there is no ingress related disruptions with the test jobs.

CC: @jcaamano @jluhrsen

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.

@sdodson
Copy link
Copy Markdown
Member

sdodson commented Aug 12, 2025

/override ci/prow/e2e-gcp-ovn ci/prow/qe-perfscale-payload-control-plane-6nodes ci/prow/e2e-aws-ovn-upgrade-local-gateway ci/prow/4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 12, 2025

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade, ci/prow/e2e-aws-ovn-upgrade-local-gateway, ci/prow/e2e-gcp-ovn, ci/prow/qe-perfscale-payload-control-plane-6nodes

Details

In response to this:

/override ci/prow/e2e-gcp-ovn ci/prow/qe-perfscale-payload-control-plane-6nodes ci/prow/e2e-aws-ovn-upgrade-local-gateway ci/prow/4.20-upgrade-from-stable-4.19-e2e-aws-ovn-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-sigs/prow repository.

@sdodson
Copy link
Copy Markdown
Member

sdodson commented Aug 12, 2025

/label approved
/lgtm

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 12, 2025
@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 12, 2025
@sdodson sdodson added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 12, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

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

@sdodson
Copy link
Copy Markdown
Member

sdodson commented Aug 12, 2025

/override /override ci/prow/e2e-aws-ovn-edge-zones ci/prow/lint

@sdodson
Copy link
Copy Markdown
Member

sdodson commented Aug 12, 2025

/override ci/prow/e2e-aws-ovn-edge-zones ci/prow/lint

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 12, 2025

@sdodson: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • /override

Only the following failed contexts/checkruns were expected:

  • ci/prow/4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade
  • ci/prow/4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade-ipsec
  • ci/prow/4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade
  • ci/prow/4.20-upgrade-from-stable-4.19-images
  • ci/prow/e2e-aws-ovn
  • ci/prow/e2e-aws-ovn-edge-zones
  • ci/prow/e2e-aws-ovn-hypershift
  • ci/prow/e2e-aws-ovn-hypershift-conformance-techpreview
  • ci/prow/e2e-aws-ovn-hypershift-kubevirt
  • ci/prow/e2e-aws-ovn-local-gateway
  • ci/prow/e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • ci/prow/e2e-aws-ovn-serial
  • ci/prow/e2e-aws-ovn-serial-ipsec
  • ci/prow/e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • ci/prow/e2e-aws-ovn-single-node-techpreview
  • ci/prow/e2e-aws-ovn-techpreview
  • ci/prow/e2e-aws-ovn-upgrade
  • ci/prow/e2e-aws-ovn-upgrade-ipsec
  • ci/prow/e2e-aws-ovn-upgrade-local-gateway
  • ci/prow/e2e-aws-ovn-windows
  • ci/prow/e2e-azure-ovn
  • ci/prow/e2e-azure-ovn-techpreview
  • ci/prow/e2e-azure-ovn-upgrade
  • ci/prow/e2e-gcp-ovn
  • ci/prow/e2e-gcp-ovn-techpreview
  • ci/prow/e2e-metal-ipi-ovn-dualstack
  • ci/prow/e2e-metal-ipi-ovn-dualstack-bgp
  • ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw
  • ci/prow/e2e-metal-ipi-ovn-dualstack-local-gateway-techpreview
  • ci/prow/e2e-metal-ipi-ovn-dualstack-techpreview
  • ci/prow/e2e-metal-ipi-ovn-ipv6
  • ci/prow/e2e-metal-ipi-ovn-ipv6-techpreview
  • ci/prow/e2e-metal-ipi-ovn-techpreview
  • ci/prow/e2e-openstack-ovn
  • ci/prow/e2e-ovn-hybrid-step-registry
  • ci/prow/e2e-vsphere-ovn
  • ci/prow/e2e-vsphere-ovn-techpreview
  • ci/prow/gofmt
  • ci/prow/images
  • ci/prow/lint
  • ci/prow/okd-scos-e2e-aws-ovn
  • ci/prow/okd-scos-images
  • ci/prow/openshift-e2e-gcp-ovn-techpreview-upgrade
  • ci/prow/qe-perfscale-aws-ovn-small-udn-density-churn-l3
  • ci/prow/qe-perfscale-aws-ovn-small-udn-density-l3
  • ci/prow/qe-perfscale-payload-control-plane-6nodes
  • ci/prow/security
  • ci/prow/unit
  • pull-ci-openshift-ovn-kubernetes-master-4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade
  • pull-ci-openshift-ovn-kubernetes-master-4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade-ipsec
  • pull-ci-openshift-ovn-kubernetes-master-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade
  • pull-ci-openshift-ovn-kubernetes-master-4.20-upgrade-from-stable-4.19-images
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-edge-zones
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-hypershift
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-hypershift-conformance-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-hypershift-kubevirt
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-local-gateway
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-serial
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-serial-ipsec
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-single-node-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-upgrade
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-upgrade-ipsec
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-upgrade-local-gateway
  • pull-ci-openshift-ovn-kubernetes-master-e2e-aws-ovn-windows
  • pull-ci-openshift-ovn-kubernetes-master-e2e-azure-ovn
  • pull-ci-openshift-ovn-kubernetes-master-e2e-azure-ovn-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-azure-ovn-upgrade
  • pull-ci-openshift-ovn-kubernetes-master-e2e-gcp-ovn
  • pull-ci-openshift-ovn-kubernetes-master-e2e-gcp-ovn-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-dualstack
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-dualstack-bgp
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-dualstack-bgp-local-gw
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-dualstack-local-gateway-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-dualstack-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-ipv6
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-ipv6-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-e2e-openstack-ovn
  • pull-ci-openshift-ovn-kubernetes-master-e2e-ovn-hybrid-step-registry
  • pull-ci-openshift-ovn-kubernetes-master-e2e-vsphere-ovn
  • pull-ci-openshift-ovn-kubernetes-master-e2e-vsphere-ovn-techpreview
  • pull-ci-openshift-ovn-kubernetes-master-gofmt
  • pull-ci-openshift-ovn-kubernetes-master-images
  • pull-ci-openshift-ovn-kubernetes-master-lint
  • pull-ci-openshift-ovn-kubernetes-master-okd-scos-e2e-aws-ovn
  • pull-ci-openshift-ovn-kubernetes-master-okd-scos-images
  • pull-ci-openshift-ovn-kubernetes-master-openshift-e2e-gcp-ovn-techpreview-upgrade
  • pull-ci-openshift-ovn-kubernetes-master-qe-perfscale-aws-ovn-small-udn-density-churn-l3
  • pull-ci-openshift-ovn-kubernetes-master-qe-perfscale-aws-ovn-small-udn-density-l3
  • pull-ci-openshift-ovn-kubernetes-master-qe-perfscale-payload-control-plane-6nodes
  • pull-ci-openshift-ovn-kubernetes-master-security
  • pull-ci-openshift-ovn-kubernetes-master-unit
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override /override ci/prow/e2e-aws-ovn-edge-zones 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 kubernetes-sigs/prow repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 12, 2025

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-aws-ovn-edge-zones, ci/prow/lint

Details

In response to this:

/override ci/prow/e2e-aws-ovn-edge-zones 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 kubernetes-sigs/prow repository.

@sdodson sdodson merged commit dd6d872 into openshift:master Aug 12, 2025
38 of 49 checks passed
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 12, 2025

@xueqzhan: 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-azure-ovn 5e636ad link false /test e2e-azure-ovn
ci/prow/e2e-aws-ovn-techpreview 5e636ad link false /test e2e-aws-ovn-techpreview
ci/prow/e2e-openstack-ovn 5e636ad link false /test e2e-openstack-ovn
ci/prow/e2e-ovn-hybrid-step-registry 5e636ad link false /test e2e-ovn-hybrid-step-registry
ci/prow/e2e-aws-ovn-hypershift-kubevirt 5e636ad link false /test e2e-aws-ovn-hypershift-kubevirt
ci/prow/e2e-aws-ovn-hypershift-conformance-techpreview 5e636ad link false /test e2e-aws-ovn-hypershift-conformance-techpreview
ci/prow/qe-perfscale-aws-ovn-small-udn-density-churn-l3 5e636ad link false /test qe-perfscale-aws-ovn-small-udn-density-churn-l3
ci/prow/okd-scos-e2e-aws-ovn 5e636ad link false /test okd-scos-e2e-aws-ovn
ci/prow/security 5e636ad link false /test security
ci/prow/e2e-vsphere-ovn 5e636ad link false /test e2e-vsphere-ovn

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.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ovn-kubernetes-base
This PR has been included in build ose-ovn-kubernetes-base-container-v4.20.0-202508122224.p0.gdd6d872.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ovn-kubernetes-microshift
This PR has been included in build ovn-kubernetes-microshift-container-v4.20.0-202508122224.p0.gdd6d872.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-ovn-kubernetes
This PR has been included in build ose-ovn-kubernetes-container-v4.20.0-202508122224.p0.gdd6d872.assembly.stream.el9.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.20.0-0.nightly-2025-09-08-182033

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.20.0-0.nightly-2026-03-14-030631

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/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.

5 participants