Skip to content

ci-operator/kubernetes: output RHCOS overlay to both rhel-coreos and rhel-coreos-10#81240

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
jubittajohn:rhel-coreos-overlay-hypershift
Jun 29, 2026
Merged

ci-operator/kubernetes: output RHCOS overlay to both rhel-coreos and rhel-coreos-10#81240
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
jubittajohn:rhel-coreos-overlay-hypershift

Conversation

@jubittajohn

@jubittajohn jubittajohn commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

HyperShift currently only reads the "stream" key from the bootimages ConfigMap (rhel-9), so it resolves the node OS from the rhel-coreos tag. Since #80945 moved the overlay output to rhel-coreos-10, HyperShift nodes no longer get the rebase's kubelet RPMs.
Duplicate the overlay into stable:rhel-coreos as a workaround until openshift/hypershift#8834 (multi-stream support) lands.

Summary by CodeRabbit

Updated the OpenShift Kubernetes CI promotion configuration (ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml) for the ocp/5.0 stream to support HyperShift’s RHEL9-related overlay behavior. The pipeline now builds/handles additional RHEL9 base artifacts and duplicates the RHCOS overlay output to both stable:rhel-coreos and stable:rhel-coreos-10, ensuring HyperShift nodes can still resolve the correct OS/tag and receive the kubelet RPMs after the overlay-output change. Correspondingly, promotion excludes both rhel-coreos and rhel-coreos-10 from published additional images.

@coderabbitai

coderabbitai Bot commented Jun 29, 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: 7fde181a-870d-41f6-9d9c-3c49a58dbf9b

📥 Commits

Reviewing files that changed from the base of the PR and between 9cf1da5 and 2ce3fcb.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml

Walkthrough

The CI operator config for openshift-kubernetes-master adds RHEL9 base image inputs, an RPM injection step, a new rhel-coreos image build, and updates promotion exclusions to include rhel-coreos.

Changes

RHEL9 promotion pipeline updates

Layer / File(s) Summary
Inputs, build, and promotion wiring
ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
Adds base-machine-rhel9 and rhel-coreos-base-rhel9, wires rpm_image_injection_step for base-machine-rhel9-with-rpms, builds rhel-coreos, and excludes rhel-coreos in promotion artifacts.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 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 accurately describes the main change: duplicating the RHCOS overlay output to both rhel-coreos and rhel-coreos-10.
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 only changes a ci-operator YAML config; no Ginkgo test files or titles were added/modified, so the deterministic-name check is not applicable.
Test Structure And Quality ✅ Passed No Ginkgo test code was changed; the PR only alters ci-operator config/docs, so the test-structure checklist is not applicable.
Microshift Test Compatibility ✅ Passed The PR only edits ci-operator YAML for image/promotion wiring; it adds no Ginkgo tests or MicroShift-sensitive API usage.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; this PR only adjusts ci-operator image/promotion YAML, so the SNO check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Only a ci-operator image/promotion YAML changed; no deployment, controller, affinity, nodeSelector, spread, or PDB scheduling logic was added.
Ote Binary Stdout Contract ✅ Passed PR only edits ci-operator YAML to add images/steps; no Go/main/TestMain/suite-setup code is changed, so stdout contract isn’t implicated.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PASS: PR only updates a ci-operator YAML to add RHCOS overlay images; no new Ginkgo e2e tests or network-dependent code were added.
No-Weak-Crypto ✅ Passed Changed YAML only adds image tags and build steps; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or secret comparisons found.
Container-Privileges ✅ Passed The changed YAML adds no privileged/root/hostNetwork/hostPID/hostIPC/SYS_ADMIN/allowPrivilegeEscalation settings; the only capabilities are test metadata (intranet).
No-Sensitive-Data-In-Logs ✅ Passed No logging or sensitive data exposure was added; the change only adjusts CI image/base config and tag exclusions.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot requested review from benluddy and p0lyn0mial June 29, 2026 20:27
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2026
@jubittajohn jubittajohn force-pushed the rhel-coreos-overlay-hypershift branch from 9cf1da5 to d274f57 Compare June 29, 2026 20:30
…rhel-coreos-10

Signed-off-by: jubittajohn <jujohn@redhat.com>
@jubittajohn jubittajohn force-pushed the rhel-coreos-overlay-hypershift branch from d274f57 to 2ce3fcb Compare June 29, 2026 20:39
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@jubittajohn: 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-kubernetes-master-artifacts openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-configmap-scale openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-agnostic-ovn-cmd openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-csi openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-disruptive openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-hpa openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-jenkins openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-cgroupsv2 openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-crun openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-downgrade openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-fips openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-hypershift openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-serial-1of2 openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-serial-2of2 openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-techpreview openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-techpreview-serial-1of2 openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-techpreview-serial-2of2 openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-upgrade openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-single-node openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-azure openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-azure-ovn-upgrade openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-external-aws-ccm openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-gcp openshift/kubernetes presubmit Ci-operator config changed

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

@csrwng

csrwng commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2026
@jacobsee

Copy link
Copy Markdown
Member

/approve

@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, jacobsee, jubittajohn

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

@jacobsee

Copy link
Copy Markdown
Member

/pj-rehearse pull-ci-openshift-kubernetes-master-e2e-aws-ovn-hypershift

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@jacobsee

Copy link
Copy Markdown
Member

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@jacobsee: 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 Jun 29, 2026
@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot openshift-merge-bot Bot merged commit b337188 into openshift:main Jun 29, 2026
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.

3 participants