[release-4.22] USHIFT-6499: Switch RHEL 9.8 CI from staging to GA repos#6736
[release-4.22] USHIFT-6499: Switch RHEL 9.8 CI from staging to GA repos#6736agullon wants to merge 2 commits into
Conversation
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
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
|
@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 "4.22.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. |
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ 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 |
|
/test e2e-aws-tests-cache |
1 similar comment
|
/test e2e-aws-tests-cache |
|
@agullon: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Cherry-pick of #6704 onto
release-4.22.Conflicts in
rhocp-y.toml,rhocp-y1.toml,rhocp-y2.tomlwere resolved by keeping therelease-4.22URL format (4.{{ .Env.RHOCP_MINOR_Y }}) while applying thecheck_gpg = truechange from the original PR.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-eusrhel98-bootc.image-bootcto direct GA registry referencerhel98-installer.image-installerfromrhel-9.7torhel-9.8rhel98-mirror.repoOStree pipeline
rhocp-y,rhocp-y1,rhocp-y2, andfast-datapathpackage sourcesconfigure-composer.sh
disable_gpg_check, andenable_ocp_mirror_repositories(pre-GA workarounds)rhel-9.8.jsongeneration from host OS template for pre-9.8 hosts🤖 Generated with Claude Code