Merge pull request #1502 from jlebon/pr/c9s-cleanups

NO-JIRA: variants: simplify

README.md

@@ -7,6 +7,19 @@ There was a previous git repository inside the Red Hat firewall that was never
 published. The history of that repository is entangled with various private
 things and is omitted. This repository is now canonical.
 
+## Variants
+
+To support building both a RHEL-based and a CentOS Stream-based CoreOS, the
+coreos-assembler concept of [variants] is used. The following variants are
+supported:
+
+- `rhel-9.4`: RHEL 9.4-based CoreOS; including OpenShift components.
+- `c9s`: CentOS Stream-based CoreOS, including OpenShift components. This
+  currently includes some packages from RHEL because not all packages required
+  by OpenShift are provided in CentOS Stream.
+
+The default variant is `rhel-9.4`.
+
 ## Reporting issues
 
 The issue tracker for this repository is only used to track the development
@@ -34,3 +47,4 @@ See [OpenShift CI notes](docs/openshift-ci-notes.md) for more information.
 
 [coreos-assembler]: https://github.com/coreos/coreos-assembler/
 [OKD issue tracker]: https://github.com/openshift/okd/issues
+[variants]: https://github.com/coreos/coreos-assembler/blob/065cd2d20e379642cc3a69e498d20708e2243b21/src/cmd-init#L45-L48

c9s.repo

@@ -1,60 +1,60 @@
-[baseos]
+[c9s-baseos]
 name=CentOS Stream 9 - BaseOS
 baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
-[appstream]
+[c9s-appstream]
 name=CentOS Stream 9 - AppStream
 baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
-[extras-common]
+[c9s-extras-common]
 name=CentOS Stream 9 - Extras packages
 baseurl=https://mirror.stream.centos.org/SIGs/9-stream/extras/$basearch/extras-common
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512
 
-[nfv]
+[c9s-nfv]
 name=CentOS Stream 9 - NFV
 baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/NFV/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
-[rt]
+[c9s-rt]
 name=CentOS Stream 9 - RT
 baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/RT/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
-[sig-nfv]
+[c9s-sig-nfv]
 name=CentOS Stream 9 - SIG NFV
 baseurl=https://mirror.stream.centos.org/SIGs/9-stream/nfv/$basearch/openvswitch-2/
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-NFV
 
-[sig-virtualization]
+[c9s-sig-virtualization]
 name=CentOS Stream 9 - SIG Virtualization
 baseurl=https://mirror.stream.centos.org/SIGs/9-stream/virt/$basearch/kata-containers/
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization
 
-[sig-cloud-okd]
+[c9s-sig-cloud-okd]
 name=CentOS Stream 9 - SIG Cloud OKD 4.15
 baseurl=https://mirror.stream.centos.org/SIGs/9-stream/cloud/$basearch/okd-4.15/
 gpgcheck=1

ci/prow-entrypoint.sh

@@ -300,36 +300,36 @@ main() {
             prepare_repos
             ;;
         "build" | "init-and-build-default")  # TODO: change prow job to use init-and-build-default
-            cosa_init "rhel-coreos-9"
+            cosa_init "rhel-9.4"
             cosa_build
             ;;
         "rhcos-cosa-prow-pr-ci")
             setup_user
-            cosa_init "rhel-coreos-9"
+            cosa_init "rhel-9.4"
             cosa_build
             kola_test_qemu
             ;;
         "rhcos-9-build-test-qemu")
             setup_user
-            cosa_init "rhel-coreos-9"
+            cosa_init "rhel-9.4"
             cosa_build
             kola_test_qemu
             ;;
         "rhcos-9-build-test-metal")
             setup_user
-            cosa_init "rhel-coreos-9"
+            cosa_init "rhel-9.4"
             cosa_build
             kola_test_metal
             ;;
         "scos-9-build-test-qemu")
             setup_user
-            cosa_init "scos"
+            cosa_init "c9s"
             cosa_build
             kola_test_qemu
             ;;
         "scos-9-build-test-metal")
             setup_user
-            cosa_init "scos"
+            cosa_init "c9s"
             cosa_build
             kola_test_metal
             ;;

extensions-c9s.yaml

@@ -3,7 +3,7 @@
 # and https://github.com/coreos/fedora-coreos-tracker/issues/401
 
 repos:
-  - sig-virtualization
+  - c9s-sig-virtualization
 
 extensions:
   # https://issues.redhat.com/browse/RFE-4177
@@ -55,7 +55,7 @@ extensions:
     architectures:
       - x86_64
     repos:
-      - nfv
+      - c9s-nfv
     packages:
       - kernel-rt-core
       - kernel-rt-kvm
@@ -71,7 +71,7 @@ extensions:
     architectures:
       - x86_64
     repos:
-      - sig-virtualization
+      - c9s-sig-virtualization
     packages:
       - kata-containers
   # https://issues.redhat.com/browse/COS-2402

extensions.yaml

@@ -1 +1 @@
-extensions-rhel-coreos-9.yaml
+extensions-rhel-9.4.yaml

image.yaml

@@ -1 +1 @@
-image-rhel-coreos-9.yaml
+image-rhel-9.4.yaml

manifest-c9s.yaml

@@ -18,14 +18,14 @@ include:
 
 # CentOS Stream 9 repos + internal repos for now
 repos:
-  - baseos
-  - appstream
+  - c9s-baseos
+  - c9s-appstream
   # CentOS Extras Common repo for SIG RPM GPG keys
-  - extras-common
+  - c9s-extras-common
   # CentOS NFV SIG repo for openvswitch
-  - sig-nfv
+  - c9s-sig-nfv
   # CentOS Cloud SIG repo for cri-o, cri-tools and conmon-rs
-  - sig-cloud-okd
+  - c9s-sig-cloud-okd
   # Include RHCOS 9 repo for oc, hyperkube
   - rhel-9.4-server-ose-4.16
 
@@ -108,12 +108,15 @@ packages:
 # Packages pinned to specific repos in SCOS 9
 repo-packages:
   # We always want the kernel from BaseOS
-  - repo: baseos
+  - repo: c9s-baseos
     packages:
       - kernel
-  - repo: appstream
+  - repo: c9s-appstream
     packages:
       # We want the one shipping in C9S, not the equivalently versioned one in RHAOS
       - nss-altfiles
       # Use the new containers/toolbox
       - toolbox
+      # The one shipping in C9S is temporarily lower versioned, so be explicit
+      # https://github.com/openshift/os/issues/1505
+      - containers-common