Skip to content

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

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
agullon:USHIFT-6515
Jan 27, 2026
Merged

USHIFT-6515: Auto set lrel version and simplify lrel container/toml files#6137
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
agullon:USHIFT-6515

Conversation

@agullon
Copy link
Contributor

@agullon agullon commented Jan 23, 2026

⚠️ This PR must be merged together with openshift/release#73941 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
  • ~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

@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

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

openshift-ci-robot commented Jan 26, 2026

@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: bootc images and rpm-ostree commits
  • ~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-robot
Copy link

openshift-ci-robot commented Jan 26, 2026

@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 > 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
  • ~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.

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

openshift-ci-robot commented Jan 26, 2026

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

⚠️ This PR must be merged together with openshift/release#73941 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
  • ~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-robot
Copy link

openshift-ci-robot commented Jan 26, 2026

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

⚠️ This PR must be merged together with openshift/release#73941 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
  • ~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.

@agullon
Copy link
Contributor Author

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

@ggiguash
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Jan 27, 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

@agullon
Copy link
Contributor Author

agullon commented Jan 27, 2026

/test aws-test-cache
/test aws-test-cache-arm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 27, 2026

@agullon: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aws-ai-model-serving
/test e2e-aws-footprint-and-performance
/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-bootc-release
/test e2e-aws-tests-bootc-release-arm
/test e2e-aws-tests-bootc-upstream
/test e2e-aws-tests-bootc-upstream-arm
/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm
/test e2e-aws-tests-periodic
/test e2e-aws-tests-periodic-arm
/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test ocp-full-conformance-rhel-eus
/test ocp-full-conformance-serial-rhel-eus
/test test-rpm
/test test-unit
/test verify
/test verify-deps

The following commands are available to trigger optional jobs:

/test images
/test security
/test test-rebase

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-microshift-main-e2e-aws-tests
pull-ci-openshift-microshift-main-e2e-aws-tests-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-periodic
pull-ci-openshift-microshift-main-e2e-aws-tests-periodic-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-release
pull-ci-openshift-microshift-main-e2e-aws-tests-release-arm
pull-ci-openshift-microshift-main-images
pull-ci-openshift-microshift-main-security
pull-ci-openshift-microshift-main-test-unit
pull-ci-openshift-microshift-main-verify
pull-ci-openshift-microshift-main-verify-deps
Details

In response to this:

/test aws-test-cache
/test aws-test-cache-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.

@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

/retest

@ggiguash
Copy link
Contributor

/override ci/prow/e2e-aws-tests-bootc-release
/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 27, 2026
@openshift-ci-robot
Copy link

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

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-release
/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 27, 2026

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

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-release
/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
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0fd4ebe and 2 for PR HEAD c9db176 in total

@ggiguash
Copy link
Contributor

Failures unrelated to the change. Saving on CI cycles.
/override ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-bootc-periodic

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 27, 2026

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

Details

In response to this:

Failures unrelated to the change. Saving on CI cycles.
/override ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-bootc-periodic

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 27, 2026

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

@openshift-merge-bot openshift-merge-bot bot merged commit cc9ec37 into openshift:main Jan 27, 2026
20 checks passed
@agullon
Copy link
Contributor Author

agullon commented Jan 27, 2026

/cherrypick release-4.21

@openshift-cherrypick-robot

@agullon: #6137 failed to apply on top of branch "release-4.21":

Applying: Refactor release type determination and update image references
Using index info to reconstruct a base tree...
M	test/assets/common_versions.sh.template
M	test/bin/common_versions.sh
M	test/bin/pyutils/generate_common_versions.py
A	test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh
A	test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh
A	test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh
A	test/scenarios/releases/el96-yminus2@el96-lrel@lvms.sh
A	test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh
A	test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh deleted in HEAD and modified in Refactor release type determination and update image references. Version Refactor release type determination and update image references of test/scenarios/releases/el96-yminus2@el96-lrel@standard2.sh left in tree.
CONFLICT (modify/delete): test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh deleted in HEAD and modified in Refactor release type determination and update image references. Version Refactor release type determination and update image references of test/scenarios/releases/el96-yminus2@el96-lrel@standard1.sh left in tree.
CONFLICT (modify/delete): test/scenarios/releases/el96-yminus2@el96-lrel@lvms.sh deleted in HEAD and modified in Refactor release type determination and update image references. Version Refactor release type determination and update image references of test/scenarios/releases/el96-yminus2@el96-lrel@lvms.sh left in tree.
CONFLICT (modify/delete): test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh deleted in HEAD and modified in Refactor release type determination and update image references. Version Refactor release type determination and update image references of test/scenarios-bootc/releases/el96-y2@el96-lrel@standard2.sh left in tree.
CONFLICT (modify/delete): test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh deleted in HEAD and modified in Refactor release type determination and update image references. Version Refactor release type determination and update image references of test/scenarios-bootc/releases/el96-y2@el96-lrel@standard1.sh left in tree.
CONFLICT (modify/delete): test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh deleted in HEAD and modified in Refactor release type determination and update image references. Version Refactor release type determination and update image references of test/scenarios-bootc/releases/el96-y2@el96-lrel@lvms.sh left in tree.
Removing test/image-blueprints/layer4-release/group4/rhel96-brew-zstream-with-optionals.image-installer
Removing test/image-blueprints/layer4-release/group4/rhel96-brew-rc-with-optionals.image-installer
Removing test/image-blueprints/layer4-release/group4/rhel96-brew-ec-with-optionals.image-installer
Removing test/image-blueprints/layer4-release/group3/rhel96-brew-zstream-with-optionals.toml
Removing test/image-blueprints/layer4-release/group3/rhel96-brew-ec-with-optionals.toml
Removing test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-zstream-with-optional.image-bootc
Removing test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile
Removing test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-zstream-with-optional-fips.containerfile
Removing test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-rc-with-optional.image-bootc
Removing test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-rc-with-optional-tuned.containerfile
Removing test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-rc-with-optional-fips.containerfile
Removing test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-ec-with-optional.image-bootc
Removing test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-zstream-with-optional.containerfile
Removing test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-ec-with-optional.containerfile
Removing test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew-zstream-with-optional.containerfile
Removing test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew-rc-with-optional.containerfile
Auto-merging test/bin/pyutils/generate_common_versions.py
CONFLICT (content): Merge conflict in test/bin/pyutils/generate_common_versions.py
Auto-merging test/bin/common_versions.sh
CONFLICT (content): Merge conflict in test/bin/common_versions.sh
Auto-merging test/assets/common_versions.sh.template
CONFLICT (content): Merge conflict in test/assets/common_versions.sh.template
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Refactor release type determination and update image references

Details

In response to this:

/cherrypick release-4.21

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.

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. 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.

4 participants