NO-JIRA: Initial rhel 10 variant by jbtrystram · Pull Request #1786 · openshift/os

jbtrystram · 2025-04-03T13:59:22Z

REQUIRES #1498

openshift-ci-robot · 2025-04-03T13:59:26Z

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

Details

In response to this:

REQUIRES #1498

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 · 2025-04-03T13:59:27Z

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

jbtrystram · 2025-04-03T15:13:37Z

 [rhcos] cat tmp/kola/test.tap | grep "not ok"   
not ok - fips.enable.partitions
not ok - non-exclusive-test-bucket-0
not ok - ext.config.shared.containers.quadlet
not ok - multipath.day2
not ok - fips.enable
not ok - ext.config.rpm-ostree.replace-rt-kernel
not ok - multipath.day1
not ok - ostree.sync
not ok - ext.config.shared.networking.team-dhcp-via-ignition
not ok - crio.base

jlebon

Let's add rhel-10.1 to the variants list in the README.

jlebon · 2025-04-05T12:10:40Z

We need something like

diff --git a/build-node-image.sh b/build-node-image.sh
index 658c97e..f4febf1 100755
--- a/build-node-image.sh
+++ b/build-node-image.sh
@@ -35,7 +35,7 @@ mkdir -p /var/opt
 
 # this is where all the real work happens
 rpm-ostree experimental compose treefile-apply \
-    --var id=$ID /run/src/packages-openshift.yaml
+    --var osversion=$ID-$VERSION_ID /run/src/packages-openshift.yaml
 
 # cleanup any repo files we injected
 rm -f /etc/yum.repos.d/{ocp,git,okd}.repo
diff --git a/manifest-c10s.yaml b/manifest-c10s.yaml
index fedc532..c878960 100644
--- a/manifest-c10s.yaml
+++ b/manifest-c10s.yaml
@@ -6,8 +6,7 @@ metadata:
   summary: CentOS Stream CoreOS 10
 
 variables:
-  id: "centos"
-  osversion: "c10s"
+  osversion: "centos-10"
   inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml
index 6cd434e..bb18d01 100644
--- a/manifest-c9s.yaml
+++ b/manifest-c9s.yaml
@@ -6,8 +6,7 @@ metadata:
   summary: CentOS Stream CoreOS 9
 
 variables:
-  id: "centos"
-  osversion: "c9s"
+  osversion: "centos-9"
   inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
diff --git a/manifest-rhel-9.6.yaml b/manifest-rhel-9.6.yaml
index 70189d0..d0a3c9b 100644
--- a/manifest-rhel-9.6.yaml
+++ b/manifest-rhel-9.6.yaml
@@ -6,7 +6,6 @@ metadata:
   summary: RHEL CoreOS 9.6
 
 variables:
-  id: "rhel"
   osversion: "rhel-9.6"
   inherit_tier_x: true
 
diff --git a/packages-openshift.yaml b/packages-openshift.yaml
index 3e8c956..241b63f 100644
--- a/packages-openshift.yaml
+++ b/packages-openshift.yaml
@@ -5,7 +5,7 @@ metadata:
   ocp_version: "4.19"
 
 conditional-include:
-  - if: id == "rhel"
+  - if: osversion == "rhel-9.6"
     include:
       repos:
         - rhel-9.6-baseos
@@ -13,7 +13,15 @@ conditional-include:
         - rhel-9.6-early-kernel
         - rhel-9.6-fast-datapath
         - rhel-9.6-server-ose-4.19
-  - if: id == "centos"
+  - if: osversion == "rhel-10.1"
+    include:
+      repos:
+        - rhel-10.1-baseos
+        - rhel-10.1-appstream
+        - rhel-10.1-early-kernel
+        - rhel-10.1-fast-datapath
+        - rhel-10.1-server-ose-4.19
+  - if: osversion == "c9s"
     include:
       repos:
         - c9s-baseos
@@ -22,6 +30,15 @@ conditional-include:
         - c9s-sig-cloud-okd
         # XXX: this shouldn't be here; see related XXX in Containerfile
         - rhel-9.6-server-ose-4.19-okd
+  - if: osversion == "c10s"
+    include:
+      repos:
+        - c10s-baseos
+        - c10s-appstream
+        - c10s-sig-nfv
+        - c10s-sig-cloud-okd
+        # XXX: this shouldn't be here; see related XXX in Containerfile
+        - rhel-10.1-server-ose-4.19-okd
 
 packages:
   # The packages below are required by OpenShift/OKD

And adapt the osversions in kola-denylist as well.

Also update openshift/release to also build a rhel-coreos-next image that will build FROM the RHEL 10 base image once we have that up and running.

joelcapitao

See my inline comments, otherwise LGTM

joelcapitao · 2025-04-07T12:39:46Z

+# To be removed once 3434 merged and contained in next fedora-coreos-config
+# submodule bump
+- pattern: ext.config.shared.networking.team-dhcp-via-ignition
+  tracker: https://github.com/coreos/fedora-coreos-config/pull/3434


Can we keep #1759 (comment) as tracker and remove comments l.83-84 which are outdated.
Same comment goes for ext.config.shared.networking.nm-ifcfg-rh-plugin as well.

Updated the tracker entry to the original issue and updated the comment to the f-c-c bump

dustymabe · 2025-04-08T01:05:57Z

@jbtrystram @jcapiitao I created a PR against my fork over in dustymabe#2

Some various fixups in there and also some new commits from me. Check it out and if you think things look good I can push that up here (with the fixups squashed of course). You can also comment there if you have any questions.

jbtrystram · 2025-04-08T14:32:50Z

This requires openshift/release#63561 and a similar in ocp-build-data, example : openshift-eng/ocp-build-data#6169

Since the repo has all architectures in it let's move it to the top global repos list as instructed to do so by the rule in the comment above the global repo list.

dustymabe · 2025-04-08T14:36:39Z

This should be ready for review now. CI will still fail because of a few issues, but they should be fixed without needed code changes to this PR.

This enables us to build rhel-9.6, c9s, c10s, etc... Note that we still do a container build for the non-layered 4.19-9.6 stream for now via `cosa buildextend-extensions-container`. We handle that here to by translating from the openshift version to the RHEL version.

This needs openshift#1498

We now need to support both EL9 and EL10. Using the conditionnal includes for treefiles added in [1], update `osversion` to contain the variant (centos/rhel) and the major version. This allows the layered build to source `/etc/release` and include the correct repos. Update denylist entries to matcht that. [1] openshift#1780

Update the image.yaml for c10s and rhel-10.1 to enable EROFS for the filesystem used for the Live ISO/PXE rootfs. https://issues.redhat.com/browse/COS-3121

One will be fixed with the next fedora-coreos-config submodule bump and the other needs a new package build from the maintaining team.

dustymabe · 2025-04-09T00:11:35Z

/retest ci/prow/e2e-aws

openshift-ci · 2025-04-09T00:11:38Z

@dustymabe: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test images

/test okd-scos-images

/test rhcos-9-build-test-metal

/test rhcos-9-build-test-qemu

/test rhcos-9next-build-test-metal

/test rhcos-9next-build-test-qemu

/test scos-10-build-test-metal

/test scos-10-build-test-qemu

/test scos-9-build-test-metal

/test scos-9-build-test-qemu

/test validate

The following commands are available to trigger optional jobs:

/test e2e-aws

/test okd-scos-e2e-aws-ovn

Use /test all to run all jobs.

Details

In response to this:

/retest ci/prow/e2e-aws

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.

dustymabe · 2025-04-09T02:31:11Z

/test e2e-aws

…

On Tue, Apr 8, 2025, at 21:37, openshift-ci[bot] wrote: @jbtrystram <https://github.com/jbtrystram>: 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-aws 4613b20 link <https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_os/1786/pull-ci-openshift-os-master-e2e-aws/1909738939527204864> false `/test e2e-aws` Full PR test history <https://prow.ci.openshift.org/pr-history?org=openshift&repo=os&pr=1786>. Your PR dashboard <https://prow.ci.openshift.org/pr?query=is:pr+state:open+author:jbtrystram>. Instructions for interacting with me using PR comments are available here <https://git.k8s.io/community/contributors/guide/pull-requests.md>. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow <https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:> repository. I understand the commands that are listed here <https://go.k8s.io/bot-commands>. — Reply to this email directly, view it on GitHub <#1786 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABCR63TJWTCRB6ZVAVSKL6L2YR2W3AVCNFSM6AAAAAB2MJUDEOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDOOBYGA3DCOBUGA>. You are receiving this because you were mentioned.Message ID: ***@***.***> *openshift-ci[bot]* left a comment (openshift/os#1786) <#1786 (comment)> @jbtrystram <https://github.com/jbtrystram>: 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-aws 4613b20 link <https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_os/1786/pull-ci-openshift-os-master-e2e-aws/1909738939527204864> false `/test e2e-aws` Full PR test history <https://prow.ci.openshift.org/pr-history?org=openshift&repo=os&pr=1786>. Your PR dashboard <https://prow.ci.openshift.org/pr?query=is:pr+state:open+author:jbtrystram>. Instructions for interacting with me using PR comments are available here <https://git.k8s.io/community/contributors/guide/pull-requests.md>. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow <https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:> repository. I understand the commands that are listed here <https://go.k8s.io/bot-commands>. — Reply to this email directly, view it on GitHub <#1786 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABCR63TJWTCRB6ZVAVSKL6L2YR2W3AVCNFSM6AAAAAB2MJUDEOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDOOBYGA3DCOBUGA>. You are receiving this because you were mentioned.Message ID: ***@***.***>

HuijingHei · 2025-04-09T05:36:59Z

/test e2e-aws

openshift-ci · 2025-04-09T05:47:32Z

@jbtrystram: 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-aws	`4613b20`	link	false	`/test e2e-aws`

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.

HuijingHei · 2025-04-09T05:48:42Z

From error:
error: Packages not found: kernel-devel-5.14.0-570.10.1.el9_6, kernel-headers-5.14.0-570.10.1.el9_6, kernel-rt-core-5.14.0-570.10.1.el9_6, kernel-rt-devel-5.14.0-570.10.1.el9_6, kernel-rt-kvm-5.14.0-570.10.1.el9_6, kernel-rt-modules-5.14.0-570.10.1.el9_6, kernel-rt-modules-extra-5.14.0-570.10.1.el9_6

Not sure why it still fetches kernel version 5.14.0-570.10.1.el9_6, the latest repo has 5.14.0-570.12.1.el9_6

joelcapitao · 2025-04-09T07:22:21Z

From error: error: Packages not found: kernel-devel-5.14.0-570.10.1.el9_6, kernel-headers-5.14.0-570.10.1.el9_6, kernel-rt-core-5.14.0-570.10.1.el9_6, kernel-rt-devel-5.14.0-570.10.1.el9_6, kernel-rt-kvm-5.14.0-570.10.1.el9_6, kernel-rt-modules-5.14.0-570.10.1.el9_6, kernel-rt-modules-extra-5.14.0-570.10.1.el9_6

Not sure why it still fetches kernel version 5.14.0-570.10.1.el9_6, the latest repo has 5.14.0-570.12.1.el9_6

I suspect the PROW in-cluster mirror is (or was) not synced with the latest RHEL & OCP content, but dunno whether or not there is a sync issue. Maybe a retest would work. What's the synchronization frequency BTW ?

joelcapitao · 2025-04-09T07:54:15Z

/lgtm

openshift-ci · 2025-04-09T07:54:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jbtrystram, jcapiitao

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:

~~OWNERS~~ [jbtrystram,jcapiitao]

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

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 3, 2025

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 Apr 3, 2025

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 3, 2025

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2025

jbtrystram force-pushed the rhel10 branch from 021e979 to 3023fd9 Compare April 4, 2025 17:48

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 4, 2025

jbtrystram force-pushed the rhel10 branch from 4b6e93b to c4ae7c8 Compare April 4, 2025 18:02

jbtrystram marked this pull request as ready for review April 4, 2025 18:02

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 Apr 4, 2025

openshift-ci Bot requested review from HuijingHei and yasminvalim April 4, 2025 18:02

jbtrystram force-pushed the rhel10 branch 2 times, most recently from e0528bc to d6c82f6 Compare April 5, 2025 10:07

jlebon reviewed Apr 5, 2025

View reviewed changes

Comment thread manifest-ocp-rhel-10.1.yaml Outdated

jbtrystram force-pushed the rhel10 branch 2 times, most recently from 29372b4 to 384eed2 Compare April 7, 2025 12:33

joelcapitao reviewed Apr 7, 2025

View reviewed changes

jbtrystram force-pushed the rhel10 branch 2 times, most recently from 5850066 to 4044a42 Compare April 7, 2025 14:59

jbtrystram mentioned this pull request Apr 8, 2025

Node image: need to include repos based on OS ID and VERSION_ID #1793

Closed

extensions-ocp-rhel-9.6: Move rhel-9.6-fast-datapath to top

bcde2ad

Since the repo has all architectures in it let's move it to the top global repos list as instructed to do so by the rule in the comment above the global repo list.

dustymabe force-pushed the rhel10 branch from 4044a42 to 71a3495 Compare April 8, 2025 14:35

joelcapitao mentioned this pull request Apr 8, 2025

COS-2902: Add C10s variant #1498

Merged

dustymabe mentioned this pull request Apr 8, 2025

Fixups for PR1786 dustymabe/os#2

Closed

dustymabe and others added 3 commits April 8, 2025 13:16

Add initial RHEL 10 variant

90085a5

This needs openshift#1498

denylist: add rhel10 for relevant entries

43b6744

dustymabe force-pushed the rhel10 branch from 71a3495 to 6ac4e6a Compare April 8, 2025 17:17

jbtrystram and others added 3 commits April 8, 2025 18:43

COS-3121: enable EROFS for ISO in el10

d1e0157

Update the image.yaml for c10s and rhel-10.1 to enable EROFS for the filesystem used for the Live ISO/PXE rootfs. https://issues.redhat.com/browse/COS-3121

denylist: a few more rhel 10 specific denials

4613b20

One will be fixed with the next fedora-coreos-config submodule bump and the other needs a new package build from the maintaining team.

dustymabe force-pushed the rhel10 branch from 6ac4e6a to 4613b20 Compare April 8, 2025 22:43

openshift-ci Bot assigned joelcapitao Apr 9, 2025

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 9, 2025

openshift-merge-bot Bot merged commit 0f860eb into openshift:master Apr 9, 2025
13 of 14 checks passed

Conversation

jbtrystram commented Apr 3, 2025

Uh oh!

openshift-ci-robot commented Apr 3, 2025

Uh oh!

openshift-ci Bot commented Apr 3, 2025

Uh oh!

jbtrystram commented Apr 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jlebon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jlebon commented Apr 5, 2025

Uh oh!

joelcapitao left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

joelcapitao Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

jbtrystram Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

dustymabe commented Apr 8, 2025

Uh oh!

jbtrystram commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dustymabe commented Apr 8, 2025

Uh oh!

dustymabe commented Apr 9, 2025

Uh oh!

openshift-ci Bot commented Apr 9, 2025

Uh oh!

dustymabe commented Apr 9, 2025 via email

Uh oh!

HuijingHei commented Apr 9, 2025

Uh oh!

openshift-ci Bot commented Apr 9, 2025

Uh oh!

HuijingHei commented Apr 9, 2025

Uh oh!

joelcapitao commented Apr 9, 2025

Uh oh!

joelcapitao commented Apr 9, 2025

Uh oh!

openshift-ci Bot commented Apr 9, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jbtrystram commented Apr 3, 2025 •

edited

Loading

jbtrystram commented Apr 8, 2025 •

edited

Loading