NO-ISSUE: Add rhel-10-coreos{,-extensions} to image-references #5448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

openshift-merge-bot merged 1 commit into openshift:main from sdodson:main

Dec 5, 2025

Member

sdodson commented Nov 26, 2025

Handle FCOS and SCOS where those aren't relevant by commenting them out.

- What I did
Added rhel-10-coreos and rhel-10-coreos-extensions making sure that they're commented out for fcos and scos tags

- How to verify it
Build the images, the images should show up in the release payload

- Description for the changelog
Add rhel-10-coreos and rhel-10-coreos-extensions to the MCO image-references on OCP.

sdodson force-pushed the main branch from e44c4d5 to 986d134 Compare

November 26, 2025 14:51

openshift-ci bot added the do-not-merge/work-in-progress label

sdodson changed the title ~~Add rhel10-coreos{,-extensions} to image-references~~ Add rhel-10-coreos{,-extensions} to image-references

Contributor

openshift-ci bot commented Nov 26, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Member Author

sdodson commented Nov 26, 2025

/test images

sdodson force-pushed the main branch from 986d134 to bcd225d Compare

November 26, 2025 15:35

sdodson marked this pull request as ready for review

November 26, 2025 15:35

openshift-ci bot removed the do-not-merge/work-in-progress label

openshift-ci bot requested review from pablintino and yuqi-zhang

November 26, 2025 15:36

sdodson force-pushed the main branch from bcd225d to 102f6d0 Compare

November 26, 2025 16:15

cheesesashimi reviewed

View reviewed changes

Dockerfile Outdated Show resolved Hide resolved

sdodson force-pushed the main branch from 102f6d0 to ea6f65f Compare

November 26, 2025 16:45

Member Author

sdodson commented Nov 26, 2025 •

edited

Loading

error: failed to push image registry.build10.ci.openshift.org/ci-op-ib3xrgjb/release:latest: error appending image sha256:122c25e5744a08b4602cdacd0c0bcd4d1ab1b77e14af6af33e78a31c1e3f3fa3: unable to upload new layer (0): Patch "https://registry.build10.ci.openshift.org/v2/ci-op-ib3xrgjb/release/blobs/uploads/49581d8c-8956-49b5-8452-d64c32e8675e?_state=dW28cL8v1gchQ3PznndM15ZF1bzVP__de3LxW3RNA9l7Ik5hbWUiOiJjaS1vcC1pYjN4cmdqYi9yZWxlYXNlIiwiVVVJRCI6IjQ5NTgxZDhjLTg5NTYtNDliNS04NDUyLWQ2NGMzMmU4Njc1ZSIsIk9mZnNldCI6MCwiU3RhcnRlZEF0IjoiMjAyNS0xMS0yNlQxNzowMToyMi4wNzA5MTk5MTdaIn0%3D": operator "machine-config-operator" contained an invalid image-references file: input image stream has multiple versions defined for version machine-os: rhel-coreos-10 defines 10.1.20251124-0 but was already set to 9.6.20251125-1 on rhel-coreos

I think we need to fix oc adm release to accept this condition.

Member Author

sdodson commented Dec 1, 2025

/testwith openshift/machine-config-operator/master/image openshift/oc#2157

Contributor

openshift-ci bot commented Dec 1, 2025

@sdodson, testwith: could not generate prow job. ERROR:

could not determine ci op config from metadata: got unexpected http 404 status code from configresolver: failed to get config: could not find any config for branch master on repo openshift/machine-config-operator

Member Author

sdodson commented Dec 1, 2025

/testwith openshift/machine-config-operator/main/image openshift/oc#2157

Contributor

openshift-ci bot commented Dec 1, 2025

@sdodson, testwith: could not generate prow job. ERROR:

BUG: test 'image' not found in injected config

Member Author

sdodson commented Dec 1, 2025

/testwith openshift/machine-config-operator/main/images openshift/oc#2157

Contributor

openshift-ci bot commented Dec 1, 2025

@sdodson, testwith: could not generate prow job. ERROR:

BUG: test 'images' not found in injected config

Member Author

sdodson commented Dec 1, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157

Member Author

sdodson commented Dec 2, 2025

Hmm same error, tomorrow I'll modify the error message to confirm this actually ran with the version of code. I suspect our test with command may not be smart enough for this potential special case.

Member Author

sdodson commented Dec 2, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157

3 similar comments

Member Author

sdodson commented Dec 2, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157

Member Author

sdodson commented Dec 2, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157

Member Author

sdodson commented Dec 2, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157

Member Author

sdodson commented Dec 2, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157

These problems seem unique to this PR or perhaps the testwith command as on the OC PR images and unit tests are passing.

Member Author

sdodson commented Dec 3, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157

Member Author

sdodson commented Dec 3, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157
simplified oc PR

Member Author

sdodson commented Dec 3, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157
Just getting a fresh build to demonstrate something

Member Author

sdodson commented Dec 4, 2025

/testwith openshift/machine-config-operator/main/e2e-aws-ovn openshift/oc#2157
updates RHCOS 10.1 still not showing up, maybe this command will do something unique versus normal testing and we can at least see that a new namespace triggers a fresh CI stream?

Member Author

sdodson commented Dec 4, 2025

/close

openshift-ci bot closed this

Contributor

openshift-ci bot commented Dec 4, 2025

@sdodson: Closed this PR.

In response to this:

/close

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.

Member Author

sdodson commented Dec 4, 2025

/reopen

openshift-ci bot reopened this

Contributor

openshift-ci bot commented Dec 4, 2025

@sdodson: Reopened this PR.

In response to this:

/reopen

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.

Member Author

sdodson commented Dec 4, 2025

/test images

1 similar comment

Member Author

sdodson commented Dec 4, 2025

/test images

Member Author

sdodson commented Dec 4, 2025

/retest-required

pablintino reviewed

View reviewed changes

Contributor

pablintino left a comment

I've spotted some differences between files. I suggest you to ditch Dockerfile.rhel7 entirely and just call make Dockerfile.rhel7 to generate the file again.

Dockerfile.rhel7 Outdated

    
                  # comment out non-base/extensions image-references entirely for fcos

                  sed -i '/- name: rhel-coreos-/,+3 s/^/#/' /manifests/image-references && \

                  # comment out rhel10 entirely for fcos

                  sed -i '/- name: rhel-10-coreos/,+3 s/^/#/' /manifests/image-references && \

Contributor

pablintino Dec 4, 2025

This line is different compared to https://github.com/openshift/machine-config-operator/pull/5448/files#diff-dd2c0eb6ea5cfc6c4bd4eac30934e2d5746747af48fef6da689e85b752f39557R29

Member Author

sdodson Dec 5, 2025

Ack, I ran make Dockerfile.rhel7 to bring them into sync, should be good now.

Dockerfile.rhel7 Outdated Show resolved Hide resolved

sdodson force-pushed the main branch from ea6f65f to e8682f5 Compare

December 5, 2025 03:35


          Add rhel-10-coreos{,-extensions} to image-references

0e931a6

Handle FCOS and SCOS where those aren't relevant by commenting them out.

sdodson force-pushed the main branch from e8682f5 to 0e931a6 Compare

December 5, 2025 03:59

Member Author

sdodson commented Dec 5, 2025

/test unit

Contributor

openshift-ci bot commented Dec 5, 2025

@sdodson: 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/prow/bootstrap-unit	`0e931a6`	link	false	`/test bootstrap-unit`

Full PR test history. Your PR dashboard.

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.

Contributor

pablintino commented Dec 5, 2025

/lgtm
/label acknowledge-critical-fixes-only

openshift-ci bot added the acknowledge-critical-fixes-only label

openshift-ci bot assigned pablintino

openshift-ci bot added the lgtm label

Contributor

openshift-ci bot commented Dec 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino, sdodson

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [pablintino]

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

openshift-ci bot added the approved label

Contributor

pablintino commented Dec 5, 2025

/retitle "NO-ISSUE: Add rhel-10-coreos{,-extensions} to image-references"
/verified by @pablintino

openshift-ci bot changed the title ~~Add rhel-10-coreos{,-extensions} to image-references~~ "NO-ISSUE: Add rhel-10-coreos{,-extensions} to image-references"

openshift-ci-robot added the jira/valid-reference label

Contributor

openshift-ci-robot commented Dec 5, 2025

@sdodson: This pull request explicitly references no jira issue.

In response to this:

Handle FCOS and SCOS where those aren't relevant by commenting them out.

- What I did
Added rhel-10-coreos and rhel-10-coreos-extensions making sure that they're commented out for fcos and scos tags

- How to verify it
Build the images, the images should show up in the release payload

- Description for the changelog
Add rhel-10-coreos and rhel-10-coreos-extensions to the MCO image-references on OCP.

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-robot added the verified label

Contributor

openshift-ci-robot commented Dec 5, 2025

@pablintino: This PR has been marked as verified by @pablintino.

In response to this:

/retitle "NO-ISSUE: Add rhel-10-coreos{,-extensions} to image-references"
/verified by @pablintino

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-merge-bot bot merged commit a90949c into openshift:main

13 of 14 checks passed

sdodson changed the title ~~"NO-ISSUE: Add rhel-10-coreos{,-extensions} to image-references"~~ NO-ISSUE: Add rhel-10-coreos{,-extensions} to image-references

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

Labels

acknowledge-critical-fixes-only approved jira/valid-reference lgtm verified