Skip to content

[release-4.21] USHIFT-6515 USHIFT-6542: Auto set lrel version and simplify lrel container/toml files#6157

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.21from
agullon:USHIFT-6515_421
Jan 29, 2026
Merged

[release-4.21] USHIFT-6515 USHIFT-6542: Auto set lrel version and simplify lrel container/toml files#6157
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.21from
agullon:USHIFT-6515_421

Conversation

@agullon
Copy link
Contributor

@agullon agullon commented Jan 27, 2026 •
edited
Loading

This is a manual cherrypick from #6137 PR

Changes

  • Unified templates: Single lrel containerfile/blueprint replaces ec/rc/zstream variants
  • Dynamic selection: common_versions.sh auto-selects version based on priority
    • zstream > RC > EC > nightly
    • This is automated now. No need to manually change ever again the LATEST_RELEASE_TYPE and BREW_LREL_RELEASE_VERSION vars.
  • Consistent naming: rhel96-{type}-brew-lrel-{variant} pattern for all images: bootc images and rpm-ostree commits
  • 70 files changed: 16 deleted, 2 created, 46 scenarios updated and 6 renamed

Why

  • 3 nearly-identical files maintained for each image variant (EC, RC, zstream)
  • Wasted builds: All 3 images built even though only one is needed
    • Because we only need the latest release for Release Testing: EC, RC or zstream
    • This will save space in cache and save time when fetching the cache.
  • Inconsistent naming between bootc and OSTree images

@agullon
Refactor release type determination and update image references
d3fa36f 
- Updated the logic for determining the latest release type in `common_versions.sh` and `common_versions.sh.template` to prioritize zstream > RC > EC > nightly.
- Removed deprecated image templates for EC and Z-stream releases, and added new templates for LREL releases.
- Updated various scenario scripts to reference the new LREL image names, ensuring consistency across the codebase.
- Cleaned up unused files related to previous release types to streamline the project structure.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 27, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 27, 2026 •
edited by openshift-ci bot
Loading

@agullon: This pull request references USHIFT-6515 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:

Changes

  • Unified templates: Single lrel containerfile/blueprint replaces ec/rc/zstream variants
  • Dynamic selection: common_versions.sh auto-selects version based on priority
    • zstream > RC > EC > nightly
    • This is automated now. No need to manually change ever again the LATEST_RELEASE_TYPE and BREW_LREL_RELEASE_VERSION vars.
  • Consistent naming: rhel96-{type}-brew-lrel-{variant} pattern for all images: bootc images and rpm-ostree commits
  • 70 files changed: 18 deleted, 3 created, 47 scenarios updated

Why

  • 3 nearly-identical files maintained for each image variant (EC, RC, zstream)
  • Wasted builds: All 3 images built even though only one is needed
    • Because we only need the latest release for Release Testing: EC, RC or zstream
    • This will save space in cache and save time when fetching the cache.
  • Inconsistent naming between bootc and OSTree images

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 requested review from jerpeter1 and pacevedom January 27, 2026 17:16
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2026
@agullon agullon changed the title USHIFT-6515: Auto set lrel version and simplify lrel container/toml files [release-4.21] USHIFT-6515: Auto set lrel version and simplify lrel container/toml files Jan 27, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 27, 2026 •
edited by openshift-ci bot
Loading

@agullon: This pull request references USHIFT-6515 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:

This is a manual cherrypick from #6137 PR

Changes

  • Unified templates: Single lrel containerfile/blueprint replaces ec/rc/zstream variants
  • Dynamic selection: common_versions.sh auto-selects version based on priority
    • zstream > RC > EC > nightly
    • This is automated now. No need to manually change ever again the LATEST_RELEASE_TYPE and BREW_LREL_RELEASE_VERSION vars.
  • Consistent naming: rhel96-{type}-brew-lrel-{variant} pattern for all images: bootc images and rpm-ostree commits
  • 70 files changed: 18 deleted, 3 created, 47 scenarios updated

Why

  • 3 nearly-identical files maintained for each image variant (EC, RC, zstream)
  • Wasted builds: All 3 images built even though only one is needed
    • Because we only need the latest release for Release Testing: EC, RC or zstream
    • This will save space in cache and save time when fetching the cache.
  • Inconsistent naming between bootc and OSTree images

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

openshift-ci-robot commented Jan 27, 2026 •
edited by openshift-ci bot
Loading

@agullon: This pull request references USHIFT-6515 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:

This is a manual cherrypick from #6137 PR

Changes

  • Unified templates: Single lrel containerfile/blueprint replaces ec/rc/zstream variants
  • Dynamic selection: common_versions.sh auto-selects version based on priority
    • zstream > RC > EC > nightly
    • This is automated now. No need to manually change ever again the LATEST_RELEASE_TYPE and BREW_LREL_RELEASE_VERSION vars.
  • Consistent naming: rhel96-{type}-brew-lrel-{variant} pattern for all images: bootc images and rpm-ostree commits
  • 70 files changed: 16 deleted, 2 created, 46 scenarios updated and 6 renamed

Why

  • 3 nearly-identical files maintained for each image variant (EC, RC, zstream)
  • Wasted builds: All 3 images built even though only one is needed
    • Because we only need the latest release for Release Testing: EC, RC or zstream
    • This will save space in cache and save time when fetching the cache.
  • Inconsistent naming between bootc and OSTree images

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
Contributor Author

agullon commented Jan 27, 2026

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

@agullon
Copy link
Contributor Author

agullon commented Jan 27, 2026

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

@agullon
Copy link
Contributor Author

agullon commented Jan 28, 2026

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 28, 2026

@agullon: you cannot LGTM your own PR.

Details

In response to this:

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

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-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 28, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 28, 2026

@agullon: This PR has been marked as verified by CI.

Details

In response to this:

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

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
Contributor Author

agullon commented Jan 28, 2026

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

@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 Jan 28, 2026
@agullon
Copy link
Contributor Author

agullon commented Jan 28, 2026

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 28, 2026

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

Details

In response to this:

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

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 Jan 28, 2026

@agullon: you cannot LGTM your own PR.

Details

In response to this:

/lgtm

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.

@ggiguash
Copy link
Contributor

ggiguash commented Jan 28, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 28, 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-ci-robot
Copy link

openshift-ci-robot commented Jan 28, 2026

/retest-required

Remaining retests: 0 against base HEAD 509fdb7 and 2 for PR HEAD d3fa36f in total

@ggiguash
Copy link
Contributor

ggiguash commented Jan 29, 2026

/retest-required

@pacevedom
Copy link
Contributor

pacevedom commented Jan 29, 2026

/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
failures due to timeouts, unrelated to this PR.

/verified by CI

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 29, 2026

@pacevedom: This PR has been marked as verified by CI.

Details

In response to this:

/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
failures due to timeouts, unrelated to this PR.

/verified by CI

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
Copy link
Contributor

openshift-ci bot commented Jan 29, 2026

@pacevedom: Overrode contexts on behalf of pacevedom: 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:

/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
failures due to timeouts, unrelated to this PR.

/verified by CI

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.

@pacevedom
Copy link
Contributor

pacevedom commented Jan 29, 2026 •
edited by openshift-ci bot
Loading

/retitle [release-4.21] USHIFT-6515 USHIFT-6542: Auto set lrel version and simplify lrel container/toml files

@openshift-ci openshift-ci bot changed the title [release-4.21] USHIFT-6515: Auto set lrel version and simplify lrel container/toml files [release-4.21] USHIFT-6515 USHIFT-6542: Auto set lrel version and simplify lrel container/toml files Jan 29, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 29, 2026 •
edited by openshift-ci bot
Loading

@agullon: This pull request references USHIFT-6515 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.

This pull request references USHIFT-6542 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 bug to target the "4.21.0" version, but no target version was set.

Retaining the jira/valid-bug label as it was manually added.

Details

In response to this:

This is a manual cherrypick from #6137 PR

Changes

  • Unified templates: Single lrel containerfile/blueprint replaces ec/rc/zstream variants
  • Dynamic selection: common_versions.sh auto-selects version based on priority
    • zstream > RC > EC > nightly
    • This is automated now. No need to manually change ever again the LATEST_RELEASE_TYPE and BREW_LREL_RELEASE_VERSION vars.
  • Consistent naming: rhel96-{type}-brew-lrel-{variant} pattern for all images: bootc images and rpm-ostree commits
  • 70 files changed: 16 deleted, 2 created, 46 scenarios updated and 6 renamed

Why

  • 3 nearly-identical files maintained for each image variant (EC, RC, zstream)
  • Wasted builds: All 3 images built even though only one is needed
    • Because we only need the latest release for Release Testing: EC, RC or zstream
    • This will save space in cache and save time when fetching the cache.
  • Inconsistent naming between bootc and OSTree images

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
Copy link
Contributor

openshift-ci bot commented Jan 29, 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-bootc-release-arm d3fa36f link true /test e2e-aws-tests-bootc-release-arm
ci/prow/e2e-aws-tests-release-arm d3fa36f link true /test e2e-aws-tests-release-arm
ci/prow/e2e-aws-tests-release d3fa36f link true /test e2e-aws-tests-release
ci/prow/e2e-aws-tests-bootc-release d3fa36f link true /test e2e-aws-tests-bootc-release

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 3426b95 into openshift:release-4.21 Jan 29, 2026
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

@pacevedom pacevedom Awaiting requested review from pacevedom

Assignees

@ggiguash ggiguash

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@agullon @openshift-ci-robot @ggiguash @pacevedom