Skip to content

Conversation

@danwinship
Copy link
Contributor

@danwinship danwinship commented Sep 14, 2025

unrevert of #2605

(PR unchanged from #2605; the revert was not because the PR itself was buggy, but because it requires adding an exception to an e2e test, openshift/origin#30254.)

/hold
for e2e-serial test fix

OCP does not yet support changing the service CIDRs at runtime.
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 14, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 14, 2025
@openshift-ci-robot
Copy link
Contributor

@danwinship: This pull request references Jira Issue OCPBUGS-61196, which is valid.

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

Requesting review from QA contact:
/cc @anuragthehatter

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

Details

In response to this:

unrevert of #2605

/hold
for e2e-serial test fix

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.

@danwinship
Copy link
Contributor Author

/retest-required

3 similar comments
@danwinship
Copy link
Contributor Author

/retest-required

@danwinship
Copy link
Contributor Author

/retest-required

@danwinship
Copy link
Contributor Author

/retest-required

@danwinship
Copy link
Contributor Author

/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2

/retest-required

@danwinship
Copy link
Contributor Author

/hold cancel
/assign @kyrtapz

serial tests pass now that openshift/origin#30254 has merged, so this can merge again. (It's unchanged from #2605, we just needed the e2e test fix first so merging this doesn't break other repos.)

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 19, 2025
@danwinship
Copy link
Contributor Author

oops, Patryk is on vacation
/auto-cc

@bpickard22
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Sep 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bpickard22, danwinship

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 Sep 22, 2025
@danwinship
Copy link
Contributor Author

/verified by "ServiceCIDR should be blocked"

(new test from openshift/origin#30234, which can merge after this does. Test run at https://prow.ci.openshift.org/view/gs/test-platform-results/logs/release-openshift-origin-installer-launch-aws-modern/1965905253861691392.)

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Sep 22, 2025
@openshift-ci-robot
Copy link
Contributor

@danwinship: This PR has been marked as verified by "ServiceCIDR should be blocked".

Details

In response to this:

/verified by "ServiceCIDR should be blocked"

(new test from openshift/origin#30234, which can merge after this does. Test run at https://prow.ci.openshift.org/view/gs/test-platform-results/logs/release-openshift-origin-installer-launch-aws-modern/1965905253861691392.)

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

/retest-required

Remaining retests: 0 against base HEAD c069f36 and 2 for PR HEAD 966cc52 in total

@danwinship
Copy link
Contributor Author

/retest-required

1 similar comment
@danwinship
Copy link
Contributor Author

/retest-required

@danwinship
Copy link
Contributor Author

/override ci/prow/e2e-aws-ovn-upgrade-ipsec
/override ci/prow/e2e-aws-ovn-windows
/override ci/prow-e2e-ovn-ipsec-step-registry

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 23, 2025

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

  • ci/prow-e2e-ovn-ipsec-step-registry

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-azure-ovn-upgrade
  • ci/prow/4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade
  • ci/prow/4.20-upgrade-from-stable-4.19-images
  • ci/prow/e2e-aws-hypershift-ovn-kubevirt
  • ci/prow/e2e-aws-ovn-hypershift-conformance
  • ci/prow/e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • ci/prow/e2e-aws-ovn-serial-1of2
  • ci/prow/e2e-aws-ovn-serial-2of2
  • ci/prow/e2e-aws-ovn-serial-ipsec-1of2
  • ci/prow/e2e-aws-ovn-serial-ipsec-2of2
  • ci/prow/e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • ci/prow/e2e-aws-ovn-single-node
  • ci/prow/e2e-aws-ovn-upgrade
  • ci/prow/e2e-aws-ovn-upgrade-ipsec
  • ci/prow/e2e-aws-ovn-windows
  • ci/prow/e2e-azure-ovn
  • ci/prow/e2e-azure-ovn-upgrade
  • ci/prow/e2e-gcp-ovn
  • ci/prow/e2e-gcp-ovn-upgrade
  • ci/prow/e2e-metal-ipi-ovn-dualstack-bgp
  • ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw
  • ci/prow/e2e-metal-ipi-ovn-ipv6
  • ci/prow/e2e-metal-ipi-ovn-ipv6-ipsec
  • ci/prow/e2e-network-mtu-migration-ovn-ipv4
  • ci/prow/e2e-network-mtu-migration-ovn-ipv6
  • ci/prow/e2e-openstack-ovn
  • ci/prow/e2e-ovn-hybrid-step-registry
  • ci/prow/e2e-ovn-ipsec-step-registry
  • ci/prow/e2e-ovn-step-registry
  • ci/prow/e2e-vsphere-ovn
  • ci/prow/e2e-vsphere-ovn-dualstack
  • ci/prow/hypershift-e2e-aks
  • ci/prow/images
  • ci/prow/lint
  • ci/prow/okd-scos-e2e-aws-ovn
  • ci/prow/okd-scos-images
  • ci/prow/security
  • ci/prow/unit
  • ci/prow/verify
  • ci/prow/verify-deps
  • pull-ci-openshift-cluster-network-operator-master-4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.20-upgrade-from-stable-4.19-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.20-upgrade-from-stable-4.19-images
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-hypershift-ovn-kubevirt
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-hypershift-conformance
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-serial-1of2
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-serial-2of2
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-serial-ipsec-1of2
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-serial-ipsec-2of2
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-single-node
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-upgrade-ipsec
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-windows
  • pull-ci-openshift-cluster-network-operator-master-e2e-azure-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-gcp-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-dualstack-bgp
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-dualstack-bgp-local-gw
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-ipv6-ipsec
  • pull-ci-openshift-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv4
  • pull-ci-openshift-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-master-e2e-openstack-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-hybrid-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-ipsec-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn-dualstack
  • pull-ci-openshift-cluster-network-operator-master-hypershift-e2e-aks
  • pull-ci-openshift-cluster-network-operator-master-images
  • pull-ci-openshift-cluster-network-operator-master-lint
  • pull-ci-openshift-cluster-network-operator-master-okd-scos-e2e-aws-ovn
  • pull-ci-openshift-cluster-network-operator-master-okd-scos-images
  • pull-ci-openshift-cluster-network-operator-master-security
  • pull-ci-openshift-cluster-network-operator-master-unit
  • pull-ci-openshift-cluster-network-operator-master-verify
  • pull-ci-openshift-cluster-network-operator-master-verify-deps
  • 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 ci/prow/e2e-aws-ovn-upgrade-ipsec
/override ci/prow/e2e-aws-ovn-windows
/override ci/prow-e2e-ovn-ipsec-step-registry

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.

@danwinship
Copy link
Contributor Author

/override ci/prow/e2e-aws-ovn-upgrade-ipsec
/override ci/prow/e2e-aws-ovn-windows
/override ci/prow/e2e-ovn-ipsec-step-registry

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 23, 2025

@danwinship: Overrode contexts on behalf of danwinship: ci/prow/e2e-aws-ovn-upgrade-ipsec, ci/prow/e2e-aws-ovn-windows, ci/prow/e2e-ovn-ipsec-step-registry

Details

In response to this:

/override ci/prow/e2e-aws-ovn-upgrade-ipsec
/override ci/prow/e2e-aws-ovn-windows
/override ci/prow/e2e-ovn-ipsec-step-registry

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 Sep 23, 2025

@danwinship: 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/4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade 966cc52 link false /test 4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade
ci/prow/e2e-aws-ovn-shared-to-local-gateway-mode-migration 966cc52 link false /test e2e-aws-ovn-shared-to-local-gateway-mode-migration
ci/prow/e2e-openstack-ovn 966cc52 link false /test e2e-openstack-ovn
ci/prow/e2e-azure-ovn 966cc52 link false /test e2e-azure-ovn
ci/prow/e2e-vsphere-ovn-dualstack 966cc52 link false /test e2e-vsphere-ovn-dualstack
ci/prow/e2e-aws-ovn-single-node 966cc52 link false /test e2e-aws-ovn-single-node
ci/prow/4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade 966cc52 link false /test 4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade
ci/prow/e2e-network-mtu-migration-ovn-ipv4 966cc52 link false /test e2e-network-mtu-migration-ovn-ipv4
ci/prow/4.20-upgrade-from-stable-4.19-e2e-azure-ovn-upgrade 966cc52 link false /test 4.20-upgrade-from-stable-4.19-e2e-azure-ovn-upgrade
ci/prow/security 966cc52 link false /test security
ci/prow/e2e-aws-hypershift-ovn-kubevirt 966cc52 link false /test e2e-aws-hypershift-ovn-kubevirt

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-merge-bot openshift-merge-bot bot merged commit 23c976c into openshift:master Sep 23, 2025
31 of 42 checks passed
@openshift-ci-robot
Copy link
Contributor

@danwinship: Jira Issue OCPBUGS-61196: 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-61196 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:

unrevert of #2605

(PR unchanged from #2605; the revert was not because the PR itself was buggy, but because it requires adding an exception to an e2e test, openshift/origin#30254.)

/hold
for e2e-serial test fix

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.

@danwinship danwinship deleted the servicecidr-admission-rerevert branch September 23, 2025 19:32
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.21.0-0.nightly-2025-10-02-215712

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

5 participants