From 23cca9e2dbf516afa6ff7b4dbc818df19506e683 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 14 May 2026 11:22:11 -0400 Subject: [PATCH 1/3] Make build-args files use 5.0 version This didn't get updated in [1], but [2], which created these files, was also in flight at the same time. [1] https://github.com/openshift/os/pull/1930 [2] https://github.com/openshift/os/pull/1919 --- ...args-10.2-4.22.conf => build-args-10.2-5.0.conf | 2 +- ...d-args-9.8-4.22.conf => build-args-9.8-5.0.conf | 2 +- ...args-c10s-4.22.conf => build-args-c10s-5.0.conf | 0 docs/building.md | 14 +++++++------- 4 files changed, 9 insertions(+), 9 deletions(-) rename build-args-10.2-4.22.conf => build-args-10.2-5.0.conf (70%) rename build-args-9.8-4.22.conf => build-args-9.8-5.0.conf (70%) rename build-args-c10s-4.22.conf => build-args-c10s-5.0.conf (100%) diff --git a/build-args-10.2-4.22.conf b/build-args-10.2-5.0.conf similarity index 70% rename from build-args-10.2-4.22.conf rename to build-args-10.2-5.0.conf index 33e50960..a7fa9856 100644 --- a/build-args-10.2-4.22.conf +++ b/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 diff --git a/build-args-9.8-4.22.conf b/build-args-9.8-5.0.conf similarity index 70% rename from build-args-9.8-4.22.conf rename to build-args-9.8-5.0.conf index 879f9682..5ba98ffd 100644 --- a/build-args-9.8-4.22.conf +++ b/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 diff --git a/build-args-c10s-4.22.conf b/build-args-c10s-5.0.conf similarity index 100% rename from build-args-c10s-4.22.conf rename to build-args-c10s-5.0.conf diff --git a/docs/building.md b/docs/building.md index 1508a336..fd76c80d 100644 --- a/docs/building.md +++ b/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 ``` From 8c406fb6ee1ba321c9eb8232b2475152ef9a07b4 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 14 May 2026 11:26:29 -0400 Subject: [PATCH 2/3] move the OKD SIG repo to 5.0 The repo exists now. --- c10s.repo | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/c10s.repo b/c10s.repo index a4bdb870..6129742e 100644 --- a/c10s.repo +++ b/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 From b39cb0c46327e212bdb9dcdc086e9aceffeeb0c8 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 14 May 2026 16:18:56 -0400 Subject: [PATCH 3/3] switch back to Major.Minor repo names This is largely a revert of d0be268. Changing the repo names doesn't work for us because our coreos/redhat-coreos internal repo with all the repos for various versions of things name them with the version in the repo name. i.e. rhel-9.8-appstream If this is still a problem where CI has out of date content in the rhel98 repo we should work with ART to get it updated. --- build-node-image.sh | 4 ++-- ci/get-ocp-repo.sh | 2 +- extensions/build.sh | 8 -------- extensions/rhel-10.2.yaml | 2 +- extensions/rhel-9.8.yaml | 10 +++++----- packages-openshift.yaml | 8 ++++---- 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/build-node-image.sh b/build-node-image.sh index c0d1fddf..d732e7ec 100755 --- a/build-node-image.sh +++ b/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 diff --git a/ci/get-ocp-repo.sh b/ci/get-ocp-repo.sh index 85a04a26..0dc53db8 100755 --- a/ci/get-ocp-repo.sh +++ b/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" ) diff --git a/extensions/build.sh b/extensions/build.sh index b3ad82d9..a57ae74d 100755 --- a/extensions/build.sh +++ b/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" \ diff --git a/extensions/rhel-10.2.yaml b/extensions/rhel-10.2.yaml index 81fb9b0f..18fed003 100644 --- a/extensions/rhel-10.2.yaml +++ b/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. diff --git a/extensions/rhel-9.8.yaml b/extensions/rhel-9.8.yaml index 255a0087..25fb804d 100644 --- a/extensions/rhel-9.8.yaml +++ b/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 diff --git a/packages-openshift.yaml b/packages-openshift.yaml index 1a1d9ae7..8b86b5e6 100644 --- a/packages-openshift.yaml +++ b/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: