Skip to content

okd 5.0#79642

Open
jupierce wants to merge 1 commit into
openshift:mainfrom
jupierce:okd_updates
Open

okd 5.0#79642
jupierce wants to merge 1 commit into
openshift:mainfrom
jupierce:okd_updates

Conversation

@jupierce
Copy link
Copy Markdown
Contributor

No description provided.

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 22, 2026
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 22, 2026

Walkthrough

Retarget okd-scos CI jobs from SCOS 4.22/OpenShift 4.x → SCOS 5.0/OpenShift 5.0: update base_images, build_root tags, image build inputs/from, promotion destinations, and releases. Add new okd-scos job configs and an origin_scos-5.0 image-mirroring mapping.

Changes

SCOS 5.0 Migration

Layer / File(s) Summary
Migration: base_images, build_root, images, promotion, releases
ci-operator/config/openshift/*__okd-scos.yaml
Updates builder/base image entries to RHEL9 + Go1.25 + OpenShift 5.0, switches images.items.from to origin_scos-5.0_base-stream9, adds/updates images.items.inputs wiring, and changes promotion.to / releases.latest.integration.name to scos-5.0 across many okd-scos jobs.
New okd-scos jobs
ci-operator/config/openshift/api/*, .../aws-node-termination-handler/*, .../etcd/*, .../router/*, .../cluster-update-console-plugin/*
Adds new okd-scos variant CI configs (API, aws-node-termination-handler, etcd, router, cluster-update-console-plugin, ...).
Image mirroring
core-services/image-mirroring/openshift/mapping_origin_scos-4_22, .../mapping_origin_scos-5_0
Creates a full mapping file for origin_scos-5.0 and trims the scos-4.22 mapping file to a minimal set of entries.
OCP builder stream updates
ci-operator/config/openshift/images/openshift-images-master__okd-scos.yaml
Switches builder stream keys (stream9 → stream10) and updates raw_steps cache commands and repo baseurls to the 5.0 RHEL9 service.
  • Estimated code review effort
    🎯 4 (Complex) | ⏱️ ~45 minutes

  • Possibly related PRs

  • Suggested labels
    lgtm, approved

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

@openshift-ci openshift-ci Bot requested review from 2uasimojo and alebedev87 May 22, 2026 00:35
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@jupierce, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

couldn't prepare candidate: couldn't rebase candidate onto 7c98a8376ed8a6446afffbe1b3bb51409a0c09e9 due to conflicts
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 22, 2026
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note

Due to the large number of review comments, Critical severity comments were prioritized as inline comments.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (5)
ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main__okd-scos.yaml (1)

1-55: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Regenerate downstream CI artifacts for this config change.

This file is under ci-operator/config/ and includes structural CI config updates, so downstream generated artifacts should be refreshed (make update) and included in the PR.

As per coding guidelines, “After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update”.

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

In
`@ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main__okd-scos.yaml`
around lines 1 - 55, The ci-operator config changes (base_images, build_root,
images, promotion, releases and zz_generated_metadata entries) require
regenerating downstream CI artifacts; run the repository's generation step (make
update) to refresh all generated files derived from this ci-operator/config
change and add the resulting updated artifacts to the PR, ensuring the updated
generated manifests are staged and committed alongside the modified config.
ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-main__okd-scos.yaml (1)

1-55: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Run make update after this ci-operator/config change
No downstream artifact changes are present in this PR (repo git diff is empty). Run make update and commit any regenerated outputs, or provide evidence that it was a no-op.

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

In
`@ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-main__okd-scos.yaml`
around lines 1 - 55, The CI config change under base_images/images for
configmap-reload (e.g., entries like
ocp_builder_rhel-9-golang-1.25-openshift-5.0, origin_scos-5.0_base-stream9, and
the images->items Dockerfile.ocp change) requires running the repository
regeneration: run make update in the repo root, review the generated changes,
commit any modified files produced by the update, and push them; if make update
produces no changes, include the make output or a short note in the PR showing
it was a no-op to satisfy the reviewer.
ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-main__okd-scos.yaml (1)

1-55: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Please confirm downstream CI artifacts were regenerated.

These are structural ci-operator/config/** updates (base images/build inputs/releases), so ensure make update was run and any required generated artifact changes are included.

As per coding guidelines, "After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update".

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

In
`@ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-main__okd-scos.yaml`
around lines 1 - 55, This change updates CI config keys (base_images,
build_root, images, promotion, releases) under ci-operator/config which requires
regenerating downstream artifacts: run make update at the repo root to
regenerate the generated CI files, verify the generated outputs (the updated
artifacts that make update produces) are included in the commit/PR, and confirm
the zz_generated_metadata and any files under the generated directories reflect
the new base_images/build inputs/releases before merging.
ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-main__okd-scos.yaml (1)

1-80: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Run make update and include generated downstream artifacts.

This PR modifies ci-operator/config/** with structural CI config changes; please regenerate and commit downstream outputs to keep CI config in sync.

As per coding guidelines: "After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update".

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

In
`@ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-main__okd-scos.yaml`
around lines 1 - 80, The CI config under base_images/images/promotion (see keys
like base_images, images, promotion and zz_generated_metadata) was changed but
downstream generated artifacts were not updated; run make update at the repo
root to regenerate the downstream CI outputs, review the updated files produced
by the update step, and commit those generated artifacts together with your
config changes so the CI config and generated outputs stay in sync.
ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd-scos.yaml (1)

1-55: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Regenerate downstream CI operator artifacts for the OKD SCOS operator-marketplace config (make update)
The updated structural fields in ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd-scos.yaml (e.g., origin_scos-5.0_base-stream9, rhel-9-release-golang-1.26-openshift-5.0, and scos-5.0) are not present in the generated downstream job/release artifacts. Re-run make update and commit the regenerated outputs.

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

In
`@ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd-scos.yaml`
around lines 1 - 55, The downstream CI operator artifacts are out of sync with
the updated config fields (e.g., origin_scos-5.0_base-stream9,
rhel-9-release-golang-1.26-openshift-5.0, scos-5.0) in
operator-framework-operator-marketplace-master__okd-scos.yaml; re-run the
repository generation/update step by executing `make update` to regenerate the
downstream job and release artifacts, verify the generated outputs include the
new base_images/tags and promotion/release entries, and commit the updated
generated files.
🟡 Minor comments (2)
ci-operator/config/openshift/azure-storage-azcopy/openshift-azure-storage-azcopy-main__okd-scos.yaml-1-1 (1)

1-1: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Please verify downstream artifacts were regenerated.

Since this file is under ci-operator/config/, confirm make update was run and committed if it produced changes.

As per coding guidelines: "After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update".

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

In
`@ci-operator/config/openshift/azure-storage-azcopy/openshift-azure-storage-azcopy-main__okd-scos.yaml`
at line 1, CI config under ci-operator/config was changed (the base_images:
entry); run the repository's downstream artifact regeneration by executing make
update, verify it produces changes, add and commit those generated files, and
push the commit so downstream artifacts are consistent with the edits to the
ci-operator/config (ensure the generated files from make update are included in
the PR).
ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-main__okd-scos.yaml-1-37 (1)

1-37: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Regenerate ci-operator artifacts for this config change.

This file is under ci-operator/config/ and includes structural CI config updates (base images/build root/promotion/release target), so please run make update and include any resulting downstream artifact changes (or confirm it is a no-op in this PR).

As per coding guidelines: "After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update."

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

In
`@ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-main__okd-scos.yaml`
around lines 1 - 37, The CI config changes touch base_images, build_root,
images, promotion, and releases and require regenerating downstream ci-operator
artifacts; run make update in the repo root, review and add any modified
artifacts produced by that command to this PR (or if make update reports no
changes, add a short confirmation comment noting it's a no-op), then amend the
PR to include those generated files so the CI config and its downstream
artifacts remain in sync.
🤖 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.

Outside diff comments:
In
`@ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main__okd-scos.yaml`:
- Around line 1-55: The ci-operator config changes (base_images, build_root,
images, promotion, releases and zz_generated_metadata entries) require
regenerating downstream CI artifacts; run the repository's generation step (make
update) to refresh all generated files derived from this ci-operator/config
change and add the resulting updated artifacts to the PR, ensuring the updated
generated manifests are staged and committed alongside the modified config.

In
`@ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-main__okd-scos.yaml`:
- Around line 1-55: The CI config change under base_images/images for
configmap-reload (e.g., entries like
ocp_builder_rhel-9-golang-1.25-openshift-5.0, origin_scos-5.0_base-stream9, and
the images->items Dockerfile.ocp change) requires running the repository
regeneration: run make update in the repo root, review the generated changes,
commit any modified files produced by the update, and push them; if make update
produces no changes, include the make output or a short note in the PR showing
it was a no-op to satisfy the reviewer.

In
`@ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-main__okd-scos.yaml`:
- Around line 1-55: This change updates CI config keys (base_images, build_root,
images, promotion, releases) under ci-operator/config which requires
regenerating downstream artifacts: run make update at the repo root to
regenerate the generated CI files, verify the generated outputs (the updated
artifacts that make update produces) are included in the commit/PR, and confirm
the zz_generated_metadata and any files under the generated directories reflect
the new base_images/build inputs/releases before merging.

In
`@ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-main__okd-scos.yaml`:
- Around line 1-80: The CI config under base_images/images/promotion (see keys
like base_images, images, promotion and zz_generated_metadata) was changed but
downstream generated artifacts were not updated; run make update at the repo
root to regenerate the downstream CI outputs, review the updated files produced
by the update step, and commit those generated artifacts together with your
config changes so the CI config and generated outputs stay in sync.

In
`@ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd-scos.yaml`:
- Around line 1-55: The downstream CI operator artifacts are out of sync with
the updated config fields (e.g., origin_scos-5.0_base-stream9,
rhel-9-release-golang-1.26-openshift-5.0, scos-5.0) in
operator-framework-operator-marketplace-master__okd-scos.yaml; re-run the
repository generation/update step by executing `make update` to regenerate the
downstream job and release artifacts, verify the generated outputs include the
new base_images/tags and promotion/release entries, and commit the updated
generated files.

---

Major comments:
In
`@ci-operator/config/openshift-assisted/assisted-installer-ui/openshift-assisted-assisted-installer-ui-master__okd-scos.yaml`:
- Around line 27-34: The builder image tags for the aliases
ocp_builder_rhel-9-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-openshift-nodejs-base-5.0.art still reference
registry.ci.openshift.org/ocp/builder:*-openshift-4.22; update those image tags
to the SCOS 5.0 equivalents (e.g., replace the -openshift-4.22 tag suffix with
the -scos-5.0 tag) so stage resolution uses the migrated SCOS 5.0 builders.

In
`@ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml`:
- Around line 23-26: The SCOS 5.0 job config
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still includes a hardcoded builder
image referencing openshift-4.22; remove that stale registry entry
(registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22) from
the as: list (or replace it with the correct openshift-5.0 builder image if one
is required) so only the appropriate builder alias is used.

In `@ci-operator/config/openshift/api/openshift-api-main__okd-scos.yaml`:
- Around line 23-26: The ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry is
still referencing the older builder image tag
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22";
update that image string to the matching 5.0 tag (e.g. replace
"...-openshift-4.22" with "...-openshift-5.0") and verify there are no other
occurrences of the 4.22 builder tag for this variant to ensure consistency.

In
`@ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-main__okd-scos.yaml`:
- Around line 23-26: The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still pointing at the image tag
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23; update
that image reference to the matching 5.0 builder (replace the 4.23 tag with the
appropriate 5.0 tag) so the ocp_builder_rhel-9-golang-1.25-openshift-5.0 alias
and its "as: - builder" consumer use a consistent SCOS 5.0 builder image.

In
`@ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master__okd-scos.yaml`:
- Around line 23-26: The entry ocp_builder_rhel-9-golang-1.25-openshift-5.0 is
incorrectly referencing the 4.21 builder image; update the image tag so the
registry reference matches the 5.0 migration (replace
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 with the
corresponding rhel-9-golang-1.25-openshift-5.0 image) to keep the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 alias consistent.

In
`@ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master__okd-scos.yaml`:
- Around line 23-37: Both build inputs reference the old 4.21 builder image tag;
update the builder alias for ocp_builder_rhel-9-golang-1.25-openshift-5.0 so the
image name
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 is
changed to the corresponding 5.0 tag (e.g.,
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) in both
occurrences under the two build entries to align the aliases with SCOS 5.0.

In
`@ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__okd-scos.yaml`:
- Around line 23-26: The builder image tag in the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry is still pointing at the old
openshift-4.21 image; update the image reference
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21" to the
correct SCOS 5.0 builder tag (e.g., replace the suffix with "-openshift-5.0" or
the approved 5.0 image name), ensuring the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 mapping and any related "as:
builder" entries use the new 5.0 image.

In
`@ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master__okd-scos.yaml`:
- Around line 23-26: The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is pointing at the old image tag
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that image reference to the correct 5.0 baseline (replace the -4.22 tag with the
corresponding -5.0 tag) so the ocp_builder_rhel-9-golang-1.25-openshift-5.0
entry consistently uses the SCOS 5.0 builder image.

In
`@ci-operator/config/openshift/azure-storage-azcopy/openshift-azure-storage-azcopy-main__okd-scos.yaml`:
- Around line 22-26: The inputs block is referencing a stale builder image tag
'registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22' while
the input key is 'ocp_builder_rhel-9-golang-1.25-openshift-5.0', causing mixed
streams; update the builder image reference to the matching openshift-5.0 tag
(replace the '...openshift-4.22' suffix with the corresponding
'...openshift-5.0' image) so 'ocp_builder_rhel-9-golang-1.25-openshift-5.0' and
its as: builder entry use the same OpenShift stream.

In
`@ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-main__okd-scos.yaml`:
- Around line 22-26: The builder input key
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is inconsistent with the pullspec
under inputs
(registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22);
update the pullspec to the matching openshift-5.0 tag (e.g., change the tag
portion to rhel-9-golang-1.25-openshift-5.0) in the inputs block so the
as/builder entry and the referenced image are consistent.

In
`@ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-main__okd-scos.yaml`:
- Around line 22-26: The input key ocp_builder_rhel-9-golang-1.25-openshift-5.0
is paired with an outdated pullspec; update the pullspec string
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 to the
matching 5.0 tag
(registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) so the
input entry and its as: builder mapping are consistent.

In
`@ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-main__okd-scos.yaml`:
- Around line 22-26: The inputs block for the key
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still references the old builder
pullspec ending in openshift-4.22; update that pullspec to the 5.0 variant so
the as mapping and pullspec match the 5.0 migration (i.e., change the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 value to
the corresponding openshift-5.0 pullspec).

In
`@ci-operator/config/openshift/bond-cni/openshift-bond-cni-main__okd-scos.yaml`:
- Around line 26-34: The builder inputs
ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still reference images tagged with
openshift-4.21; update the second element of each alias list (currently
registry.ci.openshift.org/ocp/builder:...-openshift-4.21) to the corresponding
openshift-5.0 image tag
(registry.ci.openshift.org/ocp/builder:...-openshift-5.0) so the aliases
actually consume the 5.0 builders and avoid build drift.

In `@ci-operator/config/openshift/builder/openshift-builder-main__okd-scos.yaml`:
- Around line 22-26: The inputs block for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still lists the old builder
pullspec ending in -4.22; update the as mapping under
inputs.ocp_builder_rhel-9-golang-1.25-openshift-5.0 so the registry image
pullspec uses the -5.0 tag
(registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) to
match the base_images and release target.

In
`@ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master__okd-scos.yaml`:
- Around line 26-34: The builder image pullspecs for the inputs
ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still reference openshift-4.22;
update the two registry.ci.openshift.org/ocp/builder pullspecs to use
openshift-5.0 so the as-entries match their ocp_builder_*...-openshift-5.0 keys
and SCOS 5.0 wiring.

In
`@ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-main__okd-scos.yaml`:
- Around line 22-26: The inputs entry for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is referencing the old image stream
tag registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22;
update that image string to the matching 5.0 builder (replace the
...-openshift-4.22 suffix with the 5.0 equivalent) so the inputs alias "as: -
builder" points to the correct ocp_builder_rhel-9-golang-1.25-openshift-5.0
image and avoid mixing streams.

In
`@ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-main__okd-scos.yaml`:
- Around line 23-25: The base_images entry references
ocp_builder_rhel-9-golang-1.25-openshift-5.0 while the inputs.as alias points to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0, causing
a Go toolchain mismatch; update the three inputs.as occurrences (the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 tags) to
the matching rhel-9-golang-1.25-openshift-5.0 tag (or alternatively change the
base_images reference to ocp_builder_rhel-9-golang-1.26-openshift-5.0) so the
builder alias and base_images use the same golang version.

In
`@ci-operator/config/openshift/cluster-kube-controller-manager-operator/openshift-cluster-kube-controller-manager-operator-main__okd-scos.yaml`:
- Around line 23-26: The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is pointing to a pullspec that
still references openshift-4.22; update that pullspec to the correct
openshift-5.0 image so the alias maps to the new SCOS 5.0 builder (locate the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 block and replace the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 pullspec
with the corresponding rhel-9-golang-1.25-openshift-5.0 pullspec).

In
`@ci-operator/config/openshift/cluster-kube-scheduler-operator/openshift-cluster-kube-scheduler-operator-main__okd-scos.yaml`:
- Around line 23-26: The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 incorrectly references the image
tag registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22;
update that reference to the matching 5.0 image (e.g., change the tag suffix
from -4.22 to -5.0) so the "as: - builder" mapping points to the correct
rhel-9-golang-1.25-openshift-5.0 builder image.

In
`@ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-main__okd-scos.yaml`:
- Around line 23-26: The builder alias block for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still referencing the old
pullspec
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that pullspec to the correct 5.0 image (e.g.
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 alias consistently points to the
5.0 builder image.

In
`@ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main__okd-scos.yaml`:
- Around line 23-26: The inputs section has a stale builder reference: the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry still lists
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that alias to the matching openshift-5.0 stream so the builder line for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 references
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 (retain
the "as: - builder" mapping).

In
`@ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-main__okd-scos.yaml`:
- Around line 23-26: The inputs block for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still referencing the 4.22
builder image; update the pullspec in the as list from
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry actually uses the 5.0
toolchain image.

In
`@ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master__okd-scos.yaml`:
- Around line 23-26: The ocp_builder_rhel-9-golang-1.25-openshift-5.0 input key
is still pointing at the 4.22 pullspec; update the pullspec under
ocp_builder_rhel-9-golang-1.25-openshift-5.0 from
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 to the
matching 5.0 builder image tag (e.g. change the :...-openshift-4.22 suffix to
:...-openshift-5.0) so the alias and image tag are consistent.

In
`@ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-main__okd-scos.yaml`:
- Around line 23-26: The input alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 points to a builder image still
tagged openshift-4.22; update the image reference (the
registry.ci.openshift.org/... entry under
ocp_builder_rhel-9-golang-1.25-openshift-5.0) to the matching openshift-5.0
release image so the input alias and the actual builder image stream are
consistent (look for the ocp_builder_rhel-9-golang-1.25-openshift-5.0 key and
change the trailing -openshift-4.22 to -openshift-5.0).

In
`@ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main__okd-scos.yaml`:
- Around line 23-26: The inputs.as entry for the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 job still references the old
builder pullspec ending in "-4.22"; update the as list under the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 key to use the correct 5.0 pullspec
(replace the trailing "-4.22" with "-5.0") so the config consistently uses the
5.0 toolchain.

In
`@ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-main__okd-scos.yaml`:
- Around line 23-26: Update the builder input alias for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 so it no longer references the old
openshift-4.22 image; change the aliased image
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 to the
corresponding openshift-5.0 builder image (the tag matching 5.0) so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 input pulls the correct 5.0
toolchain.

In
`@ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master__okd-scos.yaml`:
- Around line 23-26: The builder alias is wired to the wrong image: the key
ocp_builder_rhel-9-golang-1.25-openshift-5.0 should map to the matching 5.0
builder image; update the string
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 under
the as list to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry references the correct tag.

In
`@ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-main__okd-scos.yaml`:
- Around line 23-26: The builder alias for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still pointing to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that mapped image tag to the correct openshift-5.0 variant so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 key actually uses the 5.0 builder
(edit the value under the as: - registry.ci.openshift.org/... entry).

In
`@ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-main__okd-scos.yaml`:
- Around line 23-26: The builder alias under
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still points to the openshift-4.22
image; update the aliased image tag to the matching openshift-5.0 toolchain
image so the as: - builder and registry.ci.openshift.org/ocp/builder entry for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 references the correct
openshift-5.0 image (change the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 value to
the equivalent rhel-9-golang-1.25-openshift-5.0 tag).

In
`@ci-operator/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-main__okd-scos.yaml`:
- Around line 23-26: The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still points to the old image tag
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that registry image reference to the matching OpenShift 5.0 builder tag (e.g.,
replace the trailing -openshift-4.22 with -openshift-5.0) so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry uses a 5.0 builder image.

In
`@ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-main__okd-scos.yaml`:
- Around line 23-26: The builder input
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still aliased to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that alias to the correct 5.0 builder image (e.g., replace the trailing
-openshift-4.22 with the matching -openshift-5.0 tag) so
ocp_builder_rhel-9-golang-1.25-openshift-5.0 points to the proper 5.0 builder
image.

In
`@ci-operator/config/openshift/csi-external-resizer/openshift-csi-external-resizer-master__okd-scos.yaml`:
- Around line 22-26: The builder alias is still pointing at the old pullspec
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" even
though the input key is ocp_builder_rhel-9-golang-1.25-openshift-5.0; update the
pullspec under that input to the corresponding openshift-5.0 image (replace the
trailing "-4.22" with "-5.0") so the as: builder alias consistently references
the new openshift-5.0 builder image.

In
`@ci-operator/config/openshift/csi-external-snapshot-metadata/openshift-csi-external-snapshot-metadata-main__okd-scos.yaml`:
- Around line 22-26: The builder alias entry under inputs for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still referencing the old
registry image tag "openshift-4.22"; update the alias/image string so the alias
and referenced image match the migrated key (replace "openshift-4.22" with the
appropriate "openshift-5.0" tag or the correct 5.0 image) in the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 block to restore proper image
replacement semantics.

In
`@ci-operator/config/openshift/csi-external-snapshotter/openshift-csi-external-snapshotter-master__okd-scos.yaml`:
- Around line 22-26: The builder alias entries under inputs reference an old
image tag "openshift-4.22"; update the registry image tag to match the 5.0
builder key by replacing
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" with
the corresponding "openshift-5.0" tag (or the correct 5.0 image tag) for the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 input and any other identical
occurrences (see the as: builder alias and the registry.ci.openshift.org string)
so the alias and image tag are consistent.

In
`@ci-operator/config/openshift/csi-livenessprobe/openshift-csi-livenessprobe-master__okd-scos.yaml`:
- Around line 22-26: The inputs block uses the image tag
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" which
mismatches the key suffix "ocp_builder_rhel-9-golang-1.25-openshift-5.0"; update
that image reference to use "-openshift-5.0" so the alias and actual image tag
are consistent (modify the string in the inputs entry for
ocp_builder_rhel-9-golang-1.25-openshift-5.0).

In
`@ci-operator/config/openshift/csi-node-driver-registrar/openshift-csi-node-driver-registrar-master__okd-scos.yaml`:
- Around line 22-26: The builder alias configuration still references the old
openshift-4.22 image; update the inputs entry for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 so the image under the as list uses
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 (replace
the trailing -4.22 with -5.0) to match the new 5.0 wiring.

In
`@ci-operator/config/openshift/csi-operator/openshift-csi-operator-main__okd-scos.yaml`:
- Around line 22-27: The builder alias pullspecs in the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 inputs block (and the four other
equivalent inputs blocks) still reference :openshift-4.22; update each alias
pullspec from
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 to use
the :openshift-5.0 tag so the ocp_builder_rhel-9-golang-1.25-openshift-5.0 input
aligns with the 5.0 migration across all five inputs sections.

In
`@ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-main__okd-scos.yaml`:
- Around line 27-34: The builder alias entries
ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 are referencing registry images
tagged with openshift-4.19; update those registry image tags to the matching
openshift-5.0 builder images (e.g., change
registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19 and
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to the
corresponding rhel-8-golang-1.25-openshift-5.0 and
rhel-9-golang-1.25-openshift-5.0 tags) so the alias keys and their registry
references are consistent.

In `@ci-operator/config/openshift/frr/openshift-frr-main__okd-scos.yaml`:
- Around line 23-27: The inputs.as entry for the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 builder is still referencing the
older image tag
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
the alias in the inputs.as list so the frrk8s-builder points to the correct
openshift-5.0 builder image (replace the ...-openshift-4.22 tag with the
corresponding ...-openshift-5.0 tag) to avoid selecting the wrong builder at
build time.

In
`@ci-operator/config/openshift/gcp-pd-csi-driver-operator/openshift-gcp-pd-csi-driver-operator-main__okd-scos.yaml`:
- Around line 23-27: The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 points to a base image tag still
using openshift-4.22
(registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22);
update that referenced image tag to the correct 5.0 equivalent (e.g., replace
...openshift-4.22 with ...openshift-5.0 or the exact 5.0 tag your org uses) so
the alias and actual builder image match; change the value in the mapping under
the as: list where
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 appears.

In
`@ci-operator/config/openshift/gcp-pd-csi-driver/openshift-gcp-pd-csi-driver-master__okd-scos.yaml`:
- Around line 23-27: The builder image reference for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is stale: update the registry image
string that ends with openshift-4.22 to match the 5.0 builder tag so it aligns
with the key; specifically change the image reference
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" to use
the corresponding "openshift-5.0" tag so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry and its image are consistent.

In
`@ci-operator/config/openshift/gcp-workload-identity-federation-webhook/openshift-gcp-workload-identity-federation-webhook-main__okd-scos.yaml`:
- Around line 23-27: The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is using an image tag that still
references openshift-4.22; update the image reference
(registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22) to the
matching 5.0 lineage tag (e.g., rhel-9-golang-1.25-openshift-5.0) so the alias
and actual builder image are consistent; change the tag wherever the builder
image is referenced to match ocp_builder_rhel-9-golang-1.25-openshift-5.0.

In
`@ci-operator/config/openshift/hypershift/openshift-hypershift-main__okd-scos.yaml`:
- Around line 23-27: The builder entry
ocp_builder_rhel-9-golang-1.25-openshift-5.0 references a registry image tagged
openshift-4.23; update that image tag to openshift-5.0 so the alias name and the
registry image are consistent (i.e., replace
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 with the
matching openshift-5.0 tag for the ocp_builder_rhel-9-golang-1.25-openshift-5.0
entry).

In
`@ci-operator/config/openshift/ibm-powervs-block-csi-driver-operator/openshift-ibm-powervs-block-csi-driver-operator-main__okd-scos.yaml`:
- Around line 23-27: The builder image tag in the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 stanza still points to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that image reference to the matching 5.0 tag (e.g., replace ...-openshift-4.22
with ...-openshift-5.0) so the ocp_builder_rhel-9-golang-1.25-openshift-5.0
alias and the powervs-block-csi-driver-operator mapping are consistent.

In
`@ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-main__okd-scos.yaml`:
- Around line 23-27: The builder image reference is still pointing at the old
4.22 stream; update the registry image for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 so it uses the 5.0 stream (replace
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 with the
corresponding rhel-9-golang-1.25-openshift-5.0 image) in the block that defines
ocp_builder_rhel-9-golang-1.25-openshift-5.0 (the same stanza that sets as: [-
builder, registry.ci.openshift.org/...]) so the builder alias matches the 5.0
config used elsewhere.

In
`@ci-operator/config/openshift/ironic-rhcos-downloader/openshift-ironic-rhcos-downloader-main__okd-scos.yaml`:
- Around line 22-26: The pullspec for the builder input named
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is stale—update the image tag
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 to the
matching 5.0 tag (e.g., replace "-4.22" with "-5.0") so the inputs align with
the migrated config; ensure the resulting pullspec uses the 5.0 image tag for
the builder entry.

In
`@ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master__okd-scos.yaml`:
- Around line 22-26: The inputs block references
ocp_builder_rhel-9-golang-1.25-openshift-5.0 but its builder pullspec is still
pinned to the old
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that pullspec to the correct openshift-5.0 builder image (replace the
:rhel-9-golang-1.25-openshift-4.22 tag with the corresponding
:rhel-9-golang-1.25-openshift-5.0 or the canonical 5.0 pullspec) so the as/alias
remains builder and the input name ocp_builder_rhel-9-golang-1.25-openshift-5.0
aligns with the actual image used.

In
`@ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-main__okd-scos.yaml`:
- Around line 22-26: The inputs mapping for key
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still references the old builder
tag registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22;
update that value to the matching openshift-5.0 tag
(registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) so the
inputs mapping aligns with the rest of the config and prevents build input
resolution divergence.

In
`@ci-operator/config/openshift/kubernetes-autoscaler/openshift-kubernetes-autoscaler-main__okd-scos.yaml`:
- Around line 22-26: The inputs.as entry for the input named
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still referencing the old
builder pullspec with the -4.22 tag; update the pullspec string in the inputs.as
list (the value under ocp_builder_rhel-9-golang-1.25-openshift-5.0 → as) to use
the -5.0 tag so it matches the migrated builder/base image (replace
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 with
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0).

In
`@ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-main__okd-scos.yaml`:
- Around line 22-26: The builder alias block named
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still pointing at the old image
tag registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22;
update that image reference to the matching migrated tag
(rhel-9-golang-1.25-openshift-5.0) so the
inputs->ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry uses the correct
builder image and avoids mixing pre-migration and post-migration images.

In
`@ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-main__okd-scos.yaml`:
- Around line 22-26: The inputs.as entry is referencing the 4.22 builder image;
update the pullspec in the inputs block
(ocp_builder_rhel-9-golang-1.25-openshift-5.0) so the registry.ci.openshift.org
image tag uses the 5.0 builder (replace
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 with the
corresponding rhel-9-golang-1.25-openshift-5.0 pullspec) to keep inputs.as
consistent with the rest of the config.

In
`@ci-operator/config/openshift/kubernetes/openshift-kubernetes-master__okd-scos.yaml`:
- Around line 22-26: The builder alias entries under inputs for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 are still pointing at
registry.ci.openshift.org/ocp/builder:...openshift-4.22 which pins some builds
to the old stream; update every alias value that references
registry.ci.openshift.org/ocp/builder:...openshift-4.22 (the entries grouped
under the as: - builder list for ocp_builder_rhel-9-golang-1.25-openshift-5.0)
to the matching openshift-5.0 equivalent so all alias tags consistently use the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 stream.

In
`@ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-main__okd-scos.yaml`:
- Around line 22-26: The inputs mapping uses the new input name
ocp_builder_rhel-9-golang-1.25-openshift-5.0 but its as alias still points to
the old image tag
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21; update
the as entry for ocp_builder_rhel-9-golang-1.25-openshift-5.0 to reference the
correct migrated stream (e.g.,
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) or
remove the explicit as mapping so the new input name is used consistently
(modify the inputs mapping for ocp_builder_rhel-9-golang-1.25-openshift-5.0).

In
`@ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main__okd-scos.yaml`:
- Around line 22-26: The builder image alias is incorrect: under the inputs map
key ocp_builder_rhel-9-golang-1.25-openshift-5.0 the "as" entry still points to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; replace
that image tag with the matching SCOS 5.0 builder stream (i.e., change the
suffix from openshift-4.22 to openshift-5.0) so the as alias aligns with
ocp_builder_rhel-9-golang-1.25-openshift-5.0.

In
`@ci-operator/config/openshift/machine-api-provider-aws/openshift-machine-api-provider-aws-main__okd-scos.yaml`:
- Around line 22-26: The inputs section still maps the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 alias to the image tag ending in
openshift-4.22; update the image reference string (currently
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22") to
the matching openshift-5.0 variant so the alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 consistently points to the
openshift-5.0 builder image.

In
`@ci-operator/config/openshift/machine-api-provider-azure/openshift-machine-api-provider-azure-main__okd-scos.yaml`:
- Around line 22-26: The input alias currently mapping the builder role in the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 input still points at the
openshift-4.22 image; update the registry image tag so the as: builder alias
references the SCOS 5.0 builder image (change the image name ending from
...openshift-4.22 to the corresponding ...openshift-5.0) in the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 input.

In
`@ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-main__okd-scos.yaml`:
- Around line 22-26: The inputs section uses
ocp_builder_rhel-9-golang-1.25-openshift-5.0 but the second entry in the as list
still points to the 4.22 image; update the alias value in the as array (the
string
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22") to
the 5.0 variant
("registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0") so
the ocp_builder_rhel-9-golang-1.25-openshift-5.0 input correctly references the
openshift-5.0 builder.

In
`@ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-main__okd-scos.yaml`:
- Around line 22-26: The inputs block contains a leftover builder image tag: in
the inputs entry named ocp_builder_rhel-9-golang-1.25-openshift-5.0 update the
as list entry that currently reads
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" to the
correct 5.0 alias
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0" so the
inputs.as for ocp_builder_rhel-9-golang-1.25-openshift-5.0 matches the 5.0
builder.

In
`@ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main__okd-scos.yaml`:
- Around line 22-26: Update the builder image alias for the inputs entry named
ocp_builder_rhel-9-golang-1.25-openshift-5.0: replace the current
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 tag with
the matching openshift-5.0 tag (i.e., change ...-openshift-4.22 →
...-openshift-5.0) so the alias aligns with the configured
ocp_builder_rhel-9-golang-1.25-openshift-5.0 stream.

In
`@ci-operator/config/operator-framework/operator-marketplace/operator-framework-operator-marketplace-master__okd-scos.yaml`:
- Line 26: The listed builder image pullspec is stale: replace the pinned
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" entry
with the SCOS 5.0-compatible builder tag used elsewhere in this config (i.e.,
the same rhel-9-golang-1.25 image but with the openshift-5.0 tag or the
project's canonical 5.0 pullspec) so the file consistently targets 5.0; locate
the exact string
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" and
update it to the corresponding 5.0 pullspec.

---

Minor comments:
In
`@ci-operator/config/openshift/azure-storage-azcopy/openshift-azure-storage-azcopy-main__okd-scos.yaml`:
- Line 1: CI config under ci-operator/config was changed (the base_images:
entry); run the repository's downstream artifact regeneration by executing make
update, verify it produces changes, add and commit those generated files, and
push the commit so downstream artifacts are consistent with the edits to the
ci-operator/config (ensure the generated files from make update are included in
the PR).

In
`@ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-main__okd-scos.yaml`:
- Around line 1-37: The CI config changes touch base_images, build_root, images,
promotion, and releases and require regenerating downstream ci-operator
artifacts; run make update in the repo root, review and add any modified
artifacts produced by that command to this PR (or if make update reports no
changes, add a short confirmation comment noting it's a no-op), then amend the
PR to include those generated files so the CI config and its downstream
artifacts remain in sync.

@jupierce jupierce closed this May 22, 2026
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 22, 2026
@openshift-ci openshift-ci Bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 22, 2026
@jupierce jupierce reopened this May 22, 2026
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 22, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 22, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jupierce

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 22, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 22, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jupierce

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-merge-bot openshift-merge-bot Bot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 22, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@jupierce: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-agent-installer-utils-main-okd-scos-e2e-aws-ovn openshift/agent-installer-utils presubmit Ci-operator config changed
pull-ci-openshift-agent-installer-utils-main-okd-scos-images openshift/agent-installer-utils presubmit Ci-operator config changed
pull-ci-openshift-insights-runtime-extractor-main-okd-scos-e2e-aws-ovn openshift/insights-runtime-extractor presubmit Ci-operator config changed
pull-ci-openshift-insights-runtime-extractor-main-okd-scos-images openshift/insights-runtime-extractor presubmit Ci-operator config changed
pull-ci-openshift-csi-node-driver-registrar-master-okd-scos-e2e-aws-ovn openshift/csi-node-driver-registrar presubmit Ci-operator config changed
pull-ci-openshift-csi-node-driver-registrar-master-okd-scos-images openshift/csi-node-driver-registrar presubmit Ci-operator config changed
pull-ci-openshift-insights-operator-master-okd-scos-e2e-aws-ovn openshift/insights-operator presubmit Ci-operator config changed
pull-ci-openshift-insights-operator-master-okd-scos-images openshift/insights-operator presubmit Ci-operator config changed
pull-ci-openshift-aws-pod-identity-webhook-master-okd-scos-e2e-aws-ovn openshift/aws-pod-identity-webhook presubmit Ci-operator config changed
pull-ci-openshift-aws-pod-identity-webhook-master-okd-scos-images openshift/aws-pod-identity-webhook presubmit Ci-operator config changed
pull-ci-openshift-aws-ebs-csi-driver-master-okd-scos-e2e-aws-ovn openshift/aws-ebs-csi-driver presubmit Ci-operator config changed
pull-ci-openshift-aws-ebs-csi-driver-master-okd-scos-images openshift/aws-ebs-csi-driver presubmit Ci-operator config changed
pull-ci-openshift-oauth-proxy-master-okd-scos-e2e-aws-ovn openshift/oauth-proxy presubmit Ci-operator config changed
pull-ci-openshift-oauth-proxy-master-okd-scos-images openshift/oauth-proxy presubmit Ci-operator config changed
pull-ci-openshift-network-tools-main-okd-scos-e2e-aws-ovn openshift/network-tools presubmit Ci-operator config changed
pull-ci-openshift-network-tools-main-okd-scos-images openshift/network-tools presubmit Ci-operator config changed
pull-ci-openshift-configmap-reload-main-okd-scos-e2e-aws-ovn openshift/configmap-reload presubmit Ci-operator config changed
pull-ci-openshift-configmap-reload-main-okd-scos-images openshift/configmap-reload presubmit Ci-operator config changed
pull-ci-openshift-ironic-agent-image-main-okd-scos-e2e-aws-ovn openshift/ironic-agent-image presubmit Ci-operator config changed
pull-ci-openshift-ironic-agent-image-main-okd-scos-images openshift/ironic-agent-image presubmit Ci-operator config changed
pull-ci-openshift-azure-workload-identity-main-okd-scos-e2e-aws-ovn openshift/azure-workload-identity presubmit Ci-operator config changed
pull-ci-openshift-azure-workload-identity-main-okd-scos-images openshift/azure-workload-identity presubmit Ci-operator config changed
pull-ci-openshift-ibm-powervs-block-csi-driver-main-okd-scos-e2e-aws-ovn openshift/ibm-powervs-block-csi-driver presubmit Ci-operator config changed
pull-ci-openshift-ibm-powervs-block-csi-driver-main-okd-scos-images openshift/ibm-powervs-block-csi-driver presubmit Ci-operator config changed
pull-ci-openshift-csi-external-snapshotter-master-okd-scos-e2e-aws-ovn openshift/csi-external-snapshotter presubmit Ci-operator config changed

A total of 322 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 22, 2026

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

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note

Due to the large number of review comments, Critical severity comments were prioritized as inline comments.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (4)
ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-main__okd-scos.yaml (1)

1-46: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Regenerate downstream CI artifacts after these config edits.

This PR modifies ci-operator/config/... files but the provided changeset does not include regenerated downstream outputs. Please run make update and include any resulting artifact updates before merge.

As per coding guidelines, "After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update."

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

In
`@ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-main__okd-scos.yaml`
around lines 1 - 46, This change updates CI config keys (see top-level keys like
base_images, images, promotion, releases and zz_generated_metadata) but lacks
regenerated downstream artifacts; run the repository make target to regenerate
CI outputs (run make update), review and add the generated artifacts (updated
files under the ci-operator/ and related generated directories) to the branch,
ensure zz_generated_metadata remains correct, and commit those artifact changes
alongside this config change before merging.
ci-operator/config/openshift/router/openshift-router-main__okd-scos.yaml (1)

1-61: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Please include/update generated downstream artifacts for this new ci-operator config.

This PR adds a new file under ci-operator/config/; please confirm make update was run and include any generated changes (or mention explicitly if it was a verified no-op).

As per coding guidelines: “After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update”.

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

In `@ci-operator/config/openshift/router/openshift-router-main__okd-scos.yaml`
around lines 1 - 61, The new ci-operator config
(openshift-router-main__okd-scos.yaml) requires regenerated downstream
artifacts: run make update from the repository root to produce the updated
generated files (configs, bundle entries, and any changes under the generated/
or ci-operator/jobs/ trees), commit those generated changes alongside this PR
(or, if you ran make update and it produced no changes, state explicitly "make
update was run and produced no changes"); ensure the commit includes all
modified generated files and reference the config filename
openshift-router-main__okd-scos.yaml in your PR description.
ci-operator/config/openshift/cluster-update-console-plugin/openshift-cluster-update-console-plugin-main__okd-scos.yaml (1)

1-55: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Regenerate downstream CI artifacts for this config change.

This file is under ci-operator/config/ and includes structural CI config updates; please run make update and include any generated downstream changes (or confirm no-op output).

As per coding guidelines: “After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update”.

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

In
`@ci-operator/config/openshift/cluster-update-console-plugin/openshift-cluster-update-console-plugin-main__okd-scos.yaml`
around lines 1 - 55, The CI config under
base_images/releases/zz_generated_metadata (repo: cluster-update-console-plugin,
branch: main, variant: okd-scos) was changed and downstream artifacts must be
regenerated; run make update from the repo root to regenerate files under
ci-operator/config and any generated downstream outputs, review and add the
updated generated artifacts to the PR (or confirm no-op) and commit the
resulting changes.
ci-operator/config/openshift/azure-file-csi-driver/openshift-azure-file-csi-driver-master__okd-scos.yaml (1)

1-55: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Run make update for these ci-operator config edits.

This file is under ci-operator/config/ and includes structural CI config changes. Please regenerate downstream artifacts and include any resulting diff before merge.

As per coding guidelines, “After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update.”

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

In
`@ci-operator/config/openshift/azure-file-csi-driver/openshift-azure-file-csi-driver-master__okd-scos.yaml`
around lines 1 - 55, This change modifies ci-operator config fields (e.g.,
base_images, build_root, images, promotion, releases and zz_generated_metadata)
and you must run the repository's downstream artifact regeneration: run make
update from the repo root to regenerate generated CI artifacts, review the
produced diffs, add/commit the updated generated files alongside this config
change, and push them so the PR includes the regenerated outputs before merging.
🟠 Major comments (28)
ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix stale builder alias version.

inputs.ocp_builder_rhel-9-golang-1.25-openshift-5.0 maps to a ...openshift-4.22 alias on Line 26. Please align it to 5.0.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/cluster-api-provider-gcp/openshift-cluster-api-provider-gcp-main__okd-scos.yaml`
around lines 22 - 26, The builder alias is inconsistent:
inputs.ocp_builder_rhel-9-golang-1.25-openshift-5.0 is pointing to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
the image alias so the tag matches 5.0 (change the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
reference to the corresponding openshift-5.0 tag) so the input key and the image
tag both reflect openshift-5.0.
ci-operator/config/openshift-assisted/assisted-installer-ui/openshift-assisted-assisted-installer-ui-master__okd-scos.yaml-27-34 (1)

27-34: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Both staged builder aliases still target 4.22 images.

proxy-build and ui-build aliases (Lines 30 and 34) are inconsistent with the new 5.0 base images and can keep the old build chain.

Suggested fix
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - proxy-build
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
       ocp_builder_rhel-9-openshift-nodejs-base-5.0.art:
         as:
         - ui-build
-        - registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift-assisted/assisted-installer-ui/openshift-assisted-assisted-installer-ui-master__okd-scos.yaml`
around lines 27 - 34, The staged builder entries
ocp_builder_rhel-9-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-openshift-nodejs-base-5.0.art still reference registry images
tagged openshift-4.22 for the as aliases proxy-build and ui-build; update those
alias targets to the matching 5.0 builder images (replace the
registry.ci.openshift.org/...:openshift-4.22 tags with the corresponding
:openshift-5.0 tags or the correct 5.0 image names) so proxy-build and ui-build
use the new 5.0 base images.
ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Align builder alias with 5.0 migration.

Line 26 still points at ...openshift-4.22 while the config now targets 5.0.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/machine-api-provider-ibmcloud/openshift-machine-api-provider-ibmcloud-main__okd-scos.yaml`
around lines 22 - 26, The builder image reference under inputs
(ocp_builder_rhel-9-golang-1.25-openshift-5.0) is still pointing to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that image tag to the correct 5.0 migration image (replace ...openshift-4.22
with the corresponding ...openshift-5.0 tag) so the alias and actual builder
image align with the 5.0 migration.
ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Update stale builder alias tag to 5.0.

The alias on Line 26 still points to ...openshift-4.22 despite the rest of the config moving to 5.0.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-main__okd-scos.yaml`
around lines 22 - 26, The inputs block for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still maps the builder alias to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that tag to the 5.0 image (change the suffix from openshift-4.22 to
openshift-5.0) so the builder alias in the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 input points at the correct 5.0
image.
ci-operator/config/openshift/must-gather/openshift-must-gather-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Builder alias still pinned to 4.22 after 5.0 migration.

Line 26 should use the 5.0 builder tag to match the new base/input mapping.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/must-gather/openshift-must-gather-main__okd-scos.yaml`
around lines 22 - 26, The builder image tag is still referencing openshift-4.22
while the input key is ocp_builder_rhel-9-golang-1.25-openshift-5.0; update the
image tag string that currently ends with :rhel-9-golang-1.25-openshift-4.22 to
use the :rhel-9-golang-1.25-openshift-5.0 tag so the inputs mapping
(ocp_builder_rhel-9-golang-1.25-openshift-5.0 → as: builder) matches the new 5.0
migration.
ci-operator/config/openshift/router/openshift-router-main__okd-scos.yaml-23-26 (1)

23-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

New file still pulls 4.22 builder alias.

The new okd-scos config wires a 5.0 builder key, but Line 26 references the 4.22 builder image. This can produce inconsistent builds.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In `@ci-operator/config/openshift/router/openshift-router-main__okd-scos.yaml`
around lines 23 - 26, The new builder key
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is correct but the image reference
still points to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that image string to the matching openshift-5.0 builder tag (or the intended 5.0
image name) so the key and referenced builder image are consistent (change the
registry.ci.openshift.org/...:rhel-9-golang-1.25-openshift-4.22 to the
corresponding ...-openshift-5.0).
ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Update the builder input alias to the 5.0 stream.

The input key was migrated to ...openshift-5.0, but the aliased image still points to ...openshift-4.22 (Line 26). This can silently keep building with the old toolchain.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main__okd-scos.yaml`
around lines 22 - 26, The builder input
ocp_builder_rhel-9-golang-1.25-openshift-5.0 declares an alias but still
references the old image tag
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
that image reference to the matching 5.0 stream (e.g., change the tag suffix
from openshift-4.22 to openshift-5.0) so the aliased builder uses the new
toolchain while keeping the same alias "as:" and input key.
ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Builder alias is still on 4.21/Go 1.24.

After migrating to 5.0 inputs, Line 26 still references rhel-9-golang-1.24-openshift-4.21, which is likely unintended.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-main__okd-scos.yaml`
around lines 22 - 26, The builder alias block under inputs
(ocp_builder_rhel-9-golang-1.25-openshift-5.0) still references the old image
tag registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21;
update that reference to the matching 1.25/openshift-5.0 tag (e.g.,
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) so the
as: builder alias points to the correct migrated image.
ci-operator/config/openshift/insights-runtime-extractor/openshift-insights-runtime-extractor-main__okd-scos.yaml-33-41 (1)

33-41: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Retarget all injected builder aliases off 4.22 in this 5.0 variant.

Line 37 and Line 41 still reference 4.22 images in inputs, which undermines the 5.0 retarget and may produce mixed build environments.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - go-builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
       origin_scos-5.0_base-stream9:
         as:
         - rust-builder
-        - registry.ci.openshift.org/ocp/4.22:base-rhel9
+        - registry.ci.openshift.org/ocp/5.0:base-rhel9
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/insights-runtime-extractor/openshift-insights-runtime-extractor-main__okd-scos.yaml`
around lines 33 - 41, The inputs block still references 4.22 images; update the
injected builder aliases so both ocp_builder_rhel-9-golang-1.25-openshift-5.0
and origin_scos-5.0_base-stream9 point at the 5.0 images instead of the 4.22
tags (replace
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 and
registry.ci.openshift.org/ocp/4.22:base-rhel9 with their 5.0 equivalents),
ensuring the as aliases (go-builder, rust-builder) remain the same and the
retargeting is consistent across the file.
ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Update the injected builder image alias to 5.0 as well.

Line 26 still injects the 4.22 builder image while this variant is being retargeted to 5.0. This can silently pin builds to older tooling/content.

Suggested fix
     inputs:
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/machine-api-provider-gcp/openshift-machine-api-provider-gcp-main__okd-scos.yaml`
around lines 22 - 26, The injected builder image tag is still set to
"openshift-4.22" under the inputs entry for
ocp_builder_rhel-9-golang-1.25-openshift-5.0; update the
registry.ci.openshift.org/ocp/builder image tag to use "openshift-5.0" (matching
the ocp_builder_rhel-9-golang-1.25-openshift-5.0 alias) so the as/alias and
actual image version are consistent and the variant isn't pinned to 4.22.
ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-main__okd-scos.yaml-1-1 (1)

1-1: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Regenerate downstream CI artifacts for this ci-operator config change

ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-main__okd-scos.yaml changed; run make update and include any generated artifact diffs (e.g., ci-operator/jobs/, prow config, registry-metadata), or confirm it’s a no-op.

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

In
`@ci-operator/config/openshift/cluster-api-provider-baremetal/openshift-cluster-api-provider-baremetal-main__okd-scos.yaml`
at line 1, The ci-operator config file
openshift-cluster-api-provider-baremetal-main__okd-scos.yaml was modified; run
the repository make target to regenerate downstream CI artifacts (run "make
update"), review and stage any changed generated files (e.g., under
ci-operator/jobs/, prow config, registry-metadata), and commit those diffs
alongside the config change so the CI artifacts remain in sync with the updated
base_images entry.
ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master__okd-scos.yaml-22-27 (1)

22-27: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

SCOS 5.0 configs still pin builder images to openshift-4.22
The SCOS 5.0 openshift-controller-manager config keeps registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 under inputs.as (line 26), and the same openshift-4.22 builder pin appears in other ci-operator/config/openshift/*__okd-scos.yaml files as well—risking builds using the 4.22 builder lineage. Update the builder pullspec(s) to the intended 5.0 variant, and run make update for ci-operator/config/ outputs if this config was modified.

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

In
`@ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master__okd-scos.yaml`
around lines 22 - 27, The inputs block for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still referencing the
openshift-4.22 builder pullspec in inputs.as; update the pullspec value (the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 string)
to the matching openshift-5.0 builder variant, keep the as: - builder entry
intact, then run make update for ci-operator/config/ to regenerate outputs for
the ci-operator configs (including the openshift-controller-manager to:
openshift-controller-manager entry) so the changes are applied across other
*__okd-scos.yaml files.
ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml-2-37 (1)

2-37: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Run make update for ci-operator/config/.../openshift-agent-installer-utils-main__okd-scos.yaml changes

Downstream regeneration doesn’t reflect the structural CI config edits: core-services/release-controller/_releases/release-okd-scos-5.0-* and core-services/sanitize-prow-jobs/ are unchanged; only ci-operator/jobs/openshift/agent-installer-utils/openshift-agent-installer-utils-main-{presubmits,postsubmits}.yaml changed (removing .ci-operator.yaml from sparse_checkout_files).

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

In
`@ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml`
around lines 2 - 37, Change to the repo root and run `make update` to regenerate
downstream artifacts for the modified ci-operator config
(openshift-agent-installer-utils-main__okd-scos.yaml); this will update the
generated job files
(ci-operator/jobs/.../openshift-agent-installer-utils-main-presubmits.yaml and
...-postsubmits.yaml) and also regenerate
core-services/release-controller/_releases/release-okd-scos-5.0-* and
core-services/sanitize-prow-jobs/ outputs; commit the generated changes so the
removal of `.ci-operator.yaml` from sparse_checkout_files is reflected across
the release-controller and sanitize-prow-jobs outputs.
ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main__okd-scos.yaml-23-26 (1)

23-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Old builder aliases (4.22) remain in both image inputs

Lines 26 and 37 still pin to openshift-4.22 for builder aliases, which conflicts with the 5.0 migration in the rest of the file.

Suggested fix
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
@@
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0

Also applies to: 34-37

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

In
`@ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main__okd-scos.yaml`
around lines 23 - 26, The builder image inputs still reference the old
openshift-4.22 tag for the builder alias (e.g., the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 block uses
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22); update
those image inputs to use the matching openshift-5.0 tag so the builder alias
aligns with the rest of the file, and apply the same change to the other
equivalent image input block that also pins to openshift-4.22.
ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master__okd-scos.yaml-23-26 (1)

23-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Both image inputs still use 4.21 builder aliases

Lines 26 and 37 keep openshift-4.21 builder aliases after switching this config to 5.0 streams, creating mixed-version inputs.

Suggested fix
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
@@
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0

Also applies to: 34-37

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

In
`@ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master__okd-scos.yaml`
around lines 23 - 26, The two image input entries named
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still reference the old
openshift-4.21 builder image; update the registry image tag from
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 to the
corresponding openshift-5.0 builder tag and ensure any matching alias lists (the
"as:" builder entries) are consistent with the 5.0 stream; repeat the same fix
for the second occurrence noted around the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 block later in the file so both
inputs point to the 5.0 builder image.
ci-operator/config/openshift/vmware-vsphere-csi-driver/openshift-vmware-vsphere-csi-driver-master__okd-scos.yaml-23-26 (1)

23-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Builder aliases are still on 4.22 in both images

Lines 26 and 37 still use openshift-4.22 alias values while the rest of the config is updated to 5.0.

Suggested fix
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
@@
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0

Also applies to: 34-37

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

In
`@ci-operator/config/openshift/vmware-vsphere-csi-driver/openshift-vmware-vsphere-csi-driver-master__okd-scos.yaml`
around lines 23 - 26, The builder image aliases for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still point to the old
openshift-4.22 tag; update the registry reference
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22" to use
the openshift-5.0 tag for the ocp_builder_rhel-9-golang-1.25-openshift-5.0 entry
and the other identical builder entry later in the file so both aliases match
the 5.0 config.
ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-main__okd-scos.yaml-33-40 (1)

33-40: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Stale 4.22 builder aliases remain in OVN image inputs

Lines 36, 40, and 51 still reference openshift-4.22 builder aliases although this file has been moved to 5.0. This can produce non-uniform build behavior.

Suggested fix
       ocp_builder_rhel-8-golang-1.25-openshift-5.0:
         as:
         - rhel8
-        - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-5.0
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
@@
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0

Also applies to: 48-51

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

In
`@ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-main__okd-scos.yaml`
around lines 33 - 40, The OVN image input entries
ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still reference builder images
tagged with openshift-4.22; update those
registry.ci.openshift.org/ocp/builder:*-openshift-4.22 image tags to the correct
openshift-5.0 equivalents and sweep the file for any remaining "-openshift-4.22"
references (including the block around the other ocp_builder_* entry at lines
~48-51) so all builder image tags and aliases match the 5.0 branch.
ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main__okd-scos.yaml-23-26 (1)

23-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Builder alias still points to 4.22 after 5.0 retarget

Line 26 still maps builder to an openshift-4.22 image while the config is otherwise moved to 5.0. That can pull an older toolchain unexpectedly.

Suggested fix
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main__okd-scos.yaml`
around lines 23 - 26, The builder alias under
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still points to the registry image
with openshift-4.22; update the mapped image for the "builder" alias to the
matching 5.0 stream (replace
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 with the
corresponding rhel-9-golang-1.25-openshift-5.0 image tag) so the
ocp_builder_rhel-9-golang-1.25-openshift-5.0 config uses a consistent toolchain.
ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-main__okd-scos.yaml-23-26 (1)

23-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Builder alias is still pinned to 4.22

Line 26 references openshift-4.22 while this variant targets scos-5.0. This can silently keep the old build chain.

Suggested fix
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-main__okd-scos.yaml`
around lines 23 - 26, The builder alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still pointing to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22; update
the referenced image string so the alias uses the matching openshift version for
the scos-5.0 variant (e.g., change the tag suffix from openshift-4.22 to
openshift-5.0) so the build chain aligns with
ocp_builder_rhel-9-golang-1.25-openshift-5.0.
ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-main__okd-scos.yaml-27-34 (1)

27-34: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Input aliases still reference 4.21 builder tags

Lines 30 and 34 keep openshift-4.21 builder aliases even though the file is retargeted to 5.0. This mismatch can cause inconsistent build inputs.

Suggested fix
       ocp_builder_rhel-8-golang-1.25-openshift-5.0:
         as:
         - rhel8
-        - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.21
+        - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-5.0
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - rhel9
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-main__okd-scos.yaml`
around lines 27 - 34, The input aliases for
ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 still reference openshift-4.21
builder tags; update the alias strings so the registry image tags match the 5.0
target (e.g. change
registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.21 and
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 to the
corresponding rhel-*-golang-1.25-openshift-5.0 builder tags).
ci-operator/config/openshift/cloud-provider-kubevirt/openshift-cloud-provider-kubevirt-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix kubevirt builder input to use the openshift-5.0 builder tag
In ci-operator/config/openshift/cloud-provider-kubevirt/openshift-cloud-provider-kubevirt-main__okd-scos.yaml, base_images.ocp_builder_rhel-9-golang-1.25-openshift-5.0.tag is rhel-9-golang-1.25-openshift-5.0, but images[].inputs.ocp_builder_rhel-9-golang-1.25-openshift-5.0.as still points to registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21, which conflicts with the 5.0 retargeting and can block the migration.

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

In
`@ci-operator/config/openshift/cloud-provider-kubevirt/openshift-cloud-provider-kubevirt-main__okd-scos.yaml`
around lines 22 - 26, The images input for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is still referencing the old
builder tag; update
images[].inputs.ocp_builder_rhel-9-golang-1.25-openshift-5.0.as to point to
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
(replacing the rhel-9-golang-1.24-openshift-4.21 tag) so the inputs match
base_images.ocp_builder_rhel-9-golang-1.25-openshift-5.0.tag and the 5.0
retargeting is consistent.
ci-operator/config/openshift/bond-cni/openshift-bond-cni-main__okd-scos.yaml-26-34 (1)

26-34: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix RHEL8/RHEL9 builder input aliases still referencing OpenShift 4.21

Lines 30 and 34 keep registry.ci.openshift.org/ocp/builder:rhel-*-golang-1.24-openshift-4.21 under ocp_builder_rhel-8-golang-1.25-openshift-5.0 / ocp_builder_rhel-9-golang-1.25-openshift-5.0, which will mix 4.21 builders into the 5.0 inputs.

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

In `@ci-operator/config/openshift/bond-cni/openshift-bond-cni-main__okd-scos.yaml`
around lines 26 - 34, The builder inputs
ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 reference image tags with
openshift-4.21 and golang-1.24; update the image strings to the correct
rhel-*-golang-1.25-openshift-5.0 tags (replace
registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.21 and
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 with
their rhel-*-golang-1.25-openshift-5.0 equivalents) while keeping the as aliases
(rhel8 / rhel9) unchanged.
ci-operator/config/openshift/multus-cni/openshift-multus-cni-main__okd-scos.yaml-26-45 (1)

26-45: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix stale builder image tags still pinned to openshift-4.22

ci-operator/config/openshift/multus-cni/openshift-multus-cni-main__okd-scos.yaml still references registry.ci.openshift.org/ocp/builder:* -openshift-4.22 in the image inputs (lines 30, 41, 45), which can keep these builds on 4.22 builder images despite the 5.0 retarget. Update these aliases to the openshift-5.0 builder tags, then run make update to regenerate downstream artifacts.

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

In
`@ci-operator/config/openshift/multus-cni/openshift-multus-cni-main__okd-scos.yaml`
around lines 26 - 45, Update the stale builder image tags that are still pinned
to openshift-4.22 by replacing the occurrences of
registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22 and
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 in the
inputs block with their openshift-5.0 counterparts (i.e., use
registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-5.0 and
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0),
updating both places where ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 are referenced; then run make
update to regenerate downstream artifacts.
ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix Nutanix builder alias still pinned to OpenShift 4.22 (in a 5.0 config)
ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main__okd-scos.yaml still maps inputs.ocp_builder_rhel-9-golang-1.25-openshift-5.0 to registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 (lines 22-26). Update that alias to the ...openshift-5.0 builder tag so the image build can’t accidentally consume the 4.22 stream.

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

In
`@ci-operator/config/openshift/machine-api-provider-nutanix/openshift-machine-api-provider-nutanix-main__okd-scos.yaml`
around lines 22 - 26, The inputs mapping for
ocp_builder_rhel-9-golang-1.25-openshift-5.0 is incorrectly pointed at the
Openshift 4.22 builder tag; update the image reference under
inputs.ocp_builder_rhel-9-golang-1.25-openshift-5.0 to use the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 tag
(replace the ...openshift-4.22 suffix with ...openshift-5.0) so the 5.0 config
consumes the correct builder stream.
ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix mismatched builder image tag (4.22 vs 5.0).

ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-main__okd-scos.yaml defines the ocp_builder_rhel-9-golang-1.25-openshift-5.0 input, but the inputs: ... as: builder target still uses the ...openshift-4.22 image tag (registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22), so the 5.0 migration is incomplete.

Relevant snippet
inputs:
  ocp_builder_rhel-9-golang-1.25-openshift-5.0:
    as:
    - builder
    - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/ibm-vpc-block-csi-driver-operator/openshift-ibm-vpc-block-csi-driver-operator-main__okd-scos.yaml`
around lines 22 - 26, The input named
ocp_builder_rhel-9-golang-1.25-openshift-5.0 declares the builder but still
references the
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 image
tag; update that image reference to the matching openshift-5.0 tag (e.g.,
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) so the
input name and image tag are consistent.
ci-operator/config/openshift/gcp-workload-identity-federation-webhook/openshift-gcp-workload-identity-federation-webhook-main__okd-scos.yaml-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix 5.0 builder alias still pinned to 4.22 image

In ci-operator/config/openshift/gcp-workload-identity-federation-webhook/openshift-gcp-workload-identity-federation-webhook-main__okd-scos.yaml line 26, the ocp_builder_rhel-9-golang-1.25-openshift-5.0 alias still references registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22, which keeps 4.x tooling while the alias targets 5.0.

Suggested fix
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - builder
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/gcp-workload-identity-federation-webhook/openshift-gcp-workload-identity-federation-webhook-main__okd-scos.yaml`
around lines 22 - 26, Update the builder image for the alias
ocp_builder_rhel-9-golang-1.25-openshift-5.0 so it actually uses the OpenShift
5.0 builder image instead of the old 4.22 tag; replace the referenced image
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 with the
corresponding 5.0 tag (e.g.,
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0) in the
inputs block where ocp_builder_rhel-9-golang-1.25-openshift-5.0 is defined.
ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-main__okd-scos.yaml-26-34 (1)

26-34: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Fix builder image aliases for SCOS 5.0 (currently point at 4.19).

In ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-main__okd-scos.yaml (inputs under ocp_builder_rhel-{8,9}-golang-1.25-openshift-5.0), the as entries reference registry.ci.openshift.org/ocp/builder:rhel-{8,9}-golang-1.23-openshift-4.19, which can keep using the old builder/toolchain.

Suggested fix
       ocp_builder_rhel-8-golang-1.25-openshift-5.0:
         as:
         - rhel8
-        - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19
+        - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-5.0
       ocp_builder_rhel-9-golang-1.25-openshift-5.0:
         as:
         - rhel9
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0

After updating the CI config, run make update to regenerate downstream artifacts.

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

In
`@ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-main__okd-scos.yaml`
around lines 26 - 34, The inputs for
ocp_builder_rhel-8-golang-1.25-openshift-5.0 and
ocp_builder_rhel-9-golang-1.25-openshift-5.0 have their alias "as" image tags
still pointing at openshift-4.19; update the second item in each "as" list to
the correct builder image for SCOS 5.0 (e.g.,
registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-5.0 and
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
respectively) so the alias matches the input key names, then run make update to
regenerate downstream artifacts.
ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-main__okd-scos.yaml-26-26 (1)

26-26: ⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Align builder input tag with the 5.0 migration.

Line 26 still points to ...openshift-4.22 while surrounding config moved to 5.0. This can cause inconsistent build inputs.

Suggested fix
-        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22
+        - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0
🤖 Prompt for 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.

In
`@ci-operator/config/openshift/baremetal-operator/openshift-baremetal-operator-main__okd-scos.yaml`
at line 26, The builder image tag currently references
"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22";
update that tag to the 5.0-aligned variant (e.g., change the suffix from
"openshift-4.22" to "openshift-5.0") so the builder input matches the
surrounding 5.0 migration changes and avoids mixed-version build inputs.

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant