Skip to content

MCO-2114: adds io.openshift.os.streamclass to OKD OS and extensions images#75759

Open
cheesesashimi wants to merge 1 commit intoopenshift:mainfrom
cheesesashimi:zzlotnik/okd-streamclass
Open

MCO-2114: adds io.openshift.os.streamclass to OKD OS and extensions images#75759
cheesesashimi wants to merge 1 commit intoopenshift:mainfrom
cheesesashimi:zzlotnik/okd-streamclass

Conversation

@cheesesashimi
Copy link
Member

@cheesesashimi cheesesashimi commented Mar 5, 2026

To support a singular OS Stream in OKD, we need to add a label to the SCOS 10 image (io.openshift.os.streamclass). For RHCOS 10, this label is set within the build-node-image.Jenkinsfile. Since the value of this label depends on whether it is an RHCOS 9 or RHCOS 10 image, the value must be set at build-time instead of via the Containerfile. Since OKD will only have one OS Stream (centos-10), we could set it statically in the Containerfile(s) found in https://github.com/openshift/os. However, I think it makes more sense to do it at build-time until there is a better way of setting it dynamically.

With the above in mind, this PR accomplishes that by modifying the image targets to be the input for an inline Containerfile which sets this label.

@openshift-ci openshift-ci bot requested review from madhu-pillai and marmijo March 5, 2026 16:43
@cheesesashimi
Copy link
Member Author

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

@openshift-ci-robot
Copy link
Contributor

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

@dustymabe
Copy link
Member

The code in the PR seems reasonable. The actual string suggested here may be able to be improved. For rhcos 9 and rhcos 10 the string we are using for the stream class is rhel-9 and rhel-10. I'm not sure if we want scos-10 here or centos-10.

@cheesesashimi
Copy link
Member Author

I have no objection with either scos-10, centos-10, or even stream-10. My only thought is that whatever identifier we use, it should be consistent throughout.

@dustymabe
Copy link
Member

I have no objection with either scos-10, centos-10, or even stream-10. My only thought is that whatever identifier we use, it should be consistent throughout.

I have the same sentiment, with a slight lean towards centos-10 since it seems to match more closely with what we are doing for streamclass for RHCOS (i.e. rhel-10).

@cheesesashimi cheesesashimi force-pushed the zzlotnik/okd-streamclass branch from 8badf45 to 64c38ed Compare March 6, 2026 16:54
@cheesesashimi
Copy link
Member Author

I just pushed a commit to change it to centos-10.

@cheesesashimi
Copy link
Member Author

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

@openshift-ci-robot
Copy link
Contributor

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

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@cheesesashimi: 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-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
Member

The label part of the PR lgtm. I'm not sure about the other changes.

Should we have someone from okd review this? @Prashanth684 ?

@Prashanth684
Copy link
Contributor

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

@openshift-ci-robot
Copy link
Contributor

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 6, 2026

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

@cheesesashimi cheesesashimi changed the title adds io.openshift.os.streamclass to OKD OS and extensions images MCO-2114: adds io.openshift.os.streamclass to OKD OS and extensions images Mar 6, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 6, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 6, 2026

@cheesesashimi: This pull request references MCO-2114 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

To support a singular OS Stream in OKD, we need to add a label to the SCOS 10 image (io.openshift.os.streamclass). For RHCOS 10, this label is set within the build-node-image.Jenkinsfile. Since the value of this label depends on whether it is an RHCOS 9 or RHCOS 10 image, the value must be set at build-time instead of via the Containerfile. Since OKD will only have one OS Stream (centos-10), we could set it statically in the Containerfile(s) found in https://github.com/openshift/os. However, I think it makes more sense to do it at build-time until there is a better way of setting it dynamically.

With the above in mind, this PR accomplishes that by modifying the image targets to be the input for an inline Containerfile which sets this label.

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.

@Prashanth684
Copy link
Contributor

/lgtm

@Prashanth684
Copy link
Contributor

checked the image created from the rehearsal job and it has the label set

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 6, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cheesesashimi, Prashanth684
Once this PR has been reviewed and has the lgtm label, please assign gursewak1997 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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants