Skip to content

Conversation

@cheesesashimi
Copy link
Member

@cheesesashimi cheesesashimi commented Nov 13, 2025

- What I did

The intention behind these images is to replace the inline Containerfile with both a RHEL9 and RHEL10 variant so that MCO e2e tests can use these images.

This PR does not touch any of the MCO codebase except for the TestOSImageURLOverride E2E test and the Makefile. Once this PR is merged, the TestOSImageURLOverride test will be skipped until openshift/release#71396 is merged. However, the openshift/release PR must be merged this PR is merged.

- How to verify it

  1. Run the make custom-os-images Makefile target. Two images will be produced with the names localhost/custom-os-image-rhel9:latest and localhost/custom-os-image-rhel10:latest.
  2. Tag and push the resulting RHEL9 image to a container registry of your choice. For the sake of this example, I'll use registry.hostname.com/custom-os-image-rhel9:latest.
  3. Change to the e2e test directory: cd test/e2e-2of2
  4. Run TestOSImageURLOverride: MCO_OS_IMAGE_URL_RHEL_9="registry.hostname.com/custom-os-image-rhel9:latest" go test -tags='containers_image_openpgp' -count=1 -timeout=45m -v -run=TestOSImageURLOverride .

- Description for the changelog
Introduce RHEL9 and RHEL10 custom OS images for OSImageURL test

@cheesesashimi
Copy link
Member Author

/test verify

@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 13, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 13, 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 13, 2025
@cheesesashimi cheesesashimi force-pushed the zzlotnik/add-custom-os-containerfiles branch 2 times, most recently from a517425 to 91cbdea Compare November 14, 2025 16:18
@cheesesashimi cheesesashimi changed the title zzlotnik/add custom os containerfiles MCO-1977: introduce rhel9 and rhel10 custom OS images Nov 14, 2025
@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

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

- What I did

The intention behind these images is to replace the inline Containerfile with both a RHEL9 and RHEL10 variant so that MCO e2e tests can use these images.

It is worth noting that aside from the new Makefile target, this does not (yet) touch any of the MCO codebase. Another

- How to verify it

Run the make custom-os-images Makefile target.

- Description for the changelog

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

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

- What I did

The intention behind these images is to replace the inline Containerfile with both a RHEL9 and RHEL10 variant so that MCO e2e tests can use these images.

It is worth noting that aside from the new Makefile target, this does not (yet) touch any of the MCO codebase. This PR needs to be landed before openshift/release#71396 can be landed.

- How to verify it

Run the make custom-os-images Makefile target.

- Description for the changelog

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

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

- What I did

The intention behind these images is to replace the inline Containerfile with both a RHEL9 and RHEL10 variant so that MCO e2e tests can use these images.

It is worth noting that aside from the new Makefile target, this does not (yet) touch any of the MCO codebase. This PR needs to merge before openshift/release#71396 can be merged.

- How to verify it

Run the make custom-os-images Makefile target.

- Description for the changelog

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

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

- What I did

The intention behind these images is to replace the inline Containerfile with both a RHEL9 and RHEL10 variant so that MCO e2e tests can use these images.

This PR does not touch any of the MCO codebase except for the TestOSImageURLOverride E2E test and the Makefile. Once this PR is merged, the TestOSImageURLOverride test will be skipped until openshift/release#71396 is merged. However, the openshift/release PR must be merged this PR is merged.

- How to verify it

  1. Run the make custom-os-images Makefile target. Two images will be produced with the names localhost/custom-os-image-rhel9:latest and localhost/custom-os-image-rhel10:latest.
  2. Tag and push the resulting RHEL9 image to a container registry of your choice. For the sake of this example, I'll use registry.hostname.com/custom-os-image-rhel9:latest.
  3. Change to the e2e test directory: cd test/e2e-2of2
  4. Run TestOSImageURLOverride: MCO_OS_IMAGE_URL_RHEL_9="registry.hostname.com/custom-os-image-rhel9:latest" go test -tags='containers_image_openpgp' -count=1 -timeout=45m -v -run=TestOSImageURLOverride .

- Description for the changelog
Introduce RHEL9 and RHEL10 custom OS images for OSImageURL test

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 changed the title MCO-1977: introduce rhel9 and rhel10 custom OS images MCO-1977: introduce RHEL9 and RHEL10 custom OS images Nov 14, 2025
@cheesesashimi cheesesashimi changed the title MCO-1977: introduce RHEL9 and RHEL10 custom OS images MCO-1977: Introduce RHEL9 and RHEL10 custom OS images Nov 14, 2025
@cheesesashimi
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 17, 2025

@cheesesashimi: This pull request references MCO-1977 which is a valid jira issue.

In response to this:

/jira refresh

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 force-pushed the zzlotnik/add-custom-os-containerfiles branch 2 times, most recently from 0d7cf17 to 7a5ec3b Compare November 17, 2025 18:26
@cheesesashimi cheesesashimi marked this pull request as ready for review November 17, 2025 18:31
@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 17, 2025
FROM quay.io/centos/centos:stream10 AS epel
WORKDIR /etc/yum.repos.d
RUN dnf install -y --setopt=keepcache=True epel-release && \
curl -LO https://pkgs.tailscale.com/stable/rhel/10/tailscale.repo && \
Copy link
Contributor

Choose a reason for hiding this comment

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

Question: I'm maybe missing something, but, why do we need a tailscale repo?

Copy link
Member Author

@cheesesashimi cheesesashimi Nov 18, 2025

Choose a reason for hiding this comment

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

This was an early proof-of-concept for installing non-standard software. It's not strictly needed and we could probably get away with just using yq and ripgrep instead.

EDIT: I'll remove Tailscale for now.

These images will be built by the CI system and injected into the e2e
tests so that we can test image-mode on dual-stream.
@cheesesashimi cheesesashimi force-pushed the zzlotnik/add-custom-os-containerfiles branch from 7a5ec3b to d4a5db5 Compare November 18, 2025 15:33
@pablintino
Copy link
Contributor

/lgtm
/hold
The change looks good and reasonable to me, but I'd like have a bit more stable CI to be sure it doesn't have hidden gems.

@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 Nov 18, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 18, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 [cheesesashimi,pablintino]

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

@cheesesashimi
Copy link
Member Author

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 19, 2025

@cheesesashimi: 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/e2e-hypershift d4a5db5 link true /test e2e-hypershift

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

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

3 participants