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
    • Enhanced bootc release image URL resolution to support selecting the RHEL major version dynamically (defaulting to RHEL 9 when not specified).
    • Updated EC/RC and GA release image path handling to reflect the requested RHEL version, ensuring the correct published image digest/URL is used.
    • Adjusted RHEL 10 “latest release” scenario setup to explicitly resolve the latest image for RHEL 10 before running guarded test steps.

@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: ba62355f-5582-4ea9-8846-f92c132ac1f2

📥 Commits

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

📒 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
✅ Files skipped from review due to trivial changes (1)
🚧 Files skipped from review as they are similar to previous changes (2)

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 parameterization
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-standard1.sh, test/scenarios-bootc/el10/releases/el102-lrel@published-images-standard2.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

Suggested reviewers

  • copejon
  • pacevedom
🚥 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 directly and clearly describes the main change: adding RHEL 10 bootc image support in 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 Custom check targets Ginkgo test names, but PR only modifies shell scripts (scenario.sh and scenario files) with no Ginkgo test declarations. Check not applicable.
Test Structure And Quality ✅ Passed Check is not applicable. PR modifies shell scripts for test scenario configuration, not Ginkgo test code. No Go-based tests are changed.
Microshift Test Compatibility ✅ Passed PR contains no new Ginkgo e2e tests; changes are shell script scenario/setup modifications only.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains only shell script changes to scenario management, not Ginkgo e2e tests. Check only applies to Go test files with Ginkgo test constructs.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only test/scenario shell scripts—no deployment manifests, operator code, or scheduling constraints (pod affinity, anti-affinity, topology spread constraints, node selectors) were added...
Ote Binary Stdout Contract ✅ Passed The OTE Binary Stdout Contract check is not applicable; PR modifies only shell scripts (test/bin/scenario.sh and el10 release scenario files), not Go test binaries or OTE binary code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests were added. The PR modifies only bash shell scripts that configure bootc release scenarios, not Go test code.
No-Weak-Crypto ✅ Passed PR contains only shell script configuration for test scenarios with RHEL version parameters; no cryptographic code, weak crypto patterns, or secret comparisons detected.
Container-Privileges ✅ Passed PR only modifies test shell scripts (test/bin/scenario.sh and test scenario files). No container/K8s manifests with privileged configurations are present or modified.
No-Sensitive-Data-In-Logs ✅ Passed PR logs only public image registry URLs and SHA256 digests, no passwords, tokens, API keys, PII, or internal secrets are exposed in logging.

✏️ 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

1 similar comment
@agullon

agullon commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@agullon

agullon commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

/override ci/prow/e2e-aws-tests-bootc-release-el9
/override ci/prow/e2e-aws-tests-bootc-release-el10
/override ci/prow/e2e-aws-tests-bootc-release-arm-el9
/override ci/prow/e2e-aws-tests-bootc-release-arm-el10

@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@agullon: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ci/prow/e2e-aws-tests-bootc-release-arm-el10
  • ci/prow/e2e-aws-tests-bootc-release-arm-el9
  • ci/prow/e2e-aws-tests-bootc-release-el10
  • ci/prow/e2e-aws-tests-bootc-release-el9

Only the following failed contexts/checkruns were expected:

  • CodeRabbit
  • ci/prow/e2e-aws-tests
  • ci/prow/e2e-aws-tests-arm
  • ci/prow/e2e-aws-tests-bootc-arm-el10
  • ci/prow/e2e-aws-tests-bootc-arm-el9
  • ci/prow/e2e-aws-tests-bootc-el10
  • ci/prow/e2e-aws-tests-bootc-el9
  • ci/prow/e2e-aws-tests-bootc-periodic-arm-el10
  • ci/prow/e2e-aws-tests-bootc-periodic-arm-el9
  • ci/prow/e2e-aws-tests-bootc-periodic-el10
  • ci/prow/e2e-aws-tests-bootc-periodic-el9
  • ci/prow/e2e-aws-tests-periodic
  • ci/prow/e2e-aws-tests-periodic-arm
  • ci/prow/images
  • ci/prow/security
  • ci/prow/test-unit
  • ci/prow/verify
  • ci/prow/verify-deps
  • 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-arm-el10
  • pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm-el9
  • pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el10
  • pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el9
  • pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm-el10
  • pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm-el9
  • pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10
  • pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9
  • pull-ci-openshift-microshift-main-e2e-aws-tests-periodic
  • pull-ci-openshift-microshift-main-e2e-aws-tests-periodic-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
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-release-el9
/override ci/prow/e2e-aws-tests-bootc-release-el10
/override ci/prow/e2e-aws-tests-bootc-release-arm-el9
/override ci/prow/e2e-aws-tests-bootc-release-arm-el10

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

agullon commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

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

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

agullon commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

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

@openshift-ci

openshift-ci Bot commented Jun 22, 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-bootc-release-el9 adf15ca link true /test e2e-aws-tests-bootc-release-el9
ci/prow/e2e-aws-tests-bootc-release-el10 adf15ca link true /test e2e-aws-tests-bootc-release-el10
ci/prow/e2e-aws-tests-bootc-periodic-arm-el9 adf15ca link true /test e2e-aws-tests-bootc-periodic-arm-el9
ci/prow/e2e-aws-tests-bootc-release-arm-el9 adf15ca link true /test e2e-aws-tests-bootc-release-arm-el9
ci/prow/e2e-aws-tests-bootc-release-arm-el10 adf15ca link true /test e2e-aws-tests-bootc-release-arm-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