Skip to content

OKD-388: Add ci-operator config for OKD SCOS 4.22 CoreOS image - #82269

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pskrbasu:okd-scos-4.22-coreos-config
Jul 24, 2026
Merged

OKD-388: Add ci-operator config for OKD SCOS 4.22 CoreOS image#82269
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
pskrbasu:okd-scos-4.22-coreos-config

Conversation

@pskrbasu

@pskrbasu pskrbasu commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Add dedicated ci-operator config for the release-4.22 branch of openshift/os (OKD SCOS variant), modeled on the existing 4.21 config
  • Remove scos-4.22 / scos-4.22-art promotion targets from the master branch config and update integration reference to scos-5.0, so 4.22 and 5.0 CoreOS image builds are independent

Summary by CodeRabbit

  • Adds a dedicated ci-operator config for openshift/os okd-scos on the release-4.22 branch to build the CoreOS assembler and extensions, promote them to origin (scos-4.22 and scos-4.22-art), and include built images in releases.latest.integration; also defines optional e2e-aws-ovn using the openshift-e2e-aws workflow.
  • Updates the openshift/os master okd-scos config to integrate/promote scos-5.0 images instead (removing the prior scos-4.22/scos-4.22-art promotion targets and switching releases.latest.integration to scos-5.0), separating the 4.22 and 5.0 CoreOS image build streams.
  • References Jira OKD-388; openshift-ci-robot noted it has no target version configured even though the expected target branch/version is 5.0.0, and requested rehearsals for the pull-ci-openshift-os-release-4.22-okd-scos-images job twice.

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

openshift-ci-robot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

@pskrbasu: This pull request references OKD-388 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

  • Add dedicated ci-operator config for the release-4.22 branch of openshift/os (OKD SCOS variant), modeled on the existing 4.21 config
  • Remove scos-4.22 / scos-4.22-art promotion targets from the master branch config and update integration reference to scos-5.0, so 4.22 and 5.0 CoreOS image builds are independent

Jira: https://issues.redhat.com/browse/OKD-388

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.

@openshift-ci
openshift-ci Bot requested review from jmarrero and tlbueno July 22, 2026 06:03
@coderabbitai

coderabbitai Bot commented Jul 22, 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: Pro Plus

Run ID: 5dec0540-16bc-4031-8356-c160f5992f9e

📥 Commits

Reviewing files that changed from the base of the PR and between 2782236 and c4486b9.

⛔ Files ignored due to path filters (2)
  • ci-operator/jobs/openshift/os/openshift-os-release-4.22-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/os/openshift-os-release-4.22-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
  • ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml
🚧 Files skipped from review as they are similar to previous changes (2)
  • ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml
  • ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml

Walkthrough

Adds a release-4.22 OKD SCOS CI configuration with image builds, promotion, resource settings, testing, and metadata. Updates the master OKD SCOS configuration to promote and integrate scos-5.0 image streams.

Changes

OKD SCOS CI configuration

Layer / File(s) Summary
Release image build pipeline
ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml
Defines base images, the coreos-assembler build root, and assembler and extensions image builds.
Release outputs and validation
ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml
Adds scos-4.22 promotion and integration targets, default resource requests, an optional AWS OVN end-to-end test, and generated release metadata.
Master SCOS 5.0 targets
ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
Replaces master promotion and integration targets named scos-4.22 with scos-5.0 equivalents.

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

Possibly related PRs

Suggested labels: lgtm, approved, rehearsals-ack

Suggested reviewers: jmarrero, tlbueno

🚥 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 clearly reflects the main change: adding a ci-operator config for the OKD SCOS 4.22 CoreOS image.
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 ci-operator YAML/job configs; no Go/Ginkgo test files or It/Describe/Context/When titles were added or modified.
Test Structure And Quality ✅ Passed Only ci-operator config/job YAML changed; no Ginkgo test code was added or modified, so the test-quality check is not applicable.
Microshift Test Compatibility ✅ Passed No Go/Ginkgo test code changed; only ci-operator YAML/job config was added, with no new It/Describe/Context/When tests to assess.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo test code was added; this PR only changes ci-operator/job YAML and an existing e2e workflow, so there’s no SNO-specific test logic to flag.
Topology-Aware Scheduling Compatibility ✅ Passed Only CI operator YAML changed; no deployment manifests, controllers, or scheduling fields were added.
Ote Binary Stdout Contract ✅ Passed Only ci-operator YAML changed; no Go entrypoints or process-level code were modified, so no stdout contract violation is introduced.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e test code was added; only CI config/job definitions. The new job reuses openshift-e2e-aws and shows no IPv4-only URLs/CIDRs.
No-Weak-Crypto ✅ Passed PR only changes CI config/job YAML; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret/token comparisons were added.
Container-Privileges ✅ Passed The touched ci-operator configs contain no privileged, hostPID/Network/IPC, SYS_ADMIN, allowPrivilegeEscalation, or root-user settings.
No-Sensitive-Data-In-Logs ✅ Passed CI YAML only; no log statements or embedded secrets/PII were added. Secret mounts/paths are standard config, not exposed values.
✨ 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.

@Prashanth684

Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openshift-os-release-4.22-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

/pj-rehearse pull-ci-openshift-os-release-4.22-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.

Comment thread ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml Outdated
Comment thread ci-operator/jobs/openshift/os/openshift-os-release-4.22-postsubmits.yaml Outdated
- build_args:
- name: OPENSHIFT_CI
value: "1"
dockerfile_path: extensions/Containerfile

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.

i changed this to Containerfile. @pskrbasu can you run make jobs to update the pre and postsubmit jobs?

Comment thread ci-operator/jobs/openshift/os/openshift-os-release-4.22-presubmits.yaml Outdated
Comment thread ci-operator/jobs/openshift/os/openshift-os-release-4.22-presubmits.yaml Outdated
@Prashanth684

Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openshift-os-release-4.22-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.

Add dedicated ci-operator config for the release-4.22 branch of
openshift/os (OKD SCOS variant) and remove scos-4.22 promotion
targets from the master branch config so that 4.22 and 5.0 CoreOS
image builds are independent.
@pskrbasu
pskrbasu force-pushed the okd-scos-4.22-coreos-config branch from 595dded to c4486b9 Compare July 24, 2026 04:03
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@pskrbasu: 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-4.22-okd-scos-e2e-aws-ovn openshift/os presubmit Presubmit changed
pull-ci-openshift-os-release-4.22-okd-scos-images openshift/os presubmit Presubmit 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.

@openshift-ci

openshift-ci Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

@pskrbasu: 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 Prashanth684 added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. rehearsals-ack Signifies that rehearsal jobs have been acknowledged labels Jul 24, 2026
@openshift-ci

openshift-ci Bot commented Jul 24, 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: pskrbasu

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 312fcd0 into openshift:main Jul 24, 2026
16 checks passed
apahim pushed a commit to apahim/release that referenced this pull request Jul 24, 2026
…hift#82269)

Add dedicated ci-operator config for the release-4.22 branch of
openshift/os (OKD SCOS variant) and remove scos-4.22 promotion
targets from the master branch config so that 4.22 and 5.0 CoreOS
image builds are independent.
mrniranjan pushed a commit to mrniranjan/release that referenced this pull request Jul 28, 2026
…hift#82269)

Add dedicated ci-operator config for the release-4.22 branch of
openshift/os (OKD SCOS variant) and remove scos-4.22 promotion
targets from the master branch config so that 4.22 and 5.0 CoreOS
image builds are independent.
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. 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