USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios #5862

agullon · 2025-12-05T10:00:41Z

This PR adds the capability to test Z-stream upgrades (e.g., 4.22.3 -> 4.22.7) in addition to the existing Y-stream upgrade tests (e.g., 4.21 -> 4.22).

Changes include:

Add 2 new Release Testing bootc scenarios to exercise previous Z upgrade path
Add bootc containerfile and scenario files for previous Z upgrade testing
Add PREV_ZSTREAM version variables for tracking theprevious z-stream of the current minor release
Rename variables from confusing Y0/Z1/Y1/Y2 pattern to clearer naming:
- LATEST_ZSTREAM_VERSION: Latest z-stream of current minor
- PREV_ZSTREAM_VERSION: Previous z-stream of current minor
- YMINUS1_VERSION: Latest z-stream of Y-1 minor
- YMINUS2_VERSION: Latest z-stream of Y-2 minor
Add documentation comments explaining the version naming convention

openshift-ci-robot · 2025-12-05T10:00:46Z

@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.0" version, but no target version was set.

Details

In response to this:

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 · 2025-12-05T10:01:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon

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:

~~OWNERS~~ [agullon]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

agullon · 2025-12-05T14:09:41Z

/retest

openshift-ci-robot · 2025-12-09T15:34:22Z

@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.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing scenarios to exercise Z-1 upgrade path.

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 · 2025-12-09T15:38:03Z

@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.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z-(ec|rc|nightly) to support Z-1 versions

find_package option added to manage_brew_rpms.sh to support it

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 · 2025-12-09T15:48:55Z

@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.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z-(ec|rc|nightly) to support Z-1 versions

find_package option added to manage_brew_rpms.sh to support it

⚠️ PR openshift/release#72367 must be merged at the same time.

also backport this to release-4.20 and release-4.19

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 · 2025-12-10T16:09:39Z

@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.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z{-(ec|rc|nightly)} to support Z-1 versions

find_package option added to manage_brew_rpms.sh to support it

⚠️ PR openshift/release#72367 must be merged at the same time.

also backport this to release-4.20 and release-4.19

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 · 2025-12-10T22:36:15Z

/test e2e-aws-tests-bootc-release-arm e2e-aws-tests-bootc-release

openshift-ci-robot · 2025-12-15T08:10:28Z

@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.22.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z{-(ec|rc|nightly)} to support Z-1 versions

find_package option added to manage_brew_rpms.sh to support it

⚠️ PR openshift/release#72367 must be merged at the same time.

also backport this to release-4.21, release-4.20 and release-4.19

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 · 2025-12-15T09:05:13Z

@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.22.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z{-(ec|rc|nightly)} to support Z-1 versions

find_package option added to manage_brew_rpms.sh to support it

⚠️ PR openshift/release#72367 must be merged first to be able to download Z-1 brew RPMs.

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.

ggiguash · 2025-12-17T06:56:50Z

/hold

I would like us to try implementing the same without adding extra options / dimensions to the manage_brew_rpms.sh script (i.e. 0 and 1 flags).
One idea is to always download more than one latest versions, for example the last two. This way, previous version should be handy in the cache if required.

openshift-ci-robot · 2025-12-17T15:58:03Z

@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.22.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z{-(ec|rc|nightly)} to support Z-1 versions

manage_brew_rpms.sh download 4.${X} ${OUTPUT_DIR} stream now downloads internally 4 different versions. Example for X=19:

Y0_VERSION=4.19.7

Z1_VERSION=4.19.0

Y1_VERSION=4.18.26

Y2_VERSION=4.17.44

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 · 2025-12-18T07:24:45Z

/retest

agullon · 2025-12-18T11:18:17Z

/retest

agullon · 2025-12-18T18:25:12Z

/retest

openshift-ci-robot · 2025-12-19T09:44:06Z

@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.22.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z{-(ec|rc|nightly)} to support Z-1 versions

manage_brew_rpms.sh download 4.${X} ${OUTPUT_DIR} zstream now downloads internally 4 different versions: current, Z-1, Y-2 and Y-1. Example for X=19:

Y0_VERSION=4.19.7

Z1_VERSION=4.19.0

Y1_VERSION=4.18.26

Y2_VERSION=4.17.44

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 · 2025-12-19T09:44:23Z

@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.22.0" version, but no target version was set.

Details

In response to this:

Add 2 new Release Testing bootc scenarios to exercise Z-1 upgrade path

Changes brew-rpms sub dirs from X.Y-(zstream|ec|rc|nightly) format to X.Y.Z{-(ec|rc|nightly)} to support Z-1 versions

manage_brew_rpms.sh download 4.${X} ${OUTPUT_DIR} zstream now downloads internally 4 different versions: current, Z-1, Y-2 and Y-1.

Example for X=19:

Y0_VERSION=4.19.7

Z1_VERSION=4.19.0

Y1_VERSION=4.18.26

Y2_VERSION=4.17.44

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 · 2025-12-19T09:48:00Z

/hold

I would like us to try implementing the same without adding extra options / dimensions to the manage_brew_rpms.sh script (i.e. 0 and 1 flags).
One idea is to always download more than one latest versions, for example the last two. This way, previous version should be handy in the cache if required.

@ggiguash can you please review this PR again please? I modified the implementation with your suggestion. See PR description.

Important, CI jobs are using custom S3 bucket to not mess up the cache: AWS_BUCKET_NAME="microshift-build-ushift-6073-cache-us-west-2"

agullon · 2025-12-24T14:24:10Z

/test e2e-aws-tests-bootc-release e2e-aws-tests-release e2e-aws-tests-bootc-release-arm e2e-aws-tests-release-arm

agullon · 2025-12-24T16:41:49Z

/test e2e-aws-tests-bootc-release

agullon · 2026-01-21T14:55:41Z

/retest

agullon · 2026-01-21T21:55:28Z

/retest

openshift-ci-robot · 2026-01-30T11:21:45Z

@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.22.0" version, but no target version was set.

Details

In response to this:

This PR adds the capability to test Z-stream upgrades (e.g., 4.22.3 -> 4.22.7) in addition to the existing Y-stream upgrade tests (e.g., 4.21 -> 4.22).

Changes include:

Add 2 new Release Testing bootc scenarios to exercise previous Z upgrade path

Add bootc containerfile and scenario files for previous Z upgrade testing

Add PREV_ZSTREAM version variables for tracking theprevious z-stream of the current minor release

Rename variables from confusing Y0/Z1/Y1/Y2 pattern to clearer naming:

LATEST_ZSTREAM_VERSION: Latest z-stream of current minor

PREV_ZSTREAM_VERSION: Previous z-stream of current minor

YMINUS1_VERSION: Latest z-stream of Y-1 minor

YMINUS2_VERSION: Latest z-stream of Y-2 minor

Add documentation comments explaining the version naming convention

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 · 2026-01-30T11:22:25Z

/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm

agullon · 2026-01-30T11:32:31Z

/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm

This PR adds the capability to test Z-stream upgrades (e.g., 4.22.0 -> 4.22.7) in addition to the existing Y-stream upgrade tests (e.g., 4.21 -> 4.22). Changes include: - Add PREV_ZSTREAM version variables for tracking the first/previous z-stream of the current minor release - Add bootc containerfile and scenario files for Z-1 upgrade testing - Rename variables from confusing Y0/Z1/Y1/Y2 pattern to clearer naming: - LATEST_ZSTREAM_VERSION: Latest z-stream of current minor - PREV_ZSTREAM_VERSION: Previous z-stream of current minor (Z-1 upgrade source) - YMINUS1_VERSION: Latest z-stream of Y-1 minor - YMINUS2_VERSION: Latest z-stream of Y-2 minor - Add documentation comments explaining the version naming convention rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

agullon · 2026-01-30T12:25:55Z

/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

agullon · 2026-01-30T16:07:12Z

/retest

openshift-ci · 2026-01-30T17:51:30Z

@agullon: all tests passed!

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.

agullon · 2026-01-30T18:07:37Z

test/bin/manage_build_cache.sh

 source "${SCRIPTDIR}/common.sh"

 AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}"
+AWS_BUCKET_NAME="microshift-build-ushift-6073-cache-us-west-2"


This line has been added only for testing purposes. It must be removed before merging.

agullon · 2026-01-30T18:08:40Z

@ggiguash I've updated the variable names for better clarity, please review it again. Thanks.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 5, 2025

openshift-ci bot requested review from eslutsky and jogeo December 5, 2025 10:01

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2025

agullon mentioned this pull request Dec 9, 2025

USHIFT-6073: Add upgrade path on releases scenarios: from Z-1 openshift/release#72367

Closed

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2025

agullon force-pushed the USHIFT-6073 branch from 428a8b5 to 45030c5 Compare December 17, 2025 16:04

agullon force-pushed the USHIFT-6073 branch from bdd032d to 2f9399b Compare January 30, 2026 11:16

agullon force-pushed the USHIFT-6073 branch from 2f9399b to 640517c Compare January 30, 2026 11:18

agullon force-pushed the USHIFT-6073 branch from 0057c28 to efc09f4 Compare January 30, 2026 11:31

agullon force-pushed the USHIFT-6073 branch from efc09f4 to dfa1ca4 Compare January 30, 2026 12:25

agullon changed the title ~~USHIFT-6073: Add upgrade path on releases scenarios: from Z-1~~ USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios Jan 30, 2026

temp bucket for testing

f8f4992

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

agullon commented Jan 30, 2026

View reviewed changes

USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios #5862

Are you sure you want to change the base?

USHIFT-6073: Add "from previous Z" upgrade path on releases scenarios #5862

Uh oh!

Conversation

agullon commented Dec 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 5, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Dec 5, 2025

Uh oh!

agullon commented Dec 5, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 9, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 9, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 10, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agullon commented Dec 10, 2025

Uh oh!

openshift-ci-robot commented Dec 15, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 15, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ggiguash commented Dec 17, 2025

Uh oh!

openshift-ci-robot commented Dec 17, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agullon commented Dec 18, 2025

Uh oh!

agullon commented Dec 18, 2025

Uh oh!

agullon commented Dec 18, 2025

Uh oh!

openshift-ci-robot commented Dec 19, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 19, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agullon commented Dec 19, 2025

Uh oh!

agullon commented Dec 24, 2025

Uh oh!

agullon commented Dec 24, 2025

Uh oh!

agullon commented Jan 21, 2026

Uh oh!

agullon commented Jan 21, 2026

Uh oh!

openshift-ci-robot commented Jan 30, 2026 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agullon commented Jan 30, 2026

Uh oh!

agullon commented Jan 30, 2026

Uh oh!

agullon commented Jan 30, 2026

Uh oh!

agullon commented Jan 30, 2026

Uh oh!

openshift-ci bot commented Jan 30, 2026

Uh oh!

agullon Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

agullon commented Jan 30, 2026

Uh oh!

agullon commented Dec 5, 2025 •

edited

Loading

openshift-ci-robot commented Dec 5, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 9, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 9, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 9, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 10, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 15, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 15, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 17, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 19, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 19, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 30, 2026 •

edited by openshift-ci bot

Loading