Skip to content

[release-4.20] OCPBUGS-61333: Unrevert bump to v1.33.4 #2449

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Sep 8, 2025
Merged

[release-4.20] OCPBUGS-61333: Unrevert bump to v1.33.4 #2449

merged 2 commits into from
Sep 8, 2025

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #2441

/assign bertinatto

kevinrizza and others added 2 commits September 7, 2025 14:10
@kevinrizza
UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: Revert "OCPBUGS-60507: …
998bc5e 
…Bump 1.33.4""
@bertinatto
UPSTREAM: revert: 133264: Revert "remove failing test that depends on…
a38f5e1 
… expired credential, remove credential, add TODOs"

This reverts commit a2ef871.

That commit removed a test that we already skip in OCP. The patch also removed
an image from an iota-based enum, which caused images returned by the
`openshift-tests tests images` command to be renamed. Ultimately, this broke
metal jobs because the list of images returned by `openshift-tests` was not
the same as the list required by the tests.

This change provides a temporary fix until a proper solution is implemented.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 7, 2025
Merged
@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 7, 2025
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci openshift-ci bot requested review from p0lyn0mial and tkashem September 7, 2025 14:11
@openshift-ci openshift-ci bot added the vendor-update Touching vendor dir or related files label Sep 7, 2025
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-60507 has been cloned as Jira Issue OCPBUGS-61333. Will retitle bug to link to clone.
/retitle [release-4.20] OCPBUGS-61333: Unrevert bump to v1.33.4

In response to this:

This is an automated cherry-pick of #2441

/assign bertinatto

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 changed the title [release-4.20] OCPBUGS-60507: Unrevert bump to v1.33.4 [release-4.20] OCPBUGS-61333: Unrevert bump to v1.33.4 Sep 7, 2025
@openshift-ci-robot openshift-ci-robot added 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 Sep 7, 2025
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-61333, 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.
  • expected dependent Jira Issue OCPBUGS-60507 to target a version in 4.21.0, but it targets "4.20.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 is an automated cherry-pick of #2441

/assign bertinatto

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.

@bertinatto
Copy link
Member

/retest

3 similar comments
@bertinatto
Copy link
Member

/retest

@bertinatto
Copy link
Member

/retest

@bertinatto
Copy link
Member

/retest

@kevinrizza
Copy link
Member

/lgtm

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

/retest

@bertinatto
Copy link
Member

/test e2e-metal-ipi-ovn-ipv6

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 8, 2025

@openshift-cherrypick-robot: 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/e2e-aws-ovn-techpreview-serial a38f5e1 link false /test e2e-aws-ovn-techpreview-serial

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.

@bertinatto
Copy link
Member

/lgtm
/label backport-risk-assessed
/remove-label backports/unvalidated-commits
/remove-label jira/invalid-bug
/label jira/valid-bug

@openshift-ci openshift-ci bot added 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. labels Sep 8, 2025
@openshift-ci openshift-ci bot removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 8, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, kevinrizza, openshift-cherrypick-robot

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 Sep 8, 2025
@kevinrizza
Copy link
Member

/verified bypass

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

@kevinrizza: The verified label has been added.

In response to this:

/verified bypass

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-merge-bot openshift-merge-bot bot merged commit 72a1bee into openshift:release-4.20 Sep 8, 2025
26 of 27 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-61333
✔️ 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-61333 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:

This is an automated cherry-pick of #2441

/assign bertinatto

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@p0lyn0mial p0lyn0mial Awaiting requested review from p0lyn0mial

@tkashem tkashem Awaiting requested review from tkashem

Assignees

@bertinatto bertinatto

@kevinrizza kevinrizza

@kasturinarra kasturinarra

@zhouying7780 zhouying7780

@xingxingxia xingxingxia

@lyman9966 lyman9966

@duanwei33 duanwei33

@wangke19 wangke19

@gangwgr gangwgr

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. vendor-update Touching vendor dir or related files verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.