Merge pull request #1501 from travier/c9s-fixes

NO-JIRA: c9s: Small fixes

c9s.repo

@@ -1,18 +1,14 @@
 [baseos]
 name=CentOS Stream 9 - BaseOS
-baseurl=http://mirror.stream.centos.org/9-stream/BaseOS/$basearch/os
-# Revert back to this once rhel-9.4 has been weaned off c9s
-#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os
+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]
 name=CentOS Stream 9 - AppStream
-baseurl=http://mirror.stream.centos.org/9-stream/AppStream/$basearch/os
-# Revert back to this once rhel-9.4 has been weaned off c9s
-#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/os
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
@@ -28,19 +24,15 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Ext
 
 [nfv]
 name=CentOS Stream 9 - NFV
-baseurl=http://mirror.stream.centos.org/9-stream/NFV/$basearch/os
-# Revert back to this once rhel-9.4 has been weaned off c9s
-#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/NFV/$basearch/os
+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]
 name=CentOS Stream 9 - RT
-baseurl=http://mirror.stream.centos.org/9-stream/RT/$basearch/os
-# Revert back to this once rhel-9.4 has been weaned off c9s
-#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/RT/$basearch/os
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/RT/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1

ci/prow-entrypoint.sh

@@ -89,9 +89,9 @@ prepare_repos() {
         *)
             # Assume C9S/SCOS if the version does not match known values for RHEL
             # Temporary workaround until we have all packages for SCOS
-            curl --fail -L "http://base-${ocpver_mut}-rhel92.ocp.svc.cluster.local" -o "src/config/tmp.repo"
-            awk '/rhel-9.2-server-ose-4.16/,/^$/' "src/config/tmp.repo" > "src/config/ocp90.repo"
-            cat src/config/ocp90.repo
+            curl --fail -L "http://base-${ocpver_mut}-rhel94.ocp.svc.cluster.local" -o "src/config/tmp.repo"
+            awk '/rhel-9.4-server-ose-4.16/,/^$/' "src/config/tmp.repo" > "src/config/ocp.repo"
+            cat src/config/ocp.repo
             rm "src/config/tmp.repo"
             ;;
     esac

image-c9s.yaml

@@ -0,0 +1 @@
+image-rhel-9.4.yaml

manifest-c9s.yaml

@@ -27,7 +27,7 @@ repos:
   # CentOS Cloud SIG repo for cri-o, cri-tools and conmon-rs
   - sig-cloud-okd
   # Include RHCOS 9 repo for oc, hyperkube
-  - rhel-9.2-server-ose-4.16
+  - rhel-9.4-server-ose-4.16
 
 # We include hours/minutes to avoid version number reuse
 automatic-version-prefix: "416.9.<date:%Y%m%d%H%M>"