Set the default rhel-9 repos for 4.22 and 5.0 to 9.8#77982
Set the default rhel-9 repos for 4.22 and 5.0 to 9.8#77982openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
Conversation
WalkthroughUpdated two repository configuration files to target RHEL 9.8 and OCP versions 4.22 and 5.0 by renaming repo section names from Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes 🚥 Pre-merge checks | ✅ 10✅ 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-merge-bot
bot
added
the
rehearsals-ack
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@clusters/build-clusters/common/release-controller/rpms-ocp-4.22.yaml`:
- Around line 1461-1462: The vsphere02 release-controller manifest has a repo
name mismatch (deployment id base-4-22-rhel9) where rpms-ocp-4.22.yaml mounts
ocp-4.22-rhel9.repo but the common manifest uses ocp-4.22-rhel98.repo (the same
divergence exists for 5.0); fix by regenerating the release-controller manifests
with the release-controllers generator (generate-release-controllers.py), update
the vsphere02 rpms-ocp-4.22.yaml and rpms-ocp-5.0.yaml outputs so the repo
keys/paths match the common files (ocp-4.22-rhel98.repo / ocp-5.0-rhel98.repo),
and commit the regenerated manifests.
🪄 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: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Pro Plus
Run ID: e913b4a5-ddc8-4181-9498-e0a3afc96f91
📒 Files selected for processing (2)
clusters/build-clusters/common/release-controller/rpms-ocp-4.22.yamlclusters/build-clusters/common/release-controller/rpms-ocp-5.0.yaml
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED
sdodson
force-pushed
the
default-422-50-to-rhel98
branch
from
691c941 to
c2c2a90
Compare
|
[REHEARSALNOTIFIER] Note: If this PR includes changes to step registry files ( Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@core-services/release-controller/_repos/ocp-5.0-rhel9.repo`:
- Around line 1-2: The repo section names were renamed (e.g., [rhel-9.8-baseos],
[rhel-9.8-appstream], arch-specific variants) which breaks callers expecting the
original IDs; revert the bracketed repo IDs back to the original names
(rhel-9-baseos, rhel-9-appstream, rhel-9-fast-datapath,
rhel-9-codeready-builder-rpms and their -ppc64le/-s390x/-aarch64 variants and
server-ose names) and instead update only the baseurl/name/display lines to
point to RHEL 9.8 content so callers that enable repos by ID continue to work.
Ensure the same change is applied for the arch-specific stanzas and server-ose
entries mentioned (lines referenced around the diff).
🪄 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: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Pro Plus
Run ID: 7743e543-e2b2-4dff-876d-f8f5a01dcfac
📒 Files selected for processing (2)
core-services/release-controller/_repos/ocp-4.22-rhel9.repocore-services/release-controller/_repos/ocp-5.0-rhel9.repo
| [rhel-9.8-baseos] | ||
| name = rhel-9.8-baseos |
There was a problem hiding this comment.
Keep the existing repo IDs unless every caller is updated.
These bracketed section names are the repo IDs. Renaming them from rhel-9-* to rhel-9.8-* / rhel-98-* makes this a breaking config change for any job that still enables repos by the old names. If the goal is only to repoint 5.0 to RHEL 9.8 content, preserve the existing IDs and only retarget the URLs/display names. The same risk repeats in the arch-specific stanzas below.
#!/bin/bash
set -euo pipefail
# Verify that nothing outside the edited repo files still refers to the old repo IDs.
rg -n -C2 --fixed-strings \
--glob '!core-services/release-controller/_repos/ocp-5.0-rhel9.repo' \
--glob '!core-services/release-controller/_repos/ocp-4.22-rhel9.repo' \
-e 'rhel-9-baseos' \
-e 'rhel-9-appstream' \
-e 'rhel-9-fast-datapath' \
-e 'rhel-9-codeready-builder-rpms' \
-e 'rhel-9-baseos-ppc64le' \
-e 'rhel-9-appstream-ppc64le' \
-e 'rhel-9-fast-datapath-ppc64le' \
-e 'rhel-9-codeready-builder-rpms-ppc64le' \
-e 'rhel-9-baseos-s390x' \
-e 'rhel-9-appstream-s390x' \
-e 'rhel-9-fast-datapath-s390x' \
-e 'rhel-9-codeready-builder-rpms-s390x' \
-e 'rhel-9-baseos-aarch64' \
-e 'rhel-9-appstream-aarch64' \
-e 'rhel-9-fast-datapath-aarch64' \
-e 'rhel-9-codeready-builder-rpms-aarch64' \
-e 'rhel-9-server-ose' \
-e 'rhel-9-server-ose-5.0' \
-e 'rhel-9-server-ose-4.22' \
.
# Expected result: no matches outside the edited files. Any hit here needs either
# a caller update or preservation of the old repo IDs.Also applies to: 13-14, 62-63, 74-75
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@core-services/release-controller/_repos/ocp-5.0-rhel9.repo` around lines 1 -
2, The repo section names were renamed (e.g., [rhel-9.8-baseos],
[rhel-9.8-appstream], arch-specific variants) which breaks callers expecting the
original IDs; revert the bracketed repo IDs back to the original names
(rhel-9-baseos, rhel-9-appstream, rhel-9-fast-datapath,
rhel-9-codeready-builder-rpms and their -ppc64le/-s390x/-aarch64 variants and
server-ose names) and instead update only the baseurl/name/display lines to
point to RHEL 9.8 content so callers that enable repos by ID continue to work.
Ensure the same change is applied for the arch-specific stanzas and server-ose
entries mentioned (lines referenced around the diff).
There was a problem hiding this comment.
I believe that this will be fine if not I'll quickly change things.
There was a problem hiding this comment.
🧩 Analysis chain
Let me run the verification script to give you a definitive answer.
🏁 Script executed:
#!/bin/bash
set -euo pipefail
# Verify that nothing outside the edited repo files still refers to the old repo IDs.
rg -n -C2 --fixed-strings \
--glob '!core-services/release-controller/_repos/ocp-5.0-rhel9.repo' \
--glob '!core-services/release-controller/_repos/ocp-4.22-rhel9.repo' \
-e 'rhel-9-baseos' \
-e 'rhel-9-appstream' \
-e 'rhel-9-fast-datapath' \
-e 'rhel-9-codeready-builder-rpms' \
-e 'rhel-9-server-ose' \
. || echo "No matches found - old repo IDs are not referenced elsewhere."
Length of output: 197880
@sdodson, ran the verification — you're right. The search found many references to rhel-9-* IDs elsewhere, but none of them are external consumers of the specific ocp-5.0-rhel9.repo or ocp-4.22-rhel9.repo files changed in this PR. The hits fall into three safe categories:
- Other branch-specific
.repofiles (ocp-4.16-rhel9.repo,ocp-4.17-rhel9.repo, etc.) — independent files for different branches, completely unaffected. workers-rhel-repos-commands.sh— generates its own separate repo files using templated names andci-deps-path URLs, not consuming the release-controller repos.openshift-ansibleci-operator configs — inline heredoc definitions pointing tohttp://base-4-16-rhel9.ocp.svc/rhel-9-server-ose, a different internal service endpoint entirely.
No script or job was found that explicitly enables repos by the old IDs (rhel-9-baseos, rhel-9-appstream, etc.) from the 4.22/5.0 release-controller repo files. The change looks safe. 👍
There was a problem hiding this comment.
@danilo-gemoli Do you know if this is a valid concern?
There was a problem hiding this comment.
Seems like the humans are having a chat. I'll hop back into my burrow for now. If you need me again, just tag @coderabbitai in a new comment, and I'll come hopping out!
There was a problem hiding this comment.
I didn't recall us having such a issue in the past, I'll LGTM this.
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danilo-gemoli, sdodson 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 |
openshift-ci
bot
added
the
approved
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
@sdodson: 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. |
|
@sdodson: Updated the following 14 configmaps:
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 kubernetes-sigs/prow repository. |
2 participants
The base images that ART produces for CI builds now include 9.8 content so using repos prior to 9.8 creates dependency issues.
rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
Summary by CodeRabbit