Skip to content

COS-3946: Backport rhel-10.2 support to release-4.21 branch #1898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prestist wants to merge 5 commits into
base: release-4.21
Choose a base branch
from
+17 −21
Open

COS-3946: Backport rhel-10.2 support to release-4.21 branch #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4ac625
Start using rhel-10.2
ravanelli Jan 27, 2026
a229d48
ci: Start using rhel-10.2 for CI as well
ravanelli Feb 4, 2026
69250c6
packages-openshift: Fix repo versions
ravanelli Feb 12, 2026
d3ba336
extensions/rhel-10.2.yaml: Use rhel-10.2-server-ose-4.22 repo
prestist Feb 18, 2026
b5cc62d
ci/get-ocp-repo.sh: Allow individual repo URLs to fail
prestist Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci/get-ocp-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ 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

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
Copy link
Contributor

@marmijo marmijo Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned this change might obscure infra issues with RHEL 9.6 repos. We'd want the script to fail fast if those repos are unavailable for any reason.

Are we also hitting this issue on the master branch and does this need to be changed there too?

done
2 changes: 1 addition & 1 deletion docs/faq.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
12 changes: 5 additions & 7 deletions extensions/rhel-10.1.yaml → extensions/rhel-10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,16 @@
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
- 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.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
Expand Down Expand Up @@ -66,7 +64,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
Expand Down
21 changes: 9 additions & 12 deletions packages-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -20,17 +20,14 @@ 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
# XXX Not built for rhel 10 yet
#- rhel-10.1-fast-datapath
#- rhel-10.1-server-ose-4.21
- rhel-9.6-fast-datapath
- rhel-9.6-server-ose-4.21
- rhel-10.2-baseos
- rhel-10.2-appstream
- rhel-10.2-early-kernel
- rhel-10.2-fast-datapath
- rhel-10.2-server-ose-4.21
- if: osversion == "centos-9"
include:
repos:
Expand All @@ -48,8 +45,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:
Expand Down