From c4ac625f5aced2c9b51d1a614addf845b39810d3 Mon Sep 17 00:00:00 2001 From: Renata Ravanelli Date: Tue, 27 Jan 2026 17:05:57 -0300 Subject: [PATCH 1/5] Start using rhel-10.2 Signed-off-by: Renata Ravanelli --- docs/faq.md | 2 +- extensions/{rhel-10.1.yaml => rhel-10.2.yaml} | 11 +++++------ packages-openshift.yaml | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) rename extensions/{rhel-10.1.yaml => rhel-10.2.yaml} (94%) diff --git a/docs/faq.md b/docs/faq.md index 6f93b4a9..42bfb3f7 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -140,7 +140,7 @@ RHCOS/OCP version | RHEL version 4.18 | 9.4 EUS 4.19 | 9.6 EUS 4.20 | 9.6 EUS -4.21 | 9.6 EUS +4.21 | 9.6 EUS and 10.2 EUS ## Q: How do I determine what version of an RPM is included in an RHCOS release? diff --git a/extensions/rhel-10.1.yaml b/extensions/rhel-10.2.yaml similarity index 94% rename from extensions/rhel-10.1.yaml rename to extensions/rhel-10.2.yaml index f47cdf27..489e4bde 100644 --- a/extensions/rhel-10.1.yaml +++ b/extensions/rhel-10.2.yaml @@ -9,18 +9,17 @@ repos: # Generically used for various extensions. # Repo placed here to respect the rule above. - - rhel-10.1-appstream + - rhel-10.2-appstream # For kata-containers (sandboxed-containers). # Repo placed here to respect the rule above. - # XXX Move to 10.1 plashets when available + # XXX Move to 10.2 plashets when available - rhel-9.6-server-ose-4.21 # For two-node-ha extension. # Repo placed here to respect the rule above. - - rhel-10.1-highavailability + - rhel-10.2-highavailability # For ipsec extension include the fast-datapath repo. # Repo placed here to respect the rule above. - # XXX uncomment when this repo exists for RHEL10 - # - rhel-10.1-fast-datapath + - rhel-10.2-fast-datapath extensions: # Uncomment once fast-datapath repo exists for RHEL 10 @@ -66,7 +65,7 @@ extensions: - x86_64 repos: # this is not available on all arches, so keep here and not in the global repo list - - rhel-10.1-nfv + - rhel-10.2-nfv packages: - kernel-rt-core - kernel-rt-modules diff --git a/packages-openshift.yaml b/packages-openshift.yaml index ac3ae9b3..bc273a31 100644 --- a/packages-openshift.yaml +++ b/packages-openshift.yaml @@ -7,7 +7,7 @@ metadata: conditional-include: - if: - osversion != "rhel-9.6" - - osversion != "rhel-10.1" + - osversion != "rhel-10.2" - osversion != "centos-9" - osversion != "centos-10" include: @@ -20,15 +20,16 @@ conditional-include: - rhel-9.6-early-kernel - rhel-9.6-fast-datapath - rhel-9.6-server-ose-4.21 - - if: osversion == "rhel-10.1" + - if: osversion == "rhel-10.2" include: repos: - - rhel-10.1-baseos - - rhel-10.1-appstream - #- rhel-10.1-early-kernel + - rhel-10.2-baseos + - rhel-10.2-appstream + #- rhel-10.2-early-kernel + - rhel-10.2-fast-datapath # XXX Not built for rhel 10 yet - #- rhel-10.1-fast-datapath - #- rhel-10.1-server-ose-4.21 + #- rhel-10.2-fast-datapath + #- rhel-10.2-server-ose-4.21 - rhel-9.6-fast-datapath - rhel-9.6-server-ose-4.21 - if: osversion == "centos-9" @@ -48,8 +49,8 @@ conditional-include: - c10s-sig-nfv - c10s-sig-cloud-okd # XXX: this shouldn't be here; see related XXX in build-node-image.sh - # XXX: using 9.6 repo for now until 10.1 plashets exist - # - rhel-10.1-server-ose-4.21-okd + # XXX: using 9.6 repo for now until 10.2 plashets exist + # - rhel-10.2-server-ose-4.21-okd - rhel-9.6-server-ose-4.21-okd packages: From a229d485dfb0be56a1989ffdda604c5dae0421e6 Mon Sep 17 00:00:00 2001 From: Renata Ravanelli Date: Wed, 4 Feb 2026 11:26:52 -0300 Subject: [PATCH 2/5] ci: Start using rhel-10.2 for CI as well - Let's sync the CI with what we have also in rhel-coreos-config, doing it for both RHEL 9/10 Signed-off-by: Renata Ravanelli --- ci/get-ocp-repo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/get-ocp-repo.sh b/ci/get-ocp-repo.sh index d5a932d7..64cf3f8e 100755 --- a/ci/get-ocp-repo.sh +++ b/ci/get-ocp-repo.sh @@ -8,6 +8,7 @@ set -euo pipefail urls=( # theoretically that's the only one we need "http://base-4-21-rhel96.ocp.svc.cluster.local" + "http://base-4-21-rhel102.ocp.svc.cluster.local" ) dest=$1; shift From 69250c68382ca70a94800b27a7cb3ac9f3f9fb0f Mon Sep 17 00:00:00 2001 From: Renata Ravanelli Date: Thu, 12 Feb 2026 12:37:12 -0300 Subject: [PATCH 3/5] packages-openshift: Fix repo versions - Fix wrong versions of repos under rhel-10.2 Signed-off-by: Renata Ravanelli --- packages-openshift.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages-openshift.yaml b/packages-openshift.yaml index bc273a31..015a464b 100644 --- a/packages-openshift.yaml +++ b/packages-openshift.yaml @@ -25,13 +25,9 @@ conditional-include: repos: - rhel-10.2-baseos - rhel-10.2-appstream - #- rhel-10.2-early-kernel + - rhel-10.2-early-kernel - rhel-10.2-fast-datapath - # XXX Not built for rhel 10 yet - #- rhel-10.2-fast-datapath - #- rhel-10.2-server-ose-4.21 - - rhel-9.6-fast-datapath - - rhel-9.6-server-ose-4.21 + - rhel-10.2-server-ose-4.21 - if: osversion == "centos-9" include: repos: From d3ba33689c2bb5727cb6e46217eac2533cf13c96 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 18 Feb 2026 16:17:36 -0500 Subject: [PATCH 4/5] extensions/rhel-10.2.yaml: Use rhel-10.2-server-ose-4.22 repo --- extensions/rhel-10.2.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/rhel-10.2.yaml b/extensions/rhel-10.2.yaml index 489e4bde..4782f44f 100644 --- a/extensions/rhel-10.2.yaml +++ b/extensions/rhel-10.2.yaml @@ -12,8 +12,7 @@ repos: - rhel-10.2-appstream # For kata-containers (sandboxed-containers). # Repo placed here to respect the rule above. - # XXX Move to 10.2 plashets when available - - rhel-9.6-server-ose-4.21 + - rhel-10.2-server-ose-4.22 # For two-node-ha extension. # Repo placed here to respect the rule above. - rhel-10.2-highavailability From b5cc62d0f0e12d2c0b525712e13d934d686435a4 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Tue, 24 Feb 2026 10:26:59 -0500 Subject: [PATCH 5/5] ci/get-ocp-repo.sh: Allow individual repo URLs to fail Make curl failures non-fatal so builds can continue with whatever repos are available. This allows the script to work now with just rhel96 repos while automatically working when the rhel102 service gets provisioned. --- ci/get-ocp-repo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/get-ocp-repo.sh b/ci/get-ocp-repo.sh index 64cf3f8e..e8b52b32 100755 --- a/ci/get-ocp-repo.sh +++ b/ci/get-ocp-repo.sh @@ -15,5 +15,5 @@ dest=$1; shift rm -f "$dest" for url in "${urls[@]}"; do - curl --fail -L "$url" >> "$dest" + curl --fail -L "$url" >> "$dest" || echo "Warning: Failed to fetch $url" >&2 done