manifests: change osversion to be $ID-$VERSION

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

Author: jbtrystram

build-node-image.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-set -euo pipefail
+set -euxo pipefail
 
-# This script builds the OpenShift node image. It's called from `Containerfile`.    set -xeuo pipefail
+# This script builds the OpenShift node image. It's called from `Containerfile`.
 
 # Avoid shipping modified .pyc files. Due to
 # https://github.com/ostreedev/ostree/issues/1469, any Python apps that
@@ -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

kola-denylist.yaml

@@ -6,20 +6,20 @@
 - pattern: basic.uefi-secure
   tracker: https://github.com/openshift/os/issues/1237
   osversion:
-    - c9s
-    - c10s
+    - centos-9
+    - centos-10
 
 - pattern: iso-live-login.uefi-secure
   tracker: https://github.com/openshift/os/issues/1237
   osversion:
-    - c9s
-    - c10s
+    - centos-9
+    - centos-10
 
 - pattern: iso-as-disk.uefi-secure
   tracker: https://github.com/openshift/os/issues/1237
   osversion:
-    - c9s
-    - c10s
+    - centos-9
+    - centos-10
 
 # The 4.17 and 4.18 build of Ignition encounters a FIPS panic so
 # we are using the 4.16 build for now while that is under investigation.
@@ -44,54 +44,54 @@
 - pattern: ostree.sync
   tracker: https://github.com/openshift/os/issues/1751
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1
 
 # Will fail until we have proper RHEL 10 builds of OCP packages
 - pattern: ext.config.version.rhel-major-version
   tracker: TODO
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1
 
 - pattern: multipath.day1
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1894
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1
 
 - pattern: multipath.day2
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1894
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1
 
 - pattern: ext.config.shared.root-reprovision.luks.multipath
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1894
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1
 
 # To be removed once 3433 merged and contained in next fedora-coreos-config
 # submodule bump
 - pattern: fips.enable
   tracker: https://github.com/coreos/fedora-coreos-config/pull/3433
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1
 
 # 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
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1
 #
 # To be removed once 3434 merged and contained in next fedora-coreos-config
 # submodule bump
 - pattern: ext.config.shared.networking.nm-ifcfg-rh-plugin
   tracker: TODO
   osversion:
-    - c10s
+    - centos-10
     - rhel-10.1

manifest-c10s.yaml

@@ -7,7 +7,7 @@ metadata:
 
 variables:
   id: "centos"
-  osversion: "c10s"
+  osversion: "centos-10"
   inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions

manifest-c9s.yaml

@@ -7,7 +7,7 @@ metadata:
 
 variables:
   id: "centos"
-  osversion: "c9s"
+  osversion: "centos-9"
   inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions

manifest-rhel-10.1.yaml

@@ -6,6 +6,7 @@ metadata:
   summary: RHEL CoreOS 10.1
 
 variables:
+  id: rhel
   osversion: "rhel-10.1"
   inherit_tier_x: true
 

packages-openshift.yaml

@@ -5,15 +5,27 @@ metadata:
   ocp_version: "4.19"
 
 conditional-include:
-  - if: id == "rhel"
+  - if: osversion == "rhel-9.6"
     include:
       repos:
         - rhel-9.6-baseos
         - rhel-9.6-appstream
         - 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
+        # XXX Not built for rhel 10 yet
+        #- rhel-10.1-fast-datapath
+        #- rhel-10.1-server-ose-4.19
+        - rhel-9.6-fast-datapath
+        - rhel-9.6-server-ose-4.19
+        - rhel-9.6-appstream-containernetworking
+  - if: osversion == "centos-9"
     include:
       repos:
         - c9s-baseos
@@ -22,6 +34,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 == "centos-10"
+    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