Skip to content

[release-4.22] USHIFT-6499: Switch RHEL 9.8 CI from staging to GA repos#6736

Open
agullon wants to merge 2 commits into
openshift:release-4.22from
agullon:USHIFT-6499-release-4.22
Open

[release-4.22] USHIFT-6499: Switch RHEL 9.8 CI from staging to GA repos#6736
agullon wants to merge 2 commits into
openshift:release-4.22from
agullon:USHIFT-6499-release-4.22

Conversation

@agullon
Copy link
Copy Markdown
Contributor

@agullon agullon commented May 26, 2026

Cherry-pick of #6704 onto release-4.22.

Conflicts in rhocp-y.toml, rhocp-y1.toml, rhocp-y2.toml were resolved by keeping the release-4.22 URL format (4.{{ .Env.RHOCP_MINOR_Y }}) while applying the check_gpg = true change 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

  • Switch rhel98-test-agent base image from registry.stage.redhat.io to registry.redhat.io
  • Replace --disable-all + OCP mirror repo injection with --enable-eus
  • Switch rhel98-bootc.image-bootc to direct GA registry reference
  • Fix rhel98-installer.image-installer from rhel-9.7 to rhel-9.8
  • Delete rhel98-mirror.repo

OStree pipeline

  • Re-enable GPG checks in rhocp-y, rhocp-y1, rhocp-y2, and fast-datapath package sources

configure-composer.sh

  • Remove COPR, disable_gpg_check, and enable_ocp_mirror_repositories (pre-GA workarounds)
  • Add rhel-9.8.json generation from host OS template for pre-9.8 hosts

🤖 Generated with Claude Code

agullon added 2 commits May 26, 2026 09:22
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
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 26, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented May 26, 2026

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

Details

In response to this:

Cherry-pick of #6704 onto release-4.22.

Conflicts in rhocp-y.toml, rhocp-y1.toml, rhocp-y2.toml were resolved by keeping the release-4.22 URL format (4.{{ .Env.RHOCP_MINOR_Y }}) while applying the check_gpg = true change 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

  • Switch rhel98-test-agent base image from registry.stage.redhat.io to registry.redhat.io
  • Replace --disable-all + OCP mirror repo injection with --enable-eus
  • Switch rhel98-bootc.image-bootc to direct GA registry reference
  • Fix rhel98-installer.image-installer from rhel-9.7 to rhel-9.8
  • Delete rhel98-mirror.repo

OStree pipeline

  • Re-enable GPG checks in rhocp-y, rhocp-y1, rhocp-y2, and fast-datapath package sources

configure-composer.sh

  • Remove COPR, disable_gpg_check, and enable_ocp_mirror_repositories (pre-GA workarounds)
  • Add rhel-9.8.json generation from host OS template for pre-9.8 hosts

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

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 26, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 41c80e45-102e-4766-b4ba-27dafcef1355

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from ggiguash and pmtk May 26, 2026 07:25
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 26, 2026

[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 May 26, 2026
@agullon agullon changed the title USHIFT-6499: Switch RHEL 9.8 CI from staging to GA repos [release-4.22] USHIFT-6499: Switch RHEL 9.8 CI from staging to GA repos May 26, 2026
@agullon
Copy link
Copy Markdown
Contributor Author

agullon commented May 26, 2026

/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm

1 similar comment
@agullon
Copy link
Copy Markdown
Contributor Author

agullon commented May 26, 2026

/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 26, 2026

@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
Copy link
Copy Markdown
Contributor Author

agullon commented May 26, 2026

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

@agullon
Copy link
Copy Markdown
Contributor Author

agullon commented May 26, 2026

/label backport-risk-assessed
/verified by CI

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 26, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 26, 2026
@openshift-ci-robot
Copy link
Copy Markdown

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

Details

In response to this:

/label backport-risk-assessed
/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.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants