Skip to content

openshift/os: adapt for more build-args changes#79631

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
dustymabe:dusty-openshift-os-build-args
May 21, 2026
Merged

openshift/os: adapt for more build-args changes#79631
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
dustymabe:dusty-openshift-os-build-args

Conversation

@dustymabe
Copy link
Copy Markdown
Member

@dustymabe dustymabe commented May 21, 2026

We added the OPENSHIFT_VERSION and YUM_REPO_NAMES build args in openshift/os#1935 so let's add them here.

Also drop the quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos references because we don't have that defined in our containerfile anymore.

Summary by CodeRabbit

This PR updates OpenShift CI configuration for the openshift/os repository so the CI image builds provide the new build arguments and repository metadata required by openshift/os PR #1935.

Practical effect:

  • CI image builds will now receive an OPENSHIFT_VERSION build arg (5.0 or 5.1 as appropriate) and a corresponding YUM_REPO_NAMES list so the produced RHEL CoreOS images use the correct OpenShift-scoped yum repos.
  • IMAGE_CPE values were bumped from OpenShift 4.22 to the matching 5.0 or 5.1 CPEs for el9/el10 images.
  • Stale references to the previously used quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos image were removed/shortened where the containerfile no longer defines that image (the OKD/SCOS config and some build inputs).
  • One build input mapping was changed from a fixed ocp-v4.0-art-dev:c9s-coreos image to a parameterized IMAGE_FROM-based source so the input is no longer hard-coded.

Affected CI config (practical scope):

  • Master and release CI operator configs for openshift/os (master, okd-scos, release-5.0, release-5.1) — these changes ensure CI builds pass the new build-args and repository names into coreos-assembler builds and align metadata with OpenShift 5.x.

Why this matters:

  • Aligns CI with upstream openshift/os changes so image builds use the correct OpenShift version, repositories, and metadata, and avoids referring to an image/tag that no longer exists in the containerfile.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 21, 2026

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: 6572d983-224b-4c16-a154-3fea296094df

📥 Commits

Reviewing files that changed from the base of the PR and between 4a14ab5 and 7c98f6b.

📒 Files selected for processing (4)
  • ci-operator/config/openshift/os/openshift-os-master.yaml
  • ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
  • ci-operator/config/openshift/os/openshift-os-release-5.0.yaml
  • ci-operator/config/openshift/os/openshift-os-release-5.1.yaml

Walkthrough

This PR updates CI image build arguments and input mappings to set OPENSHIFT_VERSION, adjust YUM_REPO_NAMES, and update IMAGE_CPE for RHEL CoreOS el9/el10 images across master and release-5.0/5.1 configs; one OKD SCOS input mapping and one master input source were shortened/parameterized.

Changes

OpenShift OS CI Configuration Version Targeting

Layer / File(s) Summary
Master: rhel-coreos el9/el10 image args
ci-operator/config/openshift/os/openshift-os-master.yaml
Adds OPENSHIFT_VERSION: "5.0", replaces YUM_REPO_NAMES with 5.0-scoped rhel-<major>.<minor>-server-ose-5.0 lists, updates IMAGE_CPE to OpenShift 5.0 for el9/el10, and parameterizes the rhel-coreos-base as input for el9.
Master: OKD SCOS input mapping
ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
Adds OPENSHIFT_VERSION: "5.0" and YUM_REPO_NAMES to images.items, and shortens the stream-coreos-base as: input mapping.
Release-5.0: rhel-coreos el9/el10 image args
ci-operator/config/openshift/os/openshift-os-release-5.0.yaml
Adds OPENSHIFT_VERSION: "5.0", sets YUM_REPO_NAMES to rhel-9.8 / rhel-10.2 5.0-scoped lists, and updates IMAGE_CPE to OpenShift 5.0 for el9/el10 build items.
Release-5.1: rhel-coreos el9/el10 image args
ci-operator/config/openshift/os/openshift-os-release-5.1.yaml
Adds OPENSHIFT_VERSION: "5.1", sets YUM_REPO_NAMES to rhel-9.8 / rhel-10.2 5.1-scoped lists, and updates IMAGE_CPE to OpenShift 5.1 for el9/el10 build items.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Suggested labels

lgtm, rehearsals-ack

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: adapting OpenShift OS build configurations for new build arguments (OPENSHIFT_VERSION, YUM_REPO_NAMES) across multiple 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 This PR contains only YAML CI/CD configuration files (ci-operator), not Ginkgo test code. No test titles or dynamic test names present to check.
Test Structure And Quality ✅ Passed PR contains no Ginkgo test code—only YAML CI configuration changes. The test structure check does not apply to non-test files.
Microshift Test Compatibility ✅ Passed This PR modifies only YAML CI configuration files, not Go test files. No new Ginkgo e2e tests are added, so the MicroShift compatibility check does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains only CI operator configuration YAML changes (build args, YUM repos, CPE values) for openshift/os. No Ginkgo e2e tests are added. SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI configuration files for OpenShift OS builds, not deployment manifests or operator code. No scheduling constraints or topology-specific logic introduced.
Ote Binary Stdout Contract ✅ Passed PR contains only YAML CI configuration files with no Go code or OTE binaries. The stdout contract check is inapplicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR only modifies CI operator configuration YAML files (build args for OpenShift OS images), not Ginkgo e2e test code, so the IPv6/disconnected network test check does not apply.

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

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 21, 2026
We added the OPENSHIFT_VERSION and YUM_REPO_NAMES build args
in openshift/os#1935 so let's add them
here.

Also drop the quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos
references because we don't have that defined in our containerfile
anymore.
@dustymabe dustymabe force-pushed the dusty-openshift-os-build-args branch from 4a14ab5 to 7c98f6b Compare May 21, 2026 19:25
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@dustymabe: 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-os-release-5.0-e2e-aws openshift/os presubmit Ci-operator config changed
pull-ci-openshift-os-release-5.0-images openshift/os presubmit Ci-operator config changed
pull-ci-openshift-os-release-5.1-e2e-aws openshift/os presubmit Ci-operator config changed
pull-ci-openshift-os-release-5.1-images openshift/os presubmit Ci-operator config changed
pull-ci-openshift-os-master-e2e-aws openshift/os presubmit Ci-operator config changed
pull-ci-openshift-os-master-images openshift/os presubmit Ci-operator config changed
pull-ci-openshift-os-master-okd-scos-e2e-aws-ovn openshift/os presubmit Ci-operator config changed
pull-ci-openshift-os-master-okd-scos-images openshift/os presubmit Ci-operator config changed
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.

@dustymabe
Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-os-master-images

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 21, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustymabe, jlebon

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

@dustymabe
Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-os-master-images

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@dustymabe
Copy link
Copy Markdown
Member Author

dustymabe commented May 21, 2026

The CI failure here is related to the mirrors:

 Downloading Packages:
[MIRROR] openssl-3.5.5-1.el10.x86_64.rpm: Status code: 404 for https://art-srv-enterprise.s3.amazonaws.com/enterprise/reposync/5.0/rhel-102-baseos/Packages/o/openssl-3.5.5-1.el10.x86_64.rpm?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=ASIAYV6JGSEBBS3VRUAB%2F20260521%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20260521T202008Z&X-Amz-Expires=1200&X-Amz-SignedHeaders=host&X-Amz-Security-Token=xxxl&X-Amz-Signature=xxx (IP: 16.15.252.206)

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 21, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

@dustymabe: The following test 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/os/master/images 7c98f6b link unknown /pj-rehearse pull-ci-openshift-os-master-images

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit bc36c6c into openshift:main May 21, 2026
14 of 15 checks passed
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. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants