Skip to content

Conversation

@kasturinarra
Copy link
Contributor

@kasturinarra kasturinarra commented Nov 4, 2025

Which issue(s) this PR addresses: Add RHEL 10.0 support to bootc containerfiles, image blueprints, and repo config

  • Add 7 bootc containerfiles for RHEL 10.0 (brew, brew-ec, brew-rc, brew-zstream, crel variants)
  • Only includes current version (4.21) support, no Y-1/Y-2 support as RHEL 10 is new

Closes #

@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 4, 2025
@openshift-ci openshift-ci bot requested review from ggiguash and jerpeter1 November 4, 2025 09:55
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 4, 2025
@kasturinarra
Copy link
Contributor Author

/retest

@kasturinarra
Copy link
Contributor Author

/test verify

@kasturinarra kasturinarra changed the title [WIP] [USHIFT-6106] - Add RHEL 10.0 support to bootc containerfiles, image blueprints, and repo config [USHIFT-6106] - Add RHEL 10.0 support to bootc containerfiles, image blueprints, and repo config Nov 5, 2025
@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 5, 2025
@kasturinarra
Copy link
Contributor Author

@agullon could you please help review ? thanks !!

Copy link
Contributor

Choose a reason for hiding this comment

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

We are installing RHEL 9 RPMs. As such, we need to have only RHEL 9 fast-datapath repo.

Copy link
Contributor Author

@kasturinarra kasturinarra Nov 5, 2025

Choose a reason for hiding this comment

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

@ggiguash when you say we are installing RHEL 9 RPMs you mean the microshift rpms are based on RHEL9 ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, ART do not intend to build RHEL 10 RPMs until we switch to RHEL 10 only.

COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH

# Copy repository configuration
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel10.repo ./bootc-images/microshift-rhocp-y.repo \
Copy link
Contributor

Choose a reason for hiding this comment

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

We are installing RHEL 9 RPMs. As such, we need to have only RHEL 9 fast-datapath repo.
See the existing test/image-blueprints-bootc/layer2-presubmit/group1/rhel100-bootc-source.containerfile

Copy link
Contributor

Choose a reason for hiding this comment

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

We do not support ostree builds on RHEL 10.
This file should be deleted

Copy link
Contributor

Choose a reason for hiding this comment

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

We do not support ostree builds on RHEL 10.
This file should be deleted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, i noted this information somewhere but i could not find it.. so added it.. Will remove it.

Copy link
Contributor Author

@kasturinarra kasturinarra Nov 5, 2025

Choose a reason for hiding this comment

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

Any specific reason we do not want to do this ? I remember you talked about this in the microshift engineering meeting but cannot recall.

Copy link
Contributor

Choose a reason for hiding this comment

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

ostree-composer still exists on RHEL 10, but it can only generate images of up-to-9-version of RHEL.
We're already testing RHEL 9 images.

@kasturinarra kasturinarra force-pushed the USHIFT-6106-containerfiles branch 2 times, most recently from 6d355d6 to 8f8a36e Compare November 5, 2025 10:03
@kasturinarra
Copy link
Contributor Author

/test images

@kasturinarra kasturinarra force-pushed the USHIFT-6106-containerfiles branch from 8f8a36e to 9c12e15 Compare November 5, 2025 11:12
…repo config

- Add 7 bootc containerfiles for RHEL 10.0 (brew, brew-ec, brew-rc, brew-zstream, crel variants)
- Only includes current version (4.21) support, no Y-1/Y-2 support as RHEL 10 is new
- Comment out serialsim build code for now
@kasturinarra kasturinarra force-pushed the USHIFT-6106-containerfiles branch from 9c12e15 to acbb4cb Compare November 5, 2025 11:14
@kasturinarra
Copy link
Contributor Author

/test test-unit

@kasturinarra
Copy link
Contributor Author

@ggiguash @agullon all tests passed, could you please help take a look.

COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH

# Copy repository configuration
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y.repo \
Copy link
Contributor

Choose a reason for hiding this comment

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

should we update this microshift-fast-datapath-rhel9.repo to rhel10 or it does not exist yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It does exist, intially that is what i have created but here is the recommendation from giga, so changed it back to rhel9.repo #5689 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, we should make a note to ourselves to not forge this in the future

Comment on lines +51 to +52
#COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh
#RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

why these 2 lines are commented? should they be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@agullon i see building serialsim is failing on RHEL10, so commented it out. More info in the thread here: https://redhat-internal.slack.com/archives/C03CJTNLKAT/p1762336549365219?thread_ts=1762329457.739089&cid=C03CJTNLKAT

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, we should make a note to ourselves to not forge this in the future

@agullon
Copy link
Contributor

agullon commented Nov 5, 2025

@kasturinarra why you only added them for bootc and not rpm-ostree?

@kasturinarra
Copy link
Contributor Author

@kasturinarra why you only added them for bootc and not rpm-ostree?

#5689 (comment)

@agullon
Copy link
Contributor

agullon commented Nov 10, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, kasturinarra

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 [agullon,kasturinarra]

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

@kasturinarra
Copy link
Contributor Author

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 10, 2025
@openshift-ci-robot
Copy link

@kasturinarra: This PR has been marked as verified by ci.

In response to this:

/verified by ci

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

openshift-ci bot commented Nov 10, 2025

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

@openshift-merge-bot openshift-merge-bot bot merged commit 4358bae into openshift:main Nov 10, 2025
9 checks passed
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. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants