USHIFT-7169: Add RHEL 10.2 RPM standard release test scenario by agullon · Pull Request #6873 · openshift/microshift

agullon · 2026-06-15T11:36:14Z

Summary

Add a release test scenario for validating MicroShift RPM lifecycle on
a bare RHEL 10.2 VM:

el102@rpm-standard.sh — runs install, standard1, standard2, and
remove test suites sequentially on a single VM (consolidated from the
split standard1/standard2 pattern used in RHEL 9 ostree scenarios)

Located under test/scenarios-bootc/el10/releases/, adapted from
el98@rpm-standard{1,2}.sh with RHEL 10 adaptations:

rhel102-installer VM image (label updated in image-installer)
RHOCP/fast-datapath repos configured via CDN entitlement certs
(subscription-manager doesn't support these repos on RHEL 10)
subscription-manager release --set 10.2
Extended timeout (TEST_EXECUTION_TIMEOUT=60m) since both suites
run on one VM

Test plan

e2e-aws-tests-bootc-release-el10 passes with new scenario
No regression on existing e2e-aws-tests-bootc-el9 jobs

JIRA: https://issues.redhat.com/browse/USHIFT-7169

openshift-ci · 2026-06-15T11:36:19Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

coderabbitai · 2026-06-15T11:37:03Z

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

@coderabbitai resume to resume automatic reviews.
@coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

▶️ Resume reviews
🔍 Trigger review

Walkthrough

Adds RHEL 10.2 bootc test scenario scripts with repository configuration and VM lifecycle helpers. Updates build and test scripts across shell and Python to detect RHEL major version dynamically instead of hardcoding RHEL 9. Bumps image blueprint to 10.2 and adjusts Composer package selection for RHEL 10-specific build tools.

Changes

RHEL 10.2 test scenarios and dynamic version parametrization

Layer / File(s)	Summary
RHEL 10.2 test scenario scripts `test/scenarios-bootc/el10/releases/el102@rpm-standard1.sh`, `test/scenarios-bootc/el10/releases/el102@rpm-standard2.sh`	Introduces complete test scenario workflows with environment setup, `configure_cdn_repo` and `configure_rhocp_repo` helpers for entitlement-based repository configuration, and lifecycle functions for VM creation, removal, and test execution with RHOCP/fast-datapath repository sources.
RHEL version parametrization in shell scripts `scripts/devenv-builder/configure-vm.sh`, `scripts/get-latest-rhocp-repo.sh`, `test/bin/scenario.sh`	Moves RHEL version detection from function-local scope to script entry, then applies detected `RHEL_MAJOR` to subscription-manager repo enablement, RHOCP repository name construction, beta mirror URLs, and Z-stream package existence checks across three scripts.
RHEL version parametrization in Python test utilities `test/bin/pyutils/generate_common_versions.py`, `test/bin/pyutils/build_bootc_images.py`	Computes `RHEL_MAJOR` from host OS release and parametrizes RHOCP repository names, OpenShift candidate URLs, beta mirror URLs, GitOps repositories, and conditional container-image extraction based on detected RHEL version.
Image blueprint version and Composer dependencies `test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-installer.image-installer`, `scripts/devenv-builder/configure-composer.sh`	Updates image blueprint to RHEL 10.2 and removes obsolete TODO; dynamically selects Composer package list with RHEL 10+ build tools (`crun`, `xorriso`) replacing older alternatives.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~13 minutes

Possibly related PRs

openshift/microshift#6862: Updates configure-vm.sh RHOCP repo enablement and get-latest-rhocp-repo.sh output formatting with overlapping repository naming and URL construction logic.

Suggested reviewers

ggiguash
vanhalenar

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 42.11% 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
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 does not introduce or modify any Ginkgo test files. All modified files are Bash scripts, Python scripts, or configuration files; test suites referenced are Robot Framework tests, not Ginkgo. Che...
Test Structure And Quality	✅ Passed	PR contains no Ginkgo test code (only shell scripts, Python utilities, and image blueprints), making this test quality check inapplicable.
Microshift Test Compatibility	✅ Passed	No Ginkgo e2e tests are added in this PR. Changes are shell scripts and Python utilities for test infrastructure and RHEL 10 support, not Go test files.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	This PR does not add any new Ginkgo e2e tests. All changes are infrastructure/configuration files (shell scripts, Python scripts, image blueprints) used to set up test environments. The custom chec...
Topology-Aware Scheduling Compatibility	✅ Passed	PR contains only test infrastructure and build scripts (scenario scripts, build helpers, image blueprints), no Kubernetes manifests, operator code, or controllers. Topology-aware scheduling check i...
Ote Binary Stdout Contract	✅ Passed	OTE Binary Stdout Contract check does not apply; PR modifies only Bash/Python scripts and configuration files, not Go test binaries.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR contains no Ginkgo e2e tests (It/Describe/Context/When patterns). Files added are shell scenario scripts and Python infrastructure utilities, which are outside scope of IPv6/disconnected network...
No-Weak-Crypto	✅ Passed	No weak cryptographic algorithms (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB), custom crypto implementations, or non-constant-time secret comparisons found in the PR.
Container-Privileges	✅ Passed	PR contains no container or K8s manifests; changes are shell scripts, Python utilities, and image blueprints unrelated to privileged container configurations.
No-Sensitive-Data-In-Logs	✅ Passed	No sensitive data logging found. The PR adds RHEL 10 test scenarios and updates scripts to use dynamic version detection. All logging statements output non-sensitive data (repo names, URLs, version...
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately summarizes the main changes: adding RHEL 10.2 RPM standard release test scenarios (el102@rpm-standard1.sh and el102@rpm-standard2.sh).

_{✏️ 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.}

agullon · 2026-06-15T11:37:09Z

/test ci/prow/e2e-aws-tests-bootc-release-el10
/test ci/prow/e2e-aws-tests-bootc-release-arm-el10

agullon · 2026-06-15T11:37:49Z

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

coderabbitai

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@test/scenarios-bootc/el10/releases/el102`@rpm-standard2.sh:
- Around line 123-129: Add the missing OS version assertion to the run_tests
call in el102@rpm-standard2.sh to match the paired scenario
el102@rpm-standard1.sh. Include a new variable assignment for
EXPECTED_OS_VERSION:10.2 alongside the existing SOURCE_REPO_URL and
TARGET_VERSION variables in the run_tests invocation to ensure provisioning
drift is validated against the explicit 10.2 target.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

Push a commit to this branch (recommended)
Create a new PR with the fixes

ℹ️ Review info

⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 6ae7012e-c24f-4797-9441-4440bba955fd

📥 Commits

Reviewing files that changed from the base of the PR and between cc4654e and cb383eb.

📒 Files selected for processing (2)

test/scenarios-bootc/el10/releases/el102@rpm-standard1.sh
test/scenarios-bootc/el10/releases/el102@rpm-standard2.sh

agullon · 2026-06-15T11:43:45Z

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

openshift-ci-robot · 2026-06-15T11:45:16Z

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

Details

In response to this:

Summary

Add el102@rpm-standard1.sh and el102@rpm-standard2.sh under test/scenarios-bootc/el10/releases/

Test MicroShift RPM install/remove on bare RHEL 10.2 VMs with standard test suites

Adapted from el98@rpm-standard{1,2}.sh with RHEL 10 repo patterns from el102-src@rpm-install.sh

Key RHEL 10 adaptations:

rhel102-installer VM image

CDN repo files with entitlement certs for rhocp/fast-datapath (subscription-manager not supported on RHEL 10)

Subscription-manager release set to 10.2

Test plan

Verify scenarios are picked up by CI job configurations

Confirm brew RPMs for el10 are available

Run el102@rpm-standard1.sh in CI and verify pass

Run el102@rpm-standard2.sh in CI and verify pass

JIRA: https://issues.redhat.com/browse/USHIFT-7169

🤖 Generated with Claude Code

Summary by CodeRabbit

Tests

Added comprehensive test scenarios for RHEL 10.2 bootc configurations with RPM standard implementations, enhancing test coverage for repository configuration and subscription management workflows.

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 · 2026-06-15T13:56:47Z

/label tide/merge-method-squash

agullon · 2026-06-15T13:57:01Z

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

agullon · 2026-06-15T18:00:41Z

/retest

agullon · 2026-06-15T18:28:11Z

/retest

agullon · 2026-06-16T07:06:05Z

/retest

agullon · 2026-06-16T07:56:39Z

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

agullon · 2026-06-16T07:57:55Z

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/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

agullon · 2026-06-16T08:48:02Z

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/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

agullon · 2026-06-17T07:44:52Z

/retest

agullon · 2026-06-17T09:15:21Z

/hold

This PR is blocked by:

CI: skip genisoimage and containernetworking-plugins on EL10 #6883 — configure-composer.sh EL10 package fixes + build_bootc_images.py try/except for release-info download
USHIFT-7228: remove virt-manager from VM host dependencies #6887 — virt-manager removal + configure-composer.sh EL10 fixes + build_bootc_images.py try/except + mirror registry fixes

Once those merge, this PR will need a rebase to drop the overlapping changes (configure-composer.sh, manage-vm.sh, and the build_bootc_images.py empty-version guards) and keep only:

New RHEL 10.2 RPM standard test scenarios (el102@rpm-standard{1,2}.sh)
rhel-9/el9 → runtime OS version parameterization across CI infrastructure

Add el102@rpm-standard1.sh and el102@rpm-standard2.sh under test/scenarios-bootc/el10/releases/ for testing MicroShift RPM install/remove on bare RHEL 10.2 VMs. Adapted from el98@rpm-standard{1,2}.sh with RHEL 10 repo patterns: - rhel102-installer VM image - CDN repo files with entitlement certs for rhocp/fast-datapath - Subscription-manager release set to 10.2 Parameterize hardcoded rhel-9/el9 references in CI scripts with runtime OS version detection via RHEL_MAJOR exported from common_versions.sh. Affected: build_bootc_images.py, generate_common_versions.py, scenario.sh. USHIFT-7169 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

agullon · 2026-06-23T07:17:51Z

/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

agullon · 2026-06-23T09:39:30Z

scenario el102@rpm-standard in both x86 and arm el10 is passing except for the rhel version OS check to 10.2, it says it's 10.1 because for these release is using the cache build images without the updated OS version. because of this it's safe to override and merge it

cc @ggiguash

Replace el102@rpm-standard2.sh with el102@rpm-standard.sh to streamline testing for MicroShift RPM installation and removal on RHEL 10.2 VMs. The new script incorporates all necessary configurations and scenarios previously split across two files, ensuring tests run in order and with appropriate repository settings. This change enhances maintainability and reduces redundancy in the test suite. pre-commit.check-secrets: ENABLED

agullon · 2026-06-23T14:17:39Z

/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

ggiguash · 2026-06-24T05:13:42Z

/lgtm
/unhold

openshift-ci · 2026-06-24T05:14:12Z

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

~~OWNERS~~ [agullon,ggiguash]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

agullon · 2026-06-24T05:34:25Z

/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-el10

openshift-ci · 2026-06-24T05:34:40Z

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

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.

openshift-ci · 2026-06-24T05:34:51Z

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

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-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 · 2026-06-24T05:34:54Z

/verified by CI

openshift-ci-robot · 2026-06-24T05:35:06Z

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

Details

In response to this:

/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 · 2026-06-24T07:27:01Z

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

agullon · 2026-06-24T08:33:35Z

/cherrypick release-4.22

openshift-cherrypick-robot · 2026-06-24T08:34:38Z

@agullon: new pull request created: #6927

Details

In response to this:

/cherrypick release-4.22

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 Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 15, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 15, 2026

coderabbitai Bot requested changes Jun 15, 2026

View reviewed changes

Comment thread test/scenarios-bootc/el10/releases/el102@rpm-standard.sh

coderabbitai Bot approved these changes Jun 15, 2026

View reviewed changes

agullon changed the title ~~Add RHEL 10.2 RPM standard test scenarios~~ USHIFT-7169: Add RHEL 10.2 RPM standard test scenarios Jun 15, 2026

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 15, 2026

agullon marked this pull request as ready for review June 15, 2026 13:56

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 15, 2026

openshift-ci Bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jun 15, 2026

openshift-ci Bot requested review from ggiguash and pmtk June 15, 2026 13:57

openshift-ci Bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 16, 2026

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2026

agullon force-pushed the USHIFT-7169 branch 5 times, most recently from a8682c3 to 4d58812 Compare June 22, 2026 13:14

agullon force-pushed the USHIFT-7169 branch from 4d58812 to cf35054 Compare June 22, 2026 13:23

agullon changed the title ~~USHIFT-7169: Add RHEL 10.2 RPM standard test scenarios~~ USHIFT-7169: Add RHEL 10.2 RPM standard release test scenarios Jun 22, 2026

agullon changed the title ~~USHIFT-7169: Add RHEL 10.2 RPM standard release test scenarios~~ USHIFT-7169: Add RHEL 10.2 RPM standard release test scenario Jun 23, 2026

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 24, 2026

openshift-ci Bot assigned ggiguash Jun 24, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 24, 2026

openshift-merge-bot Bot merged commit ef44e70 into openshift:main Jun 24, 2026
17 checks passed

openshift-cherrypick-robot mentioned this pull request Jun 24, 2026

[release-4.22] USHIFT-7169: Add RHEL 10.2 RPM standard release test scenario #6927

Closed

agullon mentioned this pull request Jun 24, 2026

[release-4.22] USHIFT-7169: Add RHEL 10.2 RPM standard release test scenario #6932

Open

2 tasks

Conversation

agullon commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

openshift-ci Bot commented Jun 15, 2026

Uh oh!

coderabbitai Bot commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviews paused

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested reviewers

❌ Failed checks (1 warning)

Uh oh!

agullon commented Jun 15, 2026

Uh oh!

agullon commented Jun 15, 2026

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

agullon commented Jun 15, 2026

Uh oh!

openshift-ci-robot commented Jun 15, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Summary by CodeRabbit

Uh oh!

agullon commented Jun 15, 2026

Uh oh!

agullon commented Jun 15, 2026

Uh oh!

agullon commented Jun 15, 2026

Uh oh!

agullon commented Jun 15, 2026

Uh oh!

agullon commented Jun 16, 2026

Uh oh!

agullon commented Jun 16, 2026

Uh oh!

agullon commented Jun 16, 2026

Uh oh!

agullon commented Jun 16, 2026

Uh oh!

agullon commented Jun 17, 2026

Uh oh!

agullon commented Jun 17, 2026

Uh oh!

agullon commented Jun 23, 2026

Uh oh!

agullon commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agullon commented Jun 23, 2026

Uh oh!

ggiguash commented Jun 24, 2026

Uh oh!

openshift-ci Bot commented Jun 24, 2026

Uh oh!

agullon commented Jun 24, 2026

Uh oh!

openshift-ci Bot commented Jun 24, 2026

Uh oh!

openshift-ci Bot commented Jun 24, 2026

Uh oh!

agullon commented Jun 24, 2026

Uh oh!

openshift-ci-robot commented Jun 24, 2026

Uh oh!

openshift-ci Bot commented Jun 24, 2026

Uh oh!

Uh oh!

agullon commented Jun 24, 2026

Uh oh!

agullon commented Jun 15, 2026 •

edited

Loading

coderabbitai Bot commented Jun 15, 2026 •

edited

Loading

openshift-ci-robot commented Jun 15, 2026 •

edited by openshift-ci Bot

Loading

agullon commented Jun 23, 2026 •

edited

Loading