Skip to content

USHIFT-6515: Auto set lrel version and simplify lrel container/toml files #6137

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
Open
agullon wants to merge 3 commits into
base: main
Choose a base branch
from
Open

USHIFT-6515: Auto set lrel version and simplify lrel container/toml files #6137

agullon wants to merge 3 commits into from
+107 −605

Conversation

@agullon
Copy link
Contributor

@agullon agullon commented Jan 23, 2026

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
    • 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
  • ~75 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

@agullon
Refactor release type determination and update image references
b0b5627 
- Updated the logic for determining the latest release type in `common_versions.sh` and `common_versions.sh.template` to prioritize zstream > RC > EC.
- 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.
@agullon
temp change to test the build cache images
4bcfe64
@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 23, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 23, 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.22.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
    • 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
  • ~75 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 jogeo and vanhalenar January 23, 2026 15:53
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 23, 2026

[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:

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 Jan 23, 2026
@agullon agullon changed the title USHIFT-6515: Refactor release type determination and update image references USHIFT-6515: Auto set lrel version and simplify lrel container/toml files Jan 23, 2026
@agullon
Copy link
Contributor Author

agullon commented Jan 23, 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

@openshift-ci
Copy link
Contributor

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

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.

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

Reviewers

@jogeo jogeo Awaiting requested review from jogeo

@vanhalenar vanhalenar Awaiting requested review from vanhalenar

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@agullon @openshift-ci-robot