Skip to content

MCO-1977: Move RHEL9 and RHEL10 custom OS images to MCO repo #71396

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
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MCO-1977: Move RHEL9 and RHEL10 custom OS images to MCO repo #71396

wants to merge 1 commit into from
+59 −266

Conversation

@cheesesashimi
Copy link
Member

@cheesesashimi cheesesashimi commented Nov 14, 2025 •
edited
Loading

This moves the custom-os-image definitions to the MCO repo and adds a RHEL10 that can be used as well. This also injects the RHEL10 variant into all of the tests that use the current custom-os-image.

I also took the opportunity to remove the old OCL jobs that have since been replaced with step-registry steps.

This PR must not be merged until openshift/machine-config-operator#5416 is merged otherwise the image build steps will fail.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 14, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 14, 2025 •
edited by openshift-ci bot
Loading

@cheesesashimi: This pull request references MCO-1977 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.21.0" version, but no target version was set.

In response to this:

This moves the custom-os-image definitions to the MCO repo and adds a RHEL10 that can be used as well. This also injects the RHEL10 variant into all of the tests that use the current custom-os-image.

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 added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 14, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 14, 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2025
@cheesesashimi cheesesashimi mentioned this pull request Nov 14, 2025
Open
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 14, 2025 •
edited by openshift-ci bot
Loading

@cheesesashimi: This pull request references MCO-1977 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.21.0" version, but no target version was set.

In response to this:

This moves the custom-os-image definitions to the MCO repo and adds a RHEL10 that can be used as well. This also injects the RHEL10 variant into all of the tests that use the current custom-os-image.

I also took the opportunity to remove the old OCL jobs that have since been replaced with step-registry steps.

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
Copy link
Contributor

openshift-ci-robot commented Nov 14, 2025 •
edited by openshift-ci bot
Loading

@cheesesashimi: This pull request references MCO-1977 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.21.0" version, but no target version was set.

In response to this:

This moves the custom-os-image definitions to the MCO repo and adds a RHEL10 that can be used as well. This also injects the RHEL10 variant into all of the tests that use the current custom-os-image.

I also took the opportunity to remove the old OCL jobs that have since been replaced with step-registry steps.

This PR must not be merged until openshift/machine-config-operator#5416 is merged otherwise the image build steps will fail.

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.

@cheesesashimi cheesesashimi marked this pull request as ready for review November 14, 2025 18:14
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 14, 2025
@cheesesashimi cheesesashimi changed the title MCO-1977: move rhel9 and rhel10 custom os images to MCO repo MCO-1977: Move RHEL9 and RHEL10 custom OS images to MCO repo Nov 14, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 14, 2025
@cheesesashimi cheesesashimi force-pushed the zzlotnik/dual-stream-image-mode-custom-os-image branch from 0e90ac9 to 995236c Compare November 17, 2025 17:31
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 17, 2025
@cheesesashimi cheesesashimi force-pushed the zzlotnik/dual-stream-image-mode-custom-os-image branch from 5e998dc to b304977 Compare November 17, 2025 18:30
@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 17, 2025
@cheesesashimi cheesesashimi force-pushed the zzlotnik/dual-stream-image-mode-custom-os-image branch from b304977 to 99c26d0 Compare November 17, 2025 18:41
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheesesashimi

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:

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 Nov 17, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 17, 2025
@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Nov 18, 2025
@cheesesashimi
This moves the custom-os-image definitions to the MCO repo and adds a…
d424620 
… RHEL10 that can be used as well. This also injects the RHEL10 variant into all of the tests that use the current custom-os-image.

I also took the opportunity to remove the old OCL jobs that have since been replaced with step-registry steps.
@cheesesashimi cheesesashimi force-pushed the zzlotnik/dual-stream-image-mode-custom-os-image branch from 428fb7b to d424620 Compare November 25, 2025 19:43
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2025
@openshift-ci-robot openshift-ci-robot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Nov 25, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 25, 2025

[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-machine-config-operator-main-bootstrap-unit openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-agent-compact-ipv4 openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-disruptive openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-mco-disruptive openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-fips openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-fips-op openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-upgrade openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-upgrade-ipsec openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-upgrade-out-of-change openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-windows openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-workers-rhel8 openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-proxy openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-serial openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-single-node openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-upgrade-single-node openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-workers-rhel8 openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-azure openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-azure-ovn-multidisk-techpreview openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-azure-ovn-upgrade openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-azure-ovn-upgrade-out-of-change openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-azure-upgrade openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-gcp-mco-disruptive openshift/machine-config-operator presubmit Ci-operator config changed
pull-ci-openshift-machine-config-operator-main-e2e-gcp-op openshift/machine-config-operator presubmit Ci-operator config changed

A total of 64 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

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
Copy link
Contributor

openshift-ci bot commented Nov 25, 2025

@cheesesashimi: all tests passed!

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.

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

Reviewers

@isabella-janssen isabella-janssen Awaiting requested review from isabella-janssen

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

No one assigned

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cheesesashimi @openshift-ci-robot @openshift-merge-robot