Skip to content

Adding support for payload multiple-stream.#180

Open
ybettan wants to merge 1 commit intoopenshift:masterfrom
ybettan:dual-stream
Open

Adding support for payload multiple-stream.#180
ybettan wants to merge 1 commit intoopenshift:masterfrom
ybettan:dual-stream

Conversation

@ybettan
Copy link
Member

@ybettan ybettan commented Feb 5, 2026

The multiple-stream effort will contain multiple images considered as machine-os in the payload as well as multiple driver-toolkit images.

This commit is adding some labels to the container such as the rhel-stream and kernel-version.

In addition it adds a reference to the rhel-coreos-10 image in order to specify to the payload that DTK depends on the rhel-coreos-10 image.


/assign @jlebon
/cc @dustymabe @sdodson @travier @joepvd

@openshift-ci
Copy link

openshift-ci bot commented Feb 5, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ybettan

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 5, 2026
@ybettan
Copy link
Member Author

ybettan commented Feb 5, 2026

/hold
Let's wait with the merge util ART, oc and rhcos sides are ready.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2026
@ybettan
Copy link
Member Author

ybettan commented Feb 5, 2026

CI is failing with

error: failed to push image registry.build09.ci.openshift.org/ci-op-s32ks3md/release:latest: unable to upload new layer (0): Patch "https://registry.build09.ci.openshift.org/v2/ci-op-s32ks3md/release/blobs/uploads/28f7b512-00ca-497d-90d5-af8add973312?_state=jrqAoJunzNy78omjdQYHrhN7hEN1H5TseZNpvtDe2257Ik5hbWUiOiJjaS1vcC1zMzJrczNtZC9yZWxlYXNlIiwiVVVJRCI6IjI4ZjdiNTEyLTAwY2EtNDk3ZC05MGQ1LWFmOGFkZDk3MzMxMiIsIk9mZnNldCI6MCwiU3RhcnRlZEF0IjoiMjAyNi0wMi0wNVQwOTo1NjowOC44NTg5NTQyNjdaIn0%3D": operator "driver-toolkit" contained an invalid image-references file: no input image tag named "stream-coreos-10"

@sdodson What version of OKD introduce the rhel-coreos-10 image to the payload?

Dockerfile Outdated
io.openshift.release.operator=true \
version="0.1"
version="0.1" \
rhel-stream=${RHEL_STREAM} \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you proposing using this label instead of the streamclass label? Would be nice to be consistent here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was just following the existing labels of DTK (some of them don't have any prefix) but it is better to set it to io.openshift.os.streamclass=${RHEL_STREAM}.
Fixing...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@ybettan
Copy link
Member Author

ybettan commented Feb 17, 2026

/retest

@joepvd
Copy link
Contributor

joepvd commented Feb 17, 2026

Did you test how this works in a PR to release repo? The images jon only produces one image.

Also, OKD needs to work.

@ybettan ybettan force-pushed the dual-stream branch 3 times, most recently from 8192889 to 135c837 Compare February 18, 2026 09:36
@@ -0,0 +1,78 @@
FROM registry.ci.openshift.org/ocp/4.22:rhel-coreos-10
Copy link
Member Author

@ybettan ybettan Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joepvd
There is no registry.ci.openshift.org/ocp/4.22:base-rhel10 in the release repo.
Should I use registry.ci.openshift.org/ocp/4.22:rhel-coreos-10 or should we add a new registry.ci.openshift.org/ocp/4.22:base-rhel10 image in the CI registry?

@ybettan ybettan force-pushed the dual-stream branch 2 times, most recently from c236343 to 231919e Compare February 18, 2026 09:55
The multiple-stream effort will contain multiple images considered as
`machine-os` in the payload as well as multiple `driver-toolkit` images.

This commit is adding some labels to the container such as the
`rhel-stream` and `kernel-version`.

In addition it adds a reference to the `rhel-coreos-10` image in order to
specify to the payload that DTK depends on the `rhel-coreos-10` image.

The Dockerfile has been split into 2 Dockerfile, one for each rhel
release. In the future, it may extend to 3 Dockerfile including rhel for
nvidia.

Signed-off-by: Yoni Bettan <yonibettan@gmail.com>
@openshift-ci
Copy link

openshift-ci bot commented Feb 18, 2026

@ybettan: The following tests 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/prow/images 32feeaa link true /test images
ci/prow/e2e-upgrade 32feeaa link true /test e2e-upgrade
ci/prow/e2e-aws 32feeaa link true /test e2e-aws
ci/prow/verify 32feeaa link true /test verify
ci/prow/okd-scos-images 32feeaa link true /test okd-scos-images
ci/prow/verify-image-content 32feeaa link true /test verify-image-content

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.

@ybettan
Copy link
Member Author

ybettan commented Feb 18, 2026

Did you test how this works in a PR to release repo? The images jon only produces one image.

Also, OKD needs to work.

I have now because I split the Dockerfile. This is the chicken and egg problem though. CI fill fail here because the is no Dockerfile anymore to use in the images job and the release job will fail because it looks for Dockerfile.rhelx files which doesn't exist in the main branch yet.

openshift/release#75027

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants