[NO-JIRA]: Update to track 5.1

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

@@ -1,4 +1,4 @@
-OPENSHIFT_VERSION=5.0
+OPENSHIFT_VERSION=5.1
 IMAGE_FROM=registry.ci.openshift.org/coreos/rhel-coreos-base:10.2
 
 # The streamclass is based on the rhel/centos major version. The
@@ -8,10 +8,10 @@ STREAM_CLASS=rhel-10
 
 # Used by the generate-labels script
 IMAGE_NAME=openshift/ose-rhel-coreos-10
-IMAGE_CPE=cpe:/a:redhat:openshift:5.0::el10
+IMAGE_CPE=cpe:/a:redhat:openshift:5.1::el10
 
 # The names of the yum repos to use for the node image build.
-YUM_REPO_NAMES=rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.0
+YUM_REPO_NAMES=rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.1
 
 # The extra yum repos (on top of the YUM_REPO_NAMES above) to use for
 # the extensions image build.

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

@@ -1,4 +1,4 @@
-OPENSHIFT_VERSION=5.0
+OPENSHIFT_VERSION=5.1
 IMAGE_FROM=registry.ci.openshift.org/coreos/rhel-coreos-base:9.8
 
 # The streamclass is based on the rhel/centos major version. The
@@ -8,10 +8,10 @@ STREAM_CLASS=rhel-9
 
 # Used by the generate-labels script
 IMAGE_NAME=openshift/ose-rhel-coreos-9
-IMAGE_CPE=cpe:/a:redhat:openshift:5.0::el9
+IMAGE_CPE=cpe:/a:redhat:openshift:5.1::el9
 
 # The names of the yum repos to use for the node image build.
-YUM_REPO_NAMES=rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.0
+YUM_REPO_NAMES=rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.1
 
 # The extra yum repos (on top of the YUM_REPO_NAMES above) to use for
 # the extensions image build.

build-args-5.0-c10s.conf → build-args-5.1-c10s.conf

@@ -1,4 +1,4 @@
-OPENSHIFT_VERSION=5.0
+OPENSHIFT_VERSION=5.1
 IMAGE_FROM=registry.ci.openshift.org/coreos/stream-coreos-base:10
 
 # The streamclass is based on the rhel/centos major version. The
@@ -17,7 +17,7 @@ STREAM_CLASS=centos-10
 # XXX: use of the rhel-*server-ose-* ART repo shouldn't happen for OKD; see related XXX
 #      in build-node-image.sh. Also we must put the ART repo last for the modification
 #      in the script to work.
-YUM_REPO_NAMES=c10s-baseos,c10s-appstream,c10s-sig-nfv,c10s-sig-cloud-okd,rhel-10.2-server-ose-5.0
+YUM_REPO_NAMES=c10s-baseos,c10s-appstream,c10s-sig-nfv,c10s-sig-cloud-okd,rhel-10.2-server-ose-5.1
 
 # The extra yum repos (on top of the YUM_REPO_NAMES above) to use for
 # the extensions image build.

c10s.repo

@@ -55,8 +55,8 @@ enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization
 
 [c10s-sig-cloud-okd]
-name=CentOS Stream 10 - SIG Cloud OKD 5.0
-baseurl=https://mirror.stream.centos.org/SIGs/10-stream/cloud/$basearch/okd-5.0/
+name=CentOS Stream 10 - SIG Cloud OKD 5.1
+baseurl=https://mirror.stream.centos.org/SIGs/10-stream/cloud/$basearch/okd-5.1/
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1

ci/get-ocp-repo.sh

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

docs/building.md

@@ -30,49 +30,49 @@ 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-5.0-9.8.conf` — RHCOS on RHEL 9.8
-- `build-args-5.0-10.2.conf` — RHCOS on RHEL 10.2
-- `build-args-5.0-c10s.conf` — SCOS on CentOS Stream 10
+- `build-args-5.1-10.2.conf` — RHCOS on RHEL 10.2
+- `build-args-5.1-9.8.conf` — RHCOS on RHEL 9.8
+- `build-args-5.1-c10s.conf` — SCOS on CentOS Stream 10
 
 To build:
 
 ```
-podman build --build-arg-file build-args-5.0-c10s.conf \
+podman build --build-arg-file build-args-5.1-c10s.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:5.0 .
+  --security-opt label=disable -t localhost/stream-coreos:5.1 .
 ```
 
 To override the base image (e.g. to use a locally built OCI archive),
 pass `--from`:
 
 ```
-podman build --build-arg-file build-args-5.0-c10s.conf \
+podman build --build-arg-file build-args-5.1-c10s.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:5.0 .
+  --security-opt label=disable -t localhost/stream-coreos:5.1 .
 ```
 
 ## Building Extensions Image
 
 Similar to the above, but use the extensions Containerfile instead:
 
 ```
-podman build --build-arg-file build-args-5.0-c10s.conf \
+podman build --build-arg-file build-args-5.1-c10s.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-extensions:5.0 \
+  --security-opt label=disable -t localhost/stream-coreos-extensions:5.1 \
   -f extensions/Containerfile .
 ```
 
 Overriding the node image as input:
 
 ```
-podman build --build-arg-file build-args-5.0-c10s.conf \
-  --from localhost/stream-coreos:5.0 \
+podman build --build-arg-file build-args-5.1-c10s.conf \
+  --from localhost/stream-coreos:5.1 \
   --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-extensions:5.0 \
+  --security-opt label=disable -t localhost/stream-coreos-extensions:5.1 \
   -f extensions/Containerfile .
 ```

docs/faq.md

@@ -142,7 +142,9 @@ RHCOS/OCP version | RHEL version
 4.20 | 9.6 EUS
 4.21 | 9.6 EUS
 4.22 | 9.8 EUS and 10.2 EUS
-5.0 | 9.8 EUS and 10.2 EUS
+4.23 | 9.8 EUS and 10.2 EUS
+5.0 | 10.2 EUS and 9.8 EUS
+5.1 | 10.2 EUS and 9.8 EUS
 
 ## Q: How do I determine what version of an RPM is included in an RHCOS release?