Skip to content

NO-JIRA: Saner image aliases#80230

Open
stephenfin wants to merge 2 commits into
openshift:mainfrom
shiftstack:installer-image-sanity
Open

NO-JIRA: Saner image aliases#80230
stephenfin wants to merge 2 commits into
openshift:mainfrom
shiftstack:installer-image-sanity

Conversation

@stephenfin

@stephenfin stephenfin commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Remove irrelevant version identifiers from these image which were giving the impression that we were dealing with older images than we actually are.

Summary by CodeRabbit

This PR standardizes image aliases in the OpenShift installer CI configuration so the CI manifests no longer carry misleading, hard-coded older version numbers in their image keys. It affects the ci-operator configs for the openshift/installer repo (files under ci-operator/config/openshift/installer/) across release branches from 4.10 through 5.1.

What changed in practice:

  • Replaced the CLI alias ocp_4.10_cli with a neutral ocp_cli everywhere it was used, while preserving each release’s actual CLI image (name/namespace/tag) so builds continue to use the correct CLI for that branch.
  • Replaced per-release base image keys like ocp_4.22_base-rhel9, ocp_4.16_base-rhel9, etc., with a unified ocp_base-rhel9 alias, retaining the underlying release version and tag per file.
  • Updated downstream references (images.inputs, dockerfile_literal copy steps, pipeline_image_cache_step “from” fields) to the new ocp_cli / ocp_base-rhel9 keys.
  • Adjusted raw_steps that bootstrap OpenStack yum repos to curl the version-appropriate base-openstack-* repo (e.g., base-openstack-4-23, base-openstack-5-0) and to use the new ocp_base-rhel9 source where applicable.

Impact:

  • CI configuration becomes clearer and avoids suggesting the use of stale image versions while preserving correct image targets per release branch.
  • Changes are limited to CI pipeline YAMLs and image aliasing; no installer code or runtime behavior is altered beyond CI wiring.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 8, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@stephenfin: This pull request explicitly references no jira issue.

Details

In response to this:

Remove irrelevant version identifiers from these image which were giving the impression that we were dealing with older images than we actually are.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 9faa2642-152b-402d-8156-aac8f6f2fd71

📥 Commits

Reviewing files that changed from the base of the PR and between 470988f and 0eb64cb.

📒 Files selected for processing (21)
  • ci-operator/config/openshift/installer/openshift-installer-main.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.12.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.13.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.14.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.15.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.15__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.18__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-5.1.yaml
✅ Files skipped from review due to trivial changes (3)
  • ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.14.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml
🚧 Files skipped from review as they are similar to previous changes (17)
  • ci-operator/config/openshift/installer/openshift-installer-release-4.15__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.13.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.15.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.12.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-5.1.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.18__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml

Walkthrough

This PR renames versioned CI base-image keys across installer configs, replacing ocp_4.10_cliocp_cli and ocp_X_base-rhel9ocp_base-rhel9, and updates downstream image inputs plus OpenStack repo/cache steps in main, release-4.x, and release-5.x files.

Changes

Base image reference unification

Layer / File(s) Summary
Main CI: OCP 5.0 base and CLI updates
ci-operator/config/openshift/installer/openshift-installer-main.yaml
Adds ocp_cli/ocp_base-rhel9, switches dockerfile_literal inputs to ocp_cli, and updates raw_steps OpenStack repo/cache to 5.0 with from: ocp_base-rhel9.
Release 4.10–4.15 CLI-only renames
ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml, ...-4.11.yaml, ...-4.12.yaml, ...-4.13.yaml, ...-4.14.yaml, ...-4.15.yaml, ...-4.15__altinfra.yaml
Renames ocp_4.10_cliocp_cli in base_images and updates image build inputs references.
Release 4.16–4.20 mixed renames and cache tweaks
ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml, ...-4.16__altinfra.yaml, ...-4.17.yaml, ...-4.17__altinfra.yaml, ...-4.18.yaml, ...-4.18__altinfra.yaml, ...-4.19.yaml, ...-4.20.yaml
Replace ocp_4.10_cliocp_cli, ocp_X_base-rhel9ocp_base-rhel9 where present, update build inputs, and adjust raw_steps cache from: entries.
Release 4.21–4.23 canonicalization and cache updates
ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml, ...-4.22.yaml, ...-4.23.yaml
Introduce ocp_cli/ocp_base-rhel9, rewire Dockerfile inputs to ocp_cli, and update OpenStack repo/cache URLs and from: sources for 4.21–4.23.
Releases 5.0–5.1: OCP 5.x base and CLI onboarding
ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml, ...-5.1.yaml
Define ocp_base-rhel9 and ocp_cli for OCP 5.x, change images inputs to ocp_cli, and bump OpenStack repo/cache to 5.0/5.1 with from: ocp_base-rhel9.

🎯 3 (Moderate) | ⏱️ ~20 minutes

Suggested labels: lgtm

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'Saner image aliases' clearly summarizes the main change - renaming image references to remove version-specific identifiers and use generic aliases across multiple CI configuration files.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR modifies only CI operator YAML configuration files for the OpenShift installer, with no Ginkgo tests added or modified. The custom check does not apply to YAML configuration files.
Test Structure And Quality ✅ Passed PR contains no Ginkgo test code; all changes are YAML CI configuration files renaming image aliases. The test structure quality check is not applicable.
Microshift Test Compatibility ✅ Passed This PR only modifies CI operator YAML configuration files (image aliases/references), not Ginkgo e2e test files. The custom check applies only to new e2e tests, making it inapplicable here.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR only modifies CI/CD configuration YAML files (image aliases in ci-operator configs), not Ginkgo e2e test code. The check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only CI operator configuration files (image alias names and build references), not deployment manifests, operator code, or controllers with scheduling constraints.
Ote Binary Stdout Contract ✅ Passed PR modifies only YAML CI configuration files in ci-operator/config/openshift/installer/. No application code or OTE binary code changes, making stdout contract check inapplicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies only CI YAML configuration files (ci-operator/config/openshift/installer/). No new Ginkgo e2e tests (It, Describe, Context, When) are added, so this check is not applicable.
No-Weak-Crypto ✅ Passed PR contains only YAML CI configuration file changes renaming image aliases; no cryptographic algorithms, custom crypto implementations, or secret comparisons present.
Container-Privileges ✅ Passed Modified files are CI operator configs, not K8s manifests. No privileged, hostPID/Network/IPC, SYS_ADMIN, allowPrivilegeEscalation, or runAsRoot settings found anywhere in the 21 modified files.
No-Sensitive-Data-In-Logs ✅ Passed PR updates image aliases in CI configs. All curl commands redirect output to files without verbose flags. Secret references only point to mounted paths, not actual secret content.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

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

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

@openshift-ci openshift-ci Bot requested review from patrickdillon and tthvo June 8, 2026 14:49
@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stephenfin

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 Jun 8, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Caution

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

⚠️ Outside diff range comments (1)
ci-operator/config/openshift/installer/openshift-installer-main.yaml (1)

126-128: ⚠️ Potential issue | 🔴 Critical | ⚡ Quick win

Critical: raw_steps reference removed base_images key.

Lines 126-128 were not updated when the base image keys were renamed. Line 127 references from: ocp_4.22_base-rhel9, but that key no longer exists in base_images (it was renamed to ocp_base-rhel9 at lines 38-41). This will cause the pipeline_image_cache_step to fail when ci-operator attempts to resolve the base image reference.

Additionally, line 126 should use the base-openstack-5-0 repo URL to align with the "5.0" version in base_images, consistent with the pattern applied in the 5.0 and 5.1 release configs.

🔧 Proposed fix to align raw_steps with renamed base images
 raw_steps:
 - pipeline_image_cache_step:
     commands: |
-      curl http://base-openstack-4-22.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-4-22.repo
-    from: ocp_4.22_base-rhel9
+      curl http://base-openstack-5-0.ocp.svc/ > /etc/yum.repos.art/ci/base-openstack-5-0.repo
+    from: ocp_base-rhel9
     to: openstack-base
🤖 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/installer/openshift-installer-main.yaml` around
lines 126 - 128, Update the raw_steps to reference the renamed base_images keys
and correct repo URL: replace the stale from: ocp_4.22_base-rhel9 with the
current key ocp_base-rhel9 (the key renamed in base_images) and change the curl
target from base-openstack-4-22.ocp.svc to base-openstack-5-0.ocp.svc so the
repo matches the "5.0" entry in base_images; ensure the
pipeline_image_cache_step now points to ocp_base-rhel9 and the repo URL
base-openstack-5-0 to avoid resolution failures.
🤖 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/installer/openshift-installer-main.yaml`:
- Around line 126-128: Update the raw_steps to reference the renamed base_images
keys and correct repo URL: replace the stale from: ocp_4.22_base-rhel9 with the
current key ocp_base-rhel9 (the key renamed in base_images) and change the curl
target from base-openstack-4-22.ocp.svc to base-openstack-5-0.ocp.svc so the
repo matches the "5.0" entry in base_images; ensure the
pipeline_image_cache_step now points to ocp_base-rhel9 and the repo URL
base-openstack-5-0 to avoid resolution failures.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: bc13f853-036f-428c-864e-e04820c8658b

📥 Commits

Reviewing files that changed from the base of the PR and between db8c4ac and 470988f.

📒 Files selected for processing (21)
  • ci-operator/config/openshift/installer/openshift-installer-main.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.12.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.13.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.14.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.15.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.15__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.18__altinfra.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml
  • ci-operator/config/openshift/installer/openshift-installer-release-5.1.yaml

Remove irrelevant version identifiers from these image which were giving
the impression that we were dealing with older images than we actually
are.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Looks like the bot reverted this in commit
bf0239b.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
@stephenfin stephenfin force-pushed the installer-image-sanity branch from 470988f to 0eb64cb Compare June 8, 2026 15:05
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@stephenfin: 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-installer-release-4.14-agent-integration-tests openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-aro-unit openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-agent-compact-ipv4 openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-agent-compact-ipv4-appliance openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-agent-compact-ipv4-none-platform openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-agent-ha-dualstack openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-agent-sno-ipv4-pxe openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-agent-sno-ipv6 openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-alibaba openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-fips openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-imdsv2 openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-localzones openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-proxy openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-public-subnets openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-shared-vpc openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-shared-vpc-localzones openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-single-node openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-upgrade openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-upi openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-ovn-workers-rhel8 openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-aws-upi-proxy openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-azure-ovn openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-azure-ovn-resourcegroup openshift/installer presubmit Ci-operator config changed
pull-ci-openshift-installer-release-4.14-e2e-azure-ovn-shared-vpc openshift/installer presubmit Ci-operator config changed

A total of 1672 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.

@stephenfin

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-installer-release-4.23-e2e-openstack-ovn pull-ci-openshift-installer-release-5.0-e2e-openstack-ovn

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@stephenfin: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@stephenfin

Copy link
Copy Markdown
Contributor Author

4.23 failure is due to openshift/installer#10573

@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

@stephenfin: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/openshift/installer/release-5.0/e2e-openstack-ovn 0eb64cb link unknown /pj-rehearse pull-ci-openshift-installer-release-5.0-e2e-openstack-ovn
ci/rehearse/openshift/installer/release-4.23/e2e-openstack-ovn 0eb64cb link unknown /pj-rehearse pull-ci-openshift-installer-release-4.23-e2e-openstack-ovn

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.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants