Skip to content

USHIFT-6785: support RHEL 10 bootc images in published-images scenarios#6904

Open
agullon wants to merge 1 commit into
openshift:mainfrom
agullon:USHIFT-6785
Open

USHIFT-6785: support RHEL 10 bootc images in published-images scenarios#6904
agullon wants to merge 1 commit into
openshift:mainfrom
agullon:USHIFT-6785

Conversation

@agullon

@agullon agullon commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Add rhel_version parameter to get_lrel_release_image_url() so el10 scenarios resolve microshift-bootc-rhel10 instead of rhel9
  • Enable el102-lrel@published-images-standard1 scenario (remove .disabled suffix)

Without this fix, the el10 published-images scenarios pull the wrong (rhel9) image.

Backport of #6902 to main.

Jira: USHIFT-6785

🤖 Generated with Claude Code

Summary by CodeRabbit

Release Notes

  • Tests
    • Added support for RHEL 10 version selection in release image resolution scenarios. Updated test infrastructure to enable dynamic RHEL major version configuration, allowing proper image URL resolution for different RHEL versions instead of a hardcoded default.

Add rhel_version parameter to get_lrel_release_image_url() so el10
scenarios resolve microshift-bootc-rhel10 instead of rhel9. Enable
el102-lrel@published-images-standard1 scenario.

USHIFT-6785

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

pre-commit.check-secrets: ENABLED
@coderabbitai

coderabbitai Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 01b26a95-b37d-4fd3-9a10-909637a3374f

📥 Commits

Reviewing files that changed from the base of the PR and between 4a77323 and 1f02f2b.

📒 Files selected for processing (3)
  • test/bin/scenario.sh
  • test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard1.sh
  • test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard2.sh

Walkthrough

get_lrel_release_image_url in test/bin/scenario.sh gains an optional second parameter rhel_version (defaulting to 9) that is substituted into both the EC/RC mirror URL path and the GA microshift-bootc image path. Two el10 scenario scripts are updated to pass 10 as that argument.

Changes

RHEL Version Parameterization

Layer / File(s) Summary
get_lrel_release_image_url RHEL version param
test/bin/scenario.sh
Adds rhel_version optional arg (default 9); uses el${rhel_version} in EC/RC mirror URL and microshift-bootc-rhel${rhel_version} in GA image path.
el10 scenario callers
test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard*.sh
Both scripts pass 10 as the second argument to get_lrel_release_image_url when computing LATEST_RELEASE_IMAGE_URL.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately and specifically describes the main change: adding RHEL 10 bootc image support to published-images scenarios.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR modifies bash shell scripts only, not Ginkgo test files. The custom check applies to Ginkgo test titles, which are not present in this PR.
Test Structure And Quality ✅ Passed PR changes are shell scripts for test infrastructure, not Ginkgo test code. The custom check for Ginkgo test quality (It blocks, BeforeEach/AfterEach, Eventually, Expect) does not apply to this PR.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are added. Changes are only to shell scripts for test scenario infrastructure, which are not subject to this MicroShift compatibility check.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No Ginkgo e2e tests are added; PR only modifies shell scripts (.sh files) for scenario configuration and RHEL image resolution. The SNO test compatibility check does not apply to shell-based scenar...
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only test/scenario shell scripts, not deployment manifests, operator code, or controllers. No scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed PR modifies only bash shell scripts in test/, not OTE binary (Go) code. The check applies to OTE binaries that output JSON to stdout, making it inapplicable here.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR modifies bash scenario setup scripts and helper functions, not Ginkgo e2e tests. The custom check applies only to new Ginkgo tests (It(), Describe(), Context(), When()), which are not prese...
No-Weak-Crypto ✅ Passed PR contains no cryptographic code. Changes are shell script parameter additions to test scenario functions for RHEL version support in image URL resolution.
Container-Privileges ✅ Passed The PR modifies only shell scripts in test/bin and test/scenarios-bootc directories. No container manifests, Dockerfiles, or Kubernetes deployment definitions are present. The check for privileged...
No-Sensitive-Data-In-Logs ✅ Passed PR logs only container image URLs and digests, not passwords, tokens, credentials, or PII. PULL_SECRET_CONTENT is used in sed replacements but never logged.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@agullon agullon changed the title fix: support RHEL 10 bootc images in published-images scenarios USHIFT-6785: support RHEL 10 bootc images in published-images scenarios Jun 18, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 18, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 18, 2026

Copy link
Copy Markdown

@agullon: This pull request references USHIFT-6785 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 "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

  • Add rhel_version parameter to get_lrel_release_image_url() so el10 scenarios resolve microshift-bootc-rhel10 instead of rhel9
  • Enable el102-lrel@published-images-standard1 scenario (remove .disabled suffix)

Without this fix, the el10 published-images scenarios pull the wrong (rhel9) image.

Backport of #6902 to main.

Jira: USHIFT-6785

🤖 Generated with Claude Code

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 jogeo June 18, 2026 11:09
@openshift-ci

openshift-ci Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

[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 Jun 18, 2026
@agullon

agullon commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci

openshift-ci Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

@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-periodic 1f02f2b link true /test e2e-aws-tests-periodic
ci/prow/e2e-aws-tests-bootc-el10 1f02f2b link true /test e2e-aws-tests-bootc-el10
ci/prow/e2e-aws-tests-periodic-arm 1f02f2b link true /test e2e-aws-tests-periodic-arm
ci/prow/e2e-aws-tests-arm 1f02f2b link true /test e2e-aws-tests-arm
ci/prow/e2e-aws-tests 1f02f2b link true /test e2e-aws-tests
ci/prow/e2e-aws-tests-bootc-periodic-el10 1f02f2b link true /test e2e-aws-tests-bootc-periodic-el10

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

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

Development

Successfully merging this pull request may close these issues.

2 participants