Skip to content

fixes for OKD#81643

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
Prashanth684:okd-5.0-fix
Jul 9, 2026
Merged

fixes for OKD#81643
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
Prashanth684:okd-5.0-fix

Conversation

@Prashanth684

@Prashanth684 Prashanth684 commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

Summary by CodeRabbit

This PR refreshes OKD SCOS CI configuration for multiple OpenShift components so their OKD SCOS builds use the correct newer SCOS/RHEL inputs and builder streams, and fixes the OS master YUM repo argument to pull from the intended mirror repos. Concretely:

  • Agent installer utils: updates ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml to set build_root sourcing to from_repository: true (instead of referencing an OpenShift image_stream_tag).
  • OpenStack cloud-provider + cluster-cloud-controller-manager-operator: bumps OKD SCOS builder/release references from Go 1.25 to Go 1.26 by updating the builder tag and corresponding build_root.image_stream_tag.tag, plus the builder inputs used by the built images:
    • ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-main__okd-scos.yaml
    • ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main__okd-scos.yaml
  • CSI operator: updates the gcp-pd-csi-driver-operator build base image in ci-operator/config/openshift/csi-operator/openshift-csi-operator-main__okd-scos.yaml from origin_scos-4.22_base-stream9 to origin_scos-5.0_base-stream9.
  • OS master: adjusts openshift-os-master__okd-scos.yaml to use *-mirror YUM repo variants only for c10s-baseos and c10s-appstream (leaving c10s-sig-nfv, c10s-sig-cloud-okd, and rhel-10.2-server-ose-5.0 unchanged).

It also includes rehearsal triggers for the OKD SCOS image-related prow jobs:

  • pull-ci-openshift-os-master-okd-scos-images (requested twice)
  • pull-ci-openshift-cloud-provider-openstack-main-okd-scos-images
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-main-okd-scos-images
  • pull-ci-openshift-agent-installer-utils-main-okd-scos-images
  • pull-ci-openshift-csi-operator-main-okd-scos-images

@coderabbitai

coderabbitai Bot commented Jul 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: abd61ee2-0f03-41bf-8a7e-bac41ec6c278

📥 Commits

Reviewing files that changed from the base of the PR and between 127c79c and 135aa08.

⛔ Files ignored due to path filters (2)
  • ci-operator/jobs/openshift/agent-installer-utils/openshift-agent-installer-utils-main-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/agent-installer-utils/openshift-agent-installer-utils-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (5)
  • ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml
  • ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-main__okd-scos.yaml
  • ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main__okd-scos.yaml
  • ci-operator/config/openshift/csi-operator/openshift-csi-operator-main__okd-scos.yaml
  • ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
✅ Files skipped from review due to trivial changes (1)
  • ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml
🚧 Files skipped from review as they are similar to previous changes (4)
  • ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
  • ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main__okd-scos.yaml
  • ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-main__okd-scos.yaml
  • ci-operator/config/openshift/csi-operator/openshift-csi-operator-main__okd-scos.yaml

Walkthrough

This PR updates OKD SCOS ci-operator configs to change build-root sourcing, bump Go 1.26 image references, adjust one CSI base image, and switch OS YUM repo names to mirror variants.

Changes

OKD SCOS config updates

Layer / File(s) Summary
Build-root source switch
ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml
build_root switches from image_stream_tag to from_repository: true.
Go 1.26 builder and release tags
ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-main__okd-scos.yaml, ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main__okd-scos.yaml
Builder and release image tags move from Go 1.25 to Go 1.26, and the related image inputs are updated to match.
CSI base image reference
ci-operator/config/openshift/csi-operator/openshift-csi-operator-main__okd-scos.yaml
The gcp-pd-csi-driver-operator build changes its from image to origin_scos-5.0_base-stream9.
OS repository names
ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
YUM_REPO_NAMES switches the c10s-* entries to *-mirror variants.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested labels: lgtm, approved, rehearsals-ack

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title is generic and does not describe the specific OKD CI config updates in this PR. Use a concise title that names the main change, such as updating OKD SCOS CI configs and builder images.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
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 Only ci-operator YAML changed; no Ginkgo test bodies/titles were added or edited, so the stability rule isn't implicated.
Test Structure And Quality ✅ Passed No Ginkgo test code was changed; the PR only updates ci-operator YAML/job config, so the test-structure checklist is not applicable.
Microshift Test Compatibility ✅ Passed Only ci-operator YAML/job config changed; no new Ginkgo tests or test bodies were added, so MicroShift compatibility is not implicated.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only changes ci-operator YAML/build roots and job sparse-checkout entries; no new or modified Ginkgo e2e test code or SNO-sensitive test logic appears.
Topology-Aware Scheduling Compatibility ✅ Passed Only ci-operator/job YAML changed; no deployment manifests, controllers, or scheduling constraints (affinity, nodeSelector, PDBs, topology spread) were introduced.
Ote Binary Stdout Contract ✅ Passed PASS: The PR only changes ci-operator YAML/job config; no OTE binary code, init/TestMain, or stdout-logging paths were modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only ci-operator YAMLs changed; no new Ginkgo e2e tests or network assumptions were added, so the IPv6/disconnected test check is not applicable.
No-Weak-Crypto ✅ Passed Touched changes are CI YAML image refs only; no weak-crypto algorithms, custom crypto, or secret comparisons appear in the changed files.
Container-Privileges ✅ Passed The touched ci-operator YAMLs only adjust build image refs/build args; no privileged, hostPID/Network/IPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings appear.
No-Sensitive-Data-In-Logs ✅ Passed Touched YAMLs only change build/image refs and repo metadata; no log statements or sensitive data patterns appear in the diff or file contents.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-cloud-provider-openstack-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-cluster-cloud-controller-manager-operator-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-agent-installer-utils-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-csi-operator-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@Prashanth684: 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-cloud-provider-openstack-main-okd-scos-e2e-aws-ovn openshift/cloud-provider-openstack presubmit Ci-operator config changed
pull-ci-openshift-cloud-provider-openstack-main-okd-scos-images openshift/cloud-provider-openstack presubmit Ci-operator config changed
pull-ci-openshift-csi-operator-main-okd-scos-e2e-aws-ovn openshift/csi-operator presubmit Ci-operator config changed
pull-ci-openshift-csi-operator-main-okd-scos-images openshift/csi-operator presubmit Ci-operator config changed
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-cluster-cloud-controller-manager-operator-main-okd-scos-e2e-aws-ovn openshift/cluster-cloud-controller-manager-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-cloud-controller-manager-operator-main-okd-scos-images openshift/cluster-cloud-controller-manager-operator 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.

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-csi-operator-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-agent-installer-utils-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-cluster-cloud-controller-manager-operator-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-cloud-provider-openstack-main-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

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

@Prashanth684

Copy link
Copy Markdown
Contributor Author

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@Prashanth684: 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 Jul 9, 2026
@Prashanth684 Prashanth684 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 9, 2026
@ausil

ausil commented Jul 9, 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 Jul 9, 2026
@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: ausil, Prashanth684

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 merged commit 8fbb5d8 into openshift:main Jul 9, 2026
21 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