NO-JIRA: Make build-args files use 5.0 version and revert repo names change

build-args-10.2-4.22.conf → build-args-10.2-5.0.conf

@@ -1,3 +1,3 @@
 IMAGE_FROM=registry.ci.openshift.org/coreos/rhel-coreos-base:10.2
 IMAGE_NAME=openshift/ose-rhel-coreos-10
-IMAGE_CPE=cpe:/a:redhat:openshift:4.22::el10
+IMAGE_CPE=cpe:/a:redhat:openshift:5.0::el10

build-args-9.8-4.22.conf → build-args-9.8-5.0.conf

@@ -1,3 +1,3 @@
 IMAGE_FROM=registry.ci.openshift.org/coreos/rhel-coreos-base:9.8
 IMAGE_NAME=openshift/ose-rhel-coreos-9
-IMAGE_CPE=cpe:/a:redhat:openshift:4.22::el9
+IMAGE_CPE=cpe:/a:redhat:openshift:5.0::el9

build-node-image.sh

@@ -23,8 +23,8 @@ source /etc/os-release
 # should come from CentOS. We should eventually sever this.
 if [ $ID = centos ]; then
     # this says: "if the line starts with [.*], turn off printing. if the line starts with [our-repo], turn it on."
-    awk "/\[.*\]/{p=0} /\[rhel-10.2-server-ose\]/{p=1} p" /etc/yum.repos.d/*.repo > /etc/yum.repos.d/okd.repo.tmp
-    sed -i -e 's,\[rhel-10.2-server-ose\],\[rhel-10.2-server-ose-5.0-okd\],' /etc/yum.repos.d/okd.repo.tmp
+    awk "/\[.*\]/{p=0} /\[rhel-10.2-server-ose-5.0\]/{p=1} p" /etc/yum.repos.d/*.repo > /etc/yum.repos.d/okd.repo.tmp
+    sed -i -e 's,\[rhel-10.2-server-ose-5.0\],\[rhel-10.2-server-ose-5.0-okd\],' /etc/yum.repos.d/okd.repo.tmp
     echo 'includepkgs=openshift-*,ose-aws-ecr-*,ose-azure-acr-*,ose-gcp-gcr-*,ose-crio-* ' >> /etc/yum.repos.d/okd.repo.tmp
     mv /etc/yum.repos.d/okd.repo{.tmp,}
 fi

c10s.repo

@@ -66,10 +66,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization
 
 # Note: We can't find a composes.stream.centos.org URL for this repo
 # so we use the mirror.stream.centos.org URL here.
-# This needs to be updated to okd-5.0 once it becomes available
 [c10s-sig-cloud-okd]
-name=CentOS Stream 10 - SIG Cloud OKD 4.22
-baseurl=https://mirror.stream.centos.org/SIGs/10-stream/cloud/$basearch/okd-4.22/
+name=CentOS Stream 10 - SIG Cloud OKD 5.0
+baseurl=https://mirror.stream.centos.org/SIGs/10-stream/cloud/$basearch/okd-5.0/
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1

ci/get-ocp-repo.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 
 urls=(
     # theoretically that's the only one we need
-    "http://base-5-0-rhel9.ocp.svc.cluster.local"
+    "http://base-5-0-rhel98.ocp.svc.cluster.local"
     "http://base-5-0-rhel102.ocp.svc.cluster.local"
 )
 

docs/building.md

@@ -30,26 +30,26 @@ SCOS or RHCOS image (see building instructions in
 Each variant has a `build-args-*.conf` file that specifies the base image
 and metadata for that build. Choose the appropriate one for your target:
 
-- `build-args-9.8-4.22.conf` — RHCOS on RHEL 9.8
-- `build-args-10.2-4.22.conf` — RHCOS on RHEL 10.2
-- `build-args-c10s-4.22.conf` — SCOS on CentOS Stream 10
+- `build-args-9.8-5.0.conf` — RHCOS on RHEL 9.8
+- `build-args-10.2-5.0.conf` — RHCOS on RHEL 10.2
+- `build-args-c10s-5.0.conf` — SCOS on CentOS Stream 10
 
 To build:
 
 ```
-podman build . --build-arg-file build-args-c10s-4.22.conf \
+podman build . --build-arg-file build-args-c10s-5.0.conf \
   --secret id=yumrepos,src=/path/to/all.repo \
   -v /etc/pki/ca-trust:/etc/pki/ca-trust:ro \
-  --security-opt label=disable -t localhost/stream-coreos:4.22
+  --security-opt label=disable -t localhost/stream-coreos:5.0
 ```
 
 To override the base image (e.g. to use a locally built OCI archive),
 pass `--from`:
 
 ```
-podman build . --build-arg-file build-args-c10s-4.22.conf \
+podman build . --build-arg-file build-args-c10s-5.0.conf \
   --from oci-archive:$(ls builds/latest/x86_64/*.ociarchive) \
   --secret id=yumrepos,src=/path/to/all.repo \
   -v /etc/pki/ca-trust:/etc/pki/ca-trust:ro \
-  --security-opt label=disable -t localhost/stream-coreos:4.22
+  --security-opt label=disable -t localhost/stream-coreos:5.0
 ```

extensions/build.sh

@@ -10,14 +10,6 @@ fi
 # hack around this for now by deleting the problematic bits; we should tweak rpm-ostree instead
 jq 'del(.["check-passwd","check-groups"])' /usr/share/rpm-ostree/treefile.json > filtered.json
 
-# The base image treefile references rhel-9.8-* repo names, but we use rhel-9-*
-# repos in CI for pre-release content (see ci/get-ocp-repo.sh). Rewrite the repo
-# names to match. rhel-9.8-early-kernel is excluded because it exists under the
-# same name in both repo sets.
-jq '.repos |= map(if startswith("rhel-9.8-") and . != "rhel-9.8-early-kernel"
-                  then "rhel-9-" + ltrimstr("rhel-9.8-")
-                  else . end)' \
-    filtered.json > filtered.json.tmp && mv filtered.json{.tmp,}
 
 . /etc/os-release
 rpm-ostree compose extensions filtered.json "extensions/${ID}-${VERSION_ID}.yaml" \

extensions/rhel-10.2.yaml

@@ -14,7 +14,7 @@ repos:
   # Repo placed here to respect the rule above.
   # We do not have kata-container yet in 10.2
   # https://github.com/openshift/os/issues/1911
-  - rhel-9-server-ose
+  - rhel-9.8-server-ose-5.0
   - rhel-10.2-server-ose-5.0
   # For two-node-ha extension.
   # Repo placed here to respect the rule above.

extensions/rhel-9.8.yaml

@@ -9,16 +9,16 @@
 repos:
   # Generically used for various extensions.
   # Repo placed here to respect the rule above.
-  - rhel-9-appstream
+  - rhel-9.8-appstream
   # For kata-containers (sandboxed-containers).
   # Repo placed here to respect the rule above.
-  - rhel-9-server-ose
+  - rhel-9.8-server-ose-5.0
   # For two-node-ha extension.
   # Repo placed here to respect the rule above.
-  - rhel-9-highavailability
+  - rhel-9.8-highavailability
   # For ipsec extension include the fast-datapath repo.
   # Repo placed here to respect the rule above.
-  - rhel-9-fast-datapath
+  - rhel-9.8-fast-datapath
 
 extensions:
   # https://github.com/coreos/fedora-coreos-tracker/issues/1504
@@ -63,7 +63,7 @@ extensions:
       - x86_64
     repos:
       # this is not available on all arches, so keep here and not in the global repo list
-      - rhel-9-nfv
+      - rhel-9.8-nfv
     packages:
       - kernel-rt-core
       - kernel-rt-modules

packages-openshift.yaml

@@ -14,11 +14,11 @@ conditional-include:
   - if: osversion == "rhel-9.8"
     include:
       repos:
-        - rhel-9-baseos
-        - rhel-9-appstream
+        - rhel-9.8-baseos
+        - rhel-9.8-appstream
         - rhel-9.8-early-kernel
-        - rhel-9-fast-datapath
-        - rhel-9-server-ose
+        - rhel-9.8-fast-datapath
+        - rhel-9.8-server-ose-5.0
   - if: osversion == "rhel-10.2"
     include:
       repos: