USHIFT-7065: Support MicroShift V5.0 on RHEL 9.8 GA Implementation#6704
Open
agullon wants to merge 2 commits into
Open
USHIFT-7065: Support MicroShift V5.0 on RHEL 9.8 GA Implementation#6704agullon wants to merge 2 commits into
agullon wants to merge 2 commits into
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@agullon: This pull request references USHIFT-6499 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. DetailsIn response to this:
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. |
Contributor
|
Note Reviews pausedIt 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 Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughRemoves staging-specific test-agent bootc steps, switches bootc blueprints to upstream RHEL images, enables GPG checks in package-source TOMLs, updates RHEL version references to 9.8 in docs/scripts, and removes OCP-mirror/COPR composer configuration. ChangesRHEL Bootc and Configuration Updates
🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 10 | ❌ 2❌ Failed checks (1 warning, 1 inconclusive)
✅ Passed checks (10 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-ci
Bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
Contributor
Author
|
/hold until RHEL9.8 and RHEL10.2 are GAed |
openshift-ci
Bot
added
the
do-not-merge/hold
Contributor
There was a problem hiding this comment.
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 `@scripts/aws/manage_aws_stack.sh`:
- Around line 180-182: The help text shows a stale example 'rhel-9.3' that
contradicts the new default rhel-9.8; update the help string that contains
"[--os <os>]: (create/ami only) specific version of RHEL" so the
example OS value matches the default (use 'rhel-9.8' instead of 'rhel-9.3') and
ensure any nearby documentation lines referencing the default are consistent
with the change.
🪄 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: 9fd254aa-b4c3-41fa-8e65-cfbe769e0c92
📒 Files selected for processing (11)
docs/contributor/devenv_cloud.mddocs/contributor/devenv_setup.mddocs/contributor/howto_quay_mirror.mdscripts/aws/manage_aws_stack.shscripts/devenv-builder/configure-composer.shscripts/devenv-builder/manage-vm.shtest/image-blueprints-bootc/el9/layer1-base/group2/rhel98-installer.image-installertest/package-sources/fast-datapath-rhel9.tomltest/package-sources/rhocp-y.tomltest/package-sources/rhocp-y1.tomltest/package-sources/rhocp-y2.toml
💤 Files with no reviewable changes (1)
- scripts/devenv-builder/configure-composer.sh
✅ Files skipped from review due to trivial changes (3)
- test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-installer.image-installer
- docs/contributor/howto_quay_mirror.md
- docs/contributor/devenv_setup.md
agullon
force-pushed
the
USHIFT-6499-main
branch
3 times, most recently
from
b987458 to
fd7bb9d
Compare
ggiguash
reviewed
May 20, 2026
agullon
force-pushed
the
USHIFT-6499-main
branch
3 times, most recently
from
7633cd7 to
a87f79c
Compare
Contributor
Author
|
/hold cancel |
openshift-ci
Bot
removed
the
do-not-merge/hold
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
ggiguash
requested changes
May 21, 2026
| # Configure RHEL 9.8 repositories for building ostree images when the host | ||
| # OS is not yet running RHEL 9.8. Create the config from the host OS template | ||
| # with URLs rewritten to point to RHEL 9.8 production repos. | ||
| if [[ "${VERSION_ID}" != "9.8" ]]; then |
Contributor
There was a problem hiding this comment.
Please, create a story in the epic to undo this change when devenv is switched to RHEL 9.8
Contributor
Author
There was a problem hiding this comment.
Created USHIFT-7066 to track this.
Contributor
Author
|
/test e2e-aws-tests-cache |
Contributor
Author
|
/test e2e-aws-tests-cache |
1 similar comment
Contributor
Author
|
/test e2e-aws-tests-cache |
agullon
force-pushed
the
USHIFT-6499-main
branch
2 times, most recently
from
b38921b to
b80486a
Compare
Contributor
Author
|
/test e2e-aws-tests-cache |
Contributor
Author
|
/test e2e-aws-tests-cache-arm |
RHEL 9.8 is now GA. Replace staging registry reference with the official registry.redhat.io image and remove pre-GA workarounds (disabled repos, mirror repo injection, BIB localhost workaround). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
agullon
force-pushed
the
USHIFT-6499-main
branch
2 times, most recently
from
3c36198 to
35eb920
Compare
Contributor
Author
|
/test e2e-aws-tests-cache |
Contributor
Author
|
/test e2e-aws-tests-cache-arm |
Contributor
Author
|
/test e2e-aws-tests-cache |
agullon
changed the title
|
@agullon: This pull request references USHIFT-7065 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 story to target the "5.0.0" version, but no target version was set. DetailsIn response to this:
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
Bot
removed
the
do-not-merge/work-in-progress
Contributor
Author
|
/hold cancel |
Now that RHEL 9.8 is GA: - Re-enable GPG checks in ostree package sources (rhocp-y, rhocp-y1, rhocp-y2, fast-datapath) as indicated by existing TODO comments - Fix rhel98-installer to use rhel-9.8 instead of rhel-9.7 workaround - Remove disable_gpg_check and enable_ocp_mirror_repositories from configure-composer.sh — both were pre-GA RHEL workarounds - Create rhel-9.8.json osbuild-composer config from the host OS template on pre-9.8 hosts so osbuild-composer recognizes rhel-9.8 as a valid distro for building ostree images Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
openshift-ci
Bot
removed
the
do-not-merge/hold
agullon
changed the title
Contributor
Author
|
/test e2e-aws-tests-cache |
Contributor
|
/hold |
openshift-ci
Bot
added
the
do-not-merge/hold
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: agullon, pacevedom The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
RHEL 9.8 is now GA. This PR removes pre-GA workarounds from the RHEL 9.8 bootc and ostree CI pipelines.
Bootc pipeline
rhel98-test-agentbase image fromregistry.stage.redhat.iotoregistry.redhat.io--disable-all+ OCP mirror repo injection with--enable-eus(standard EUS repos are now available)rhel98-bootc.image-bootcfrom thelocalhost/rhel98-test-agentworkaround to a direct GA registry referencerhel98-installer.image-installerfromrhel-9.7workaround torhel-9.8rhel98-mirror.repo(no longer needed)OStree pipeline
rhocp-y,rhocp-y1,rhocp-y2, andfast-datapathpackage sources as indicated by existing TODO commentsconfigure-composer.sh
enable_copr_repositories— RHEL 9.8 ships sufficient osbuild packages nativelydisable_gpg_check— no longer needed for GA repos on the host OS configenable_ocp_mirror_repositories— OCP mirror was only needed for pre-GA RHEL 9.8 packagesrhel-9.8.jsonosbuild-composer config from the host OS template when the host is not yet on RHEL 9.8, so osbuild-composer can build RHEL 9.8 ostree images. GPG check is disabled in this generated config since the RHEL 9.6 host'srpmkeyscannot handle RHEL 9.8's post-quantum key 4 (tracked in USHIFT-7066)Notes
rhocp-yandrhocp-y1retaincheck_gpg = falsesince those still point to pre-GA mirrors.Test plan
e2e-aws-tests-cache— validates bootc layer1-base and ostree layer1-base builds on x86_64e2e-aws-tests-cache-arm— same on aarch64🤖 Generated with Claude Code