Skip to content

OCPBUGS-60507: Unrevert bump to v1.33.4 #2441

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 6, 2025
Merged

OCPBUGS-60507: Unrevert bump to v1.33.4 #2441

merged 2 commits into from
Sep 6, 2025

Conversation

bertinatto
Copy link
Member

Reverts #2425.

See the additional commit for an explanation of why the original bump broke metal jobs.

@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 1, 2025
@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 Sep 1, 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 1, 2025
@openshift-ci-robot
Copy link

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

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

Requesting review from QA contact:
/cc @gangwgr

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

In response to this:

Reverts #2425.

See the additional commit for an explanation of why the original bump broke metal jobs.

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

@bertinatto: 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 added vendor-update Touching vendor dir or related files approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 1, 2025
@bertinatto bertinatto changed the title WIP: OCPBUGS-60507: Bump 1.33.4 WIP: OCPBUGS-60507: Unrevert bump to v1.33.4 Sep 1, 2025
@openshift-ci-robot
Copy link

@bertinatto: 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.

@bertinatto
Copy link
Member Author

/retest

1 similar comment
@bertinatto
Copy link
Member Author

/retest

@bertinatto
Copy link
Member Author

/test e2e-metal-ipi-ovn-ipv6

@kevinrizza
Copy link
Member

/lgtm

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

/retest

@bertinatto
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-bm

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 2, 2025

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

  • periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2169b440-8842-11f0-83cb-ba427859d7f1-0

@bertinatto bertinatto changed the title WIP: OCPBUGS-60507: Unrevert bump to v1.33.4 OCPBUGS-60507: Unrevert bump to v1.33.4 Sep 3, 2025
@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 Sep 3, 2025
@bertinatto
Copy link
Member Author

/remove-label backports/unvalidated-commits

@openshift-ci openshift-ci bot removed the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 3, 2025
@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 4, 2025
@bertinatto
Copy link
Member Author

/remove-label backports/unvalidated-commits

@openshift-ci openshift-ci bot removed the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 5, 2025
@bertinatto
Copy link
Member Author

/retest-required

@kevinrizza
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 5, 2025
@bertinatto
UPSTREAM: revert: 133264: Revert "remove failing test that depends on…
7f37725 
… 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-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 5, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 5, 2025
@openshift-ci-robot
Copy link

@bertinatto: 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.

@kevinrizza
Copy link
Member

/lgtm

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

openshift-ci bot commented Sep 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@bertinatto
Copy link
Member Author

/test unit

@bertinatto
Copy link
Member Author

/remove-label backports/unvalidated-commits

@openshift-ci openshift-ci bot removed the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 5, 2025
@bertinatto
Copy link
Member Author

/retest

@kevinrizza
Copy link
Member

/verified

@openshift-ci-robot
Copy link

@kevinrizza: The /verified command must be used with one of the following actions: by, later, remove, or bypass. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

In response to this:

/verified

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.

@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 6, 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-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 6b60a3f and 2 for PR HEAD 7f37725 in total

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 6, 2025

@bertinatto: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 6efb6a9 into openshift:master Sep 6, 2025
29 checks passed
@openshift-ci-robot
Copy link

@bertinatto: Jira Issue OCPBUGS-60507: All pull requests linked via external trackers have merged:

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

In response to this:

Reverts #2425.

See the additional commit for an explanation of why the original bump broke metal jobs.

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 Author

/cherry-pick release-4.20

@openshift-cherrypick-robot
Copy link

@bertinatto: new pull request created: #2449

In response to this:

/cherry-pick release-4.20

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 7, 2025
Merged
@openshift-ci-robot openshift-ci-robot mentioned this pull request Sep 9, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gangwgr gangwgr Awaiting requested review from gangwgr

@deads2k deads2k Awaiting requested review from deads2k

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

Assignees

@kevinrizza kevinrizza

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. 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.
4 participants
@bertinatto @openshift-ci-robot @kevinrizza @openshift-cherrypick-robot