Skip to content

[release-4.21] USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios#6350

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.21from
agullon:USHIFT-6073_release-4.21
Mar 13, 2026
Merged

[release-4.21] USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios#6350
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.21from
agullon:USHIFT-6073_release-4.21

Conversation

@agullon
Copy link
Copy Markdown
Contributor

@agullon agullon commented Mar 13, 2026

Summary

  • Backport #6305 to release-4.21, adapting it for el96 release scenarios instead of the main branch el98 variants
  • Add zprel -> lrel RPM upgrade coverage for release scenarios, with skip logic when the previous z-stream package is unavailable or already matches the target build
  • Split install/remove coverage out of the existing RPM upgrade scenario and add extra version logging to improve upgrade diagnostics

Note

I tested the happy path by manually setting the zprel to 4.21.0. You can see the RF log here.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 13, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 13, 2026

@agullon: This pull request references USHIFT-6073 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 task to target the "4.21.z" version, but no target version was set.

Details

In response to this:

pre-commit.check-secrets: ENABLED

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 13, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: b5a47d97-05fb-4b06-b522-9bb8fc4b2733

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci bot requested review from jogeo and kasturinarra March 13, 2026 10:00
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 13, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 13, 2026

@agullon: This pull request references USHIFT-6073 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 task to target the "4.21.z" version, but no target version was set.

Details

In response to this:

Summary

  • Backport #6305 to release-4.21, adapting it for el96 release scenarios instead of the main branch el98 variants
  • Add zprel -> lrel RPM upgrade coverage for release scenarios, with skip logic when the previous z-stream package is unavailable or already matches the target build
  • Split install/remove coverage out of the existing RPM upgrade scenario and add extra version logging to improve upgrade diagnostics

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
Copy Markdown

openshift-ci-robot commented Mar 13, 2026

@agullon: This pull request references USHIFT-6073 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 task to target the "4.21.z" version, but no target version was set.

Details

In response to this:

Summary

  • Backport #6305 to release-4.21, adapting it for el96 release scenarios instead of the main branch el98 variants
  • Add zprel -> lrel RPM upgrade coverage for release scenarios, with skip logic when the previous z-stream package is unavailable or already matches the target build
  • Split install/remove coverage out of the existing RPM upgrade scenario and add extra version logging to improve upgrade diagnostics

[!NOTE]
I tested the happy path by manually setting the zprel to 4.21.0. You can see the RF log here.

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.

@agullon
Copy link
Copy Markdown
Contributor Author

agullon commented Mar 13, 2026

I'll override some release CI jobs: most of the failures are because the target version is old: 4.21.0:

/override ci/prow/e2e-aws-tests-bootc-release
/override ci/prow/e2e-aws-tests-bootc-release-arm
/override ci/prow/e2e-aws-tests-release
/override ci/prow/e2e-aws-tests-release-arm

and the changes in this PR has been successfully tested here

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 13, 2026

@agullon: Overrode contexts on behalf of agullon: ci/prow/e2e-aws-tests-bootc-release, ci/prow/e2e-aws-tests-bootc-release-arm, ci/prow/e2e-aws-tests-release, ci/prow/e2e-aws-tests-release-arm

Details

In response to this:

I'll override some release CI jobs: most of the failures are because the target version is old: 4.21.0:

/override ci/prow/e2e-aws-tests-bootc-release
/override ci/prow/e2e-aws-tests-bootc-release-arm
/override ci/prow/e2e-aws-tests-release
/override ci/prow/e2e-aws-tests-release-arm

and the changes in this PR has been successfully tested here

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 Mar 13, 2026

@agullon: 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-aws-tests-release dfa88dd link true /test e2e-aws-tests-release
ci/prow/e2e-aws-tests-release-arm dfa88dd link true /test e2e-aws-tests-release-arm
ci/prow/e2e-aws-tests-bootc-release dfa88dd link true /test e2e-aws-tests-bootc-release
ci/prow/e2e-aws-tests-bootc-release-arm dfa88dd link true /test e2e-aws-tests-bootc-release-arm

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.

@ggiguash
Copy link
Copy Markdown
Contributor

/label backport-risk-assessed
/lgtm
/verified by ci
/label jira/valid-bug

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 13, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 13, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@ggiguash: This PR has been marked as verified by ci.

Details

In response to this:

/label backport-risk-assessed
/lgtm
/verified by ci
/label jira/valid-bug

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 added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Mar 13, 2026
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, ggiguash

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-merge-bot openshift-merge-bot bot merged commit 7ab86a4 into openshift:release-4.21 Mar 13, 2026
19 checks passed
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. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants