COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants #1629

jbtrystram · 2024-10-02T16:20:13Z

Right now these are pure centOS Stream 9 builds with a spoofed os-release file.

For the ocp variant, pull the packages from the 9.4-4.18 repos.

https://issues.redhat.com/browse/COS-2959

ci/prow-entrypoint.sh

manifest-rhel-9.6.yaml

jlebon · 2024-10-03T13:56:18Z

manifest-rhel-9.6.yaml

+     cat > /usr/lib/os-release <<EOF
+     NAME="Red Hat Enterprise Linux"
+     VERSION="9.6 (Plow)"
+     ID="rhel"
+     ID_LIKE="fedora"
+     VERSION="${OSTREE_VERSION}"
+     VARIANT="CoreOS"
+     VARIANT_ID=coreos
+     VERSION_ID="9.6"
+     PLATFORM_ID="platform:el9"
+     PRETTY_NAME="${NAME} CoreOS ${OSTREE_VERSION}"
+     ANSI_COLOR="0;31"
+     LOGO="fedora-logo-icon"
+     CPE_NAME="cpe:/o:redhat:enterprise_linux:9::coreos"
+     HOME_URL="https://www.redhat.com/"
+     DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9"
+     BUG_REPORT_URL="https://issues.redhat.com/"
+
+     REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9"
+     REDHAT_BUGZILLA_PRODUCT_VERSION=9.6
+     REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
+     REDHAT_SUPPORT_PRODUCT_VERSION="9.6"
+     EOF


Can you show the resulting /etc/os-release file in the built container image/VM? Compare to https://gist.github.com/jlebon/908e45c42ce9e365fb83d7470cbbb40c for how it currently looks for rhel-9.4.

I just updated to have something that matches :

NAME="Red Hat Enterprise Linux CoreOS" VERSION="9.6.202410031540-0 (Plow)" ID="rhel" ID_LIKE="fedora" VERSION="9.6.202410031540-0" VARIANT="CoreOS" VARIANT_ID=coreos VERSION_ID="9.6" PLATFORM_ID="platform:el9" PRETTY_NAME="Red Hat Enterprise Linux CoreOS 9.6.202410031540-0 (Plow)" ANSI_COLOR="0;31" LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:redhat:enterprise_linux:9::baseos" HOME_URL="https://www.redhat.com/" DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9" BUG_REPORT_URL="https://issues.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9" REDHAT_BUGZILLA_PRODUCT_VERSION=9.6 REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux" REDHAT_SUPPORT_PRODUCT_VERSION="9.6" OSTREE_VERSION="9.6.202410031540-0"

jbtrystram · 2024-10-03T16:00:19Z

/retest

jbtrystram · 2024-10-04T08:55:48Z

/hold

openshift-ci-robot · 2024-10-14T17:46:06Z

@jbtrystram: This pull request references COS-2959 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.18.0" version, but no target version was set.

In response to this:

Right now these are pure centOS Stream 9 builds with a spoofed os-release file.

For the ocp variant, pull the packages from the 9.4-4.18 repos.

https://issues.redhat.com/browse/COS-2959

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.

jbtrystram · 2024-10-17T12:56:18Z

/unhold

Preparation work to update openshift/release jobs to build rhel 9.6 and c10s. Needs to be merged before openshift#1629 and openshift#1498

dustymabe · 2024-10-17T15:51:45Z

is the intention to squash these commits when ready to merge?

kola-denylist.yaml

dustymabe · 2024-10-17T18:32:23Z

extensions-ocp-rhel-9.6.yaml

@@ -0,0 +1 @@
+extensions-ocp-rhel-9.4.yaml


if this is going to be a symlink to extensions-ocp-rhel-9.4.yaml (which is itself a symlink to extensions-rhel-9.4.yaml) then why create extensions-rhel-9.6.yaml at all?

That's a mistake, it should link to extensions-rhel-9.6.yaml

extensions-rhel-9.6.yaml

dustymabe · 2024-10-17T18:35:55Z

extensions-rhel-9.6.yaml

+  # https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md
+  # GRPA-3123
+  # - kata-containers
+  # s390x builds not available in c9s


# s390x builds not available in c9s

but what change did you make because of that fact? the following section matches exactly extensions-rhel-9.4.yaml

Because s390x builds are not available in c9s we have to pull from rhel 9.4, so yeah, it's identical to the 9.4 file

dustymabe · 2024-10-17T18:36:35Z

extensions-rhel-9.6.yaml

+      - aarch64
+    repos:
+      - rhel-9.4-server-ose-4.18
+      - rhel-9.4-appstream


Why did we add rhel-9.4-appstream here when compared to the same section in extensions-rhel-9.4.yaml ?

manifest-rhel-9.6.yaml

dustymabe · 2024-10-17T18:57:58Z

manifest-rhel-9.6.yaml

+ # info in a post-process script
+     - centos-stream-release
+
+# Fake out RHEL version in the os-release while waiting for RHEL-9.6 release.


should we just be find/replace 9.4 with 9.6 in the os-release here? i.e. in manifest-rhel-9.4.yaml there is no postprocess of os-release that is done now (since 4e09d27) so we shouldn't need to replace the whole thing?

should we just be find/replace 9.4 with 9.6 in the os-release here?

Doing that would require installing redhat-release from the rhel 9.4 repos. That release file comes from centos-strea-release. I tried to do that, as that would make things simpler here but then conflicts with centos-stream-release which is required to get the RPM repository files and GPG keys and causes issues when trying to build the extensions container (which needs to downloads RPMs)

jbtrystram · 2024-10-18T16:00:53Z

is the intention to squash these commits when ready to merge?

I was thinking of making several commits so the denylists changes would be easier to revert but since i'll have to do changes in the manifest anyway i'll do it in one go I suppose

dustymabe

/lgtm

travier

One nit and one fix needed

ci/prow-entrypoint.sh

travier · 2024-10-21T09:21:58Z

manifest-ocp-rhel-9.6.yaml

@@ -0,0 +1,111 @@
+# Manifest for OCP node based on RHEL 9.4


Suggested change

# Manifest for OCP node based on RHEL 9.4

# Manifest for OCP node based on RHEL 9.6

Right now these are pure centOS Stream 9 builds with a spoofed `os-release` file. For the ocp variant, pull the packages from the 9.4-4.18 repos. https://issues.redhat.com/browse/COS-2959 [rhel-9.6] denylist expected failing testsas it's a fake rhel-9.6 This 9.6 rhel version is faked from centOS stream 9 so those tests are expected to fail. See openshift#1635 denylist: exclude secureboot tests for rhel 9.6 secureboot does not work on c9s for now, so as this rhel 9.6 is just c9s, it won't either. denylist those tests until beta. This is the same as openshift@c95eedc

travier · 2024-10-21T09:43:27Z

/lgtm

openshift-ci · 2024-10-21T09:43:51Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustymabe, jbtrystram, travier

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~~ [dustymabe,jbtrystram,travier]

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

openshift-ci · 2024-10-21T11:45:48Z

@jbtrystram: 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-ci bot requested review from madhu-pillai and yasminvalim October 2, 2024 16:20

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2024

jbtrystram force-pushed the add-rhel-9.6-variant branch 2 times, most recently from 0e00216 to 70ea386 Compare October 2, 2024 16:55

jlebon reviewed Oct 3, 2024

View reviewed changes

jbtrystram force-pushed the add-rhel-9.6-variant branch from 70ea386 to 4707c1a Compare October 3, 2024 14:39

jbtrystram force-pushed the add-rhel-9.6-variant branch from 4707c1a to 1176c70 Compare October 3, 2024 16:06

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 4, 2024

jbtrystram force-pushed the add-rhel-9.6-variant branch 3 times, most recently from 50c78e2 to 96503ef Compare October 11, 2024 14:41

jbtrystram mentioned this pull request Oct 12, 2024

Failing tests on "fake" rhel 9.6 #1635

Open

jbtrystram force-pushed the add-rhel-9.6-variant branch 3 times, most recently from ca926b1 to 810c9af Compare October 14, 2024 13:36

mike-nguyen changed the title ~~[COS-2959] Add rhel-9.6 and ocp-rhel-9.6 variants~~ COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants Oct 14, 2024

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

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 17, 2024

jbtrystram added a commit to jbtrystram/openshift-os that referenced this pull request Oct 17, 2024

ci/prow: add stubs for rhel 9.6 and c10s

158901d

Preparation work to update openshift/release jobs to build rhel 9.6 and c10s. Needs to be merged before openshift#1629 and openshift#1498

jbtrystram mentioned this pull request Oct 17, 2024

NO-JIRA: ci/prow: add stubs for rhel 9.6 and c10s #1639

Merged

dustymabe reviewed Oct 17, 2024

View reviewed changes

kola-denylist.yaml Outdated Show resolved Hide resolved

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 17, 2024

dustymabe reviewed Oct 17, 2024

View reviewed changes

jbtrystram force-pushed the add-rhel-9.6-variant branch from 07df0b6 to 052da93 Compare October 18, 2024 15:59

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 18, 2024

dustymabe approved these changes Oct 19, 2024

View reviewed changes

openshift-ci bot assigned dustymabe Oct 19, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2024

jbtrystram force-pushed the add-rhel-9.6-variant branch from 052da93 to 84771a2 Compare October 21, 2024 09:09

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2024

travier requested changes Oct 21, 2024

View reviewed changes

jbtrystram force-pushed the add-rhel-9.6-variant branch from 84771a2 to c14de7e Compare October 21, 2024 09:30

openshift-ci bot assigned travier Oct 21, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2024

openshift-merge-bot bot merged commit ee4df9d into openshift:master Oct 21, 2024
11 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants #1629

COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants #1629

jbtrystram commented Oct 2, 2024

jlebon Oct 3, 2024

jbtrystram Oct 3, 2024 •

edited

Loading

jbtrystram commented Oct 3, 2024

jbtrystram commented Oct 4, 2024

openshift-ci-robot commented Oct 14, 2024 •

edited by openshift-ci bot

Loading

jbtrystram commented Oct 17, 2024

dustymabe commented Oct 17, 2024

dustymabe Oct 17, 2024

jbtrystram Oct 18, 2024

dustymabe Oct 17, 2024

jbtrystram Oct 18, 2024

dustymabe Oct 17, 2024

dustymabe Oct 17, 2024

jbtrystram Oct 18, 2024

jbtrystram commented Oct 18, 2024

dustymabe left a comment

travier left a comment

travier Oct 21, 2024

travier commented Oct 21, 2024

openshift-ci bot commented Oct 21, 2024

openshift-ci bot commented Oct 21, 2024

	# Manifest for OCP node based on RHEL 9.4
	# Manifest for OCP node based on RHEL 9.6

		@@ -0,0 +1 @@
		extensions-ocp-rhel-9.4.yaml

COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants #1629

COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants #1629

Conversation

jbtrystram commented Oct 2, 2024

Choose a reason for hiding this comment

jbtrystram Oct 3, 2024 • edited Loading

Choose a reason for hiding this comment

jbtrystram commented Oct 3, 2024

jbtrystram commented Oct 4, 2024

openshift-ci-robot commented Oct 14, 2024 • edited by openshift-ci bot Loading

jbtrystram commented Oct 17, 2024

dustymabe commented Oct 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jbtrystram commented Oct 18, 2024

dustymabe left a comment

Choose a reason for hiding this comment

travier left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

travier commented Oct 21, 2024

openshift-ci bot commented Oct 21, 2024

openshift-ci bot commented Oct 21, 2024

jbtrystram Oct 3, 2024 •

edited

Loading

openshift-ci-robot commented Oct 14, 2024 •

edited by openshift-ci bot

Loading