OKD-387: Fix SCOS 4.22 shipping cri-o 1.36 instead of 1.35

[pskrbasu]

Summary

• 4-scos-stable releases after 4.22.0-okd-scos.3 incorrectly ship cri-o 1.36 instead of 1.35.x
• The openshift-os-master__okd-scos CI config builds from the master branch of openshift/os and promotes to scos-4.22. When master moved to target 5.0, c10s.repo was updated to point c10s-sig-cloud-okd at the okd-5.0 package repo (which has cri-o 1.36.x). The okd-4.22 repo only has cri-o 1.35.x.
• Creates a dedicated release-4.22__okd-scos config (matching the established pattern used for 4.21) and removes scos-4.22 promotion from the master config.

Test plan

• Verify make update generates correct Prow jobs for the new config
• Verify a postsubmit build from release-4.22 produces a stream-coreos image with cri-o 1.35.x
• Verify new 4-scos-stable releases no longer contain cri-o 1.36

Summary by CodeRabbit

• Fixes SCOS 4.22 release builds to use the release-4.22 branch, ensuring cri-o 1.35.x is shipped instead of 1.36.
• Adds a dedicated release-4.22__okd-scos CI configuration with image builds, promotion targets, release integration, resources, and optional AWS OVN testing.
• Updates the master-based OKD SCOS configuration to promote scos-5.0 rather than scos-4.22.

[openshift-ci-robot]

@pskrbasu: This pull request references OKD-387 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 bug to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

• 4-scos-stable releases after 4.22.0-okd-scos.3 incorrectly ship cri-o 1.36 instead of 1.35.x
• The openshift-os-master__okd-scos CI config builds from the master branch of openshift/os and promotes to scos-4.22. When master moved to target 5.0, c10s.repo was updated to point c10s-sig-cloud-okd at the okd-5.0 package repo (which has cri-o 1.36.x). The okd-4.22 repo only has cri-o 1.35.x.
• Creates a dedicated release-4.22__okd-scos config (matching the established pattern used for 4.21) and removes scos-4.22 promotion from the master config.

Test plan

• Verify make update generates correct Prow jobs for the new config
• Verify a postsubmit build from release-4.22 produces a stream-coreos image with cri-o 1.35.x
• Verify new 4-scos-stable releases no longer contain cri-o 1.36

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]

Important

Review skipped

Review was skipped due to path filters

⛔ 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/**

CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including **/dist/** will override the default block on the dist directory, by removing the pattern from both the lists.

⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: ef2f6e5b-3a7b-4e6b-a9c5-f62b085cf920

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Walkthrough

Adds an okd-scos OpenShift 4.22 release configuration and updates the master configuration to promote and integrate SCOS 5.0 images.

Changes

SCOS release configuration

Layer / File(s)	Summary
SCOS 4.22 build and release setup ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml	Defines build inputs, two image builds, promotion targets, release integration, resources, optional testing, and release metadata.
Master SCOS 5.0 promotion update ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml	Updates promotion targets and the release integration tag from scos-4.22 to scos-5.0.

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

Suggested reviewers: szigmon, josecastillolema, omertuc

🚥 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 matches the main fix: SCOS 4.22 was shipping the wrong cri-o version.
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 YAML files changed; no Go/Ginkgo test files or test titles were added or modified, so there are no dynamic test names to flag.
Test Structure And Quality	✅ Passed	PR only changes ci-operator YAML; no Ginkgo test code, assertions, or cluster-test logic was added or modified.
Microshift Test Compatibility	✅ Passed	Only CI config YAML changed; no Ginkgo test code or new test bodies were added, so MicroShift compatibility is not impacted.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	Only CI config YAML changed; no new Ginkgo e2e test code was added, so the SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	Only ci-operator release/promotion YAML changed; no deployment manifests, controllers, replicas, affinity, selectors, or topology-related scheduling rules were introduced.
Ote Binary Stdout Contract	✅ Passed	PR only changes two ci-operator YAML configs; no main/init/TestMain/suite code or stdout-writing binary logic was modified.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR only changes CI YAML and adds no new Ginkgo test code or network logic, so the IPv6/disconnected compatibility check is not applicable.
No-Weak-Crypto	✅ Passed	Changed files only adjust CI YAML release targets; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or custom crypto usage found.
Container-Privileges	✅ Passed	No privileged, hostPID/Network/IPC, SYS_ADMIN, or allowPrivilegeEscalation settings appear in the changed ci-operator YAML; changes are release config only.
No-Sensitive-Data-In-Logs	✅ Passed	The PR only updates CI YAML promotion/release config; no logging code was added, and the changed files contain no passwords, tokens, PII, or host/customer data.

✨ 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

• X
• Mastodon
• Reddit
• LinkedIn

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

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pskrbasu
Once this PR has been reviewed and has the lgtm label, please assign jbtrystram for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• ci-operator/config/openshift/os/OWNERS
• ci-operator/jobs/openshift/os/OWNERS

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]

[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.

[Prashanth684]

/pj-rehearse pull-ci-openshift-os-release-4.22-okd-scos-images

[openshift-merge-bot]

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

[openshift-ci]

@pskrbasu: 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/release-4.22/okd-scos-images	818f40f	link	unknown	/pj-rehearse pull-ci-openshift-os-release-4.22-okd-scos-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.

[pskrbasu]

For the rehearsal tests (ci/rehearse/openshift/os/release-4.22/okd-scos-images) to pass, this PR needs to be merged first - openshift/os#1947