USHIFT-6499: Switch RHEL 9.8 and 10.2 bootc images to GA repos#6704
USHIFT-6499: Switch RHEL 9.8 and 10.2 bootc images to GA repos#6704agullon wants to merge 3 commits into
Conversation
|
@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. |
|
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 | ✅ 11 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (11 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold until RHEL9.8 and RHEL10.2 are GAed |
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
b987458 to
fd7bb9d
Compare
7633cd7 to
a87f79c
Compare
|
/hold cancel |
| # 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 |
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
|
/test e2e-aws-tests-cache |
1 similar comment
|
/test e2e-aws-tests-cache |
RHEL 9.8 and 10.2 are now GA. Replace staging registry references with official registry.redhat.io images 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
Now that the build host runs RHEL 9.8: - 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 all pre-GA workarounds from configure-composer.sh: enable_copr_repositories, disable_gpg_check, and enable_ocp_mirror_repositories with their function definitions Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
Update default RHEL version for development VMs and AWS stacks from 9.4 to 9.8 now that RHEL 9.8 is GA. Fix stale 9.2 references in cloud and quay mirror documentation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
|
/hold |
|
/test e2e-aws-tests-cache |
4 similar comments
|
/test e2e-aws-tests-cache |
|
/test e2e-aws-tests-cache |
|
/test e2e-aws-tests-cache |
|
/test e2e-aws-tests-cache |
Summary
RHEL 9.8 and 10.2 are now GA. This PR removes all pre-GA workarounds across the bootc and ostree CI pipelines, and upgrades the development environment to RHEL 9.8.
Bootc pipeline
registry.stage.redhat.iotoregistry.redhat.iofor RHEL 9.8 and 10.2--disable-allrepo workaround and mirror repo injection from test-agent containerfileslocalhost/test-agentworkaround to direct registry referencesrhel98-mirror.repoandrhel102-mirror.repo(no longer needed)OStree pipeline
rhocp-y,rhocp-y1,rhocp-y2, andfast-datapathpackage sources (resolves existing TODO comments)rhel98-installer.image-installerfromrhel-9.7workaround torhel-9.8enable_copr_repositories,disable_gpg_check, andenable_ocp_mirror_repositoriesfromconfigure-composer.sh— all pre-GA RHEL workarounds resolved by the 9.8 host upgradeDevEnv
Test plan
registry.redhat.io🤖 Generated with Claude Code