From a7f0fa72a0cde602a39f3173477317f444e1b63e Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Tue, 19 May 2026 13:31:33 +0000 Subject: [PATCH] chai-bot: ocp-5.0-rhel98.repo: switch RHEL repos to CDN (9.8 GA) rhel-9.8 has GA'd today, so the rhel-98-* entries in this file no longer need to be sourced from mirror2.openshift.com (which has stopped being populated for 9.8). Convert the RHEL baseos/appstream/nfv/highavailability/ codeready-builder sections (plus ppc64le/s390x/aarch64 variants) to point at cdn.redhat.com/content/eus/rhel9/9.8///os/ (nfv and highavailability use e4s/) with sslclientkey/sslclientcert auth - mirroring the structure of ocp-5.0-rhel96.repo. Sections left unchanged: - rhel-9.8-server-ose-5.0 and rhel-9.8-early-kernel (point at the OCP plashet, not the RHEL repo) - rhel-9.8-fast-datapath* (already CDN) excludepkgs=toolbox* on rhel-9.8-appstream is preserved. --- .../_repos/ocp-5.0-rhel98.repo | 99 ++++++++----------- 1 file changed, 43 insertions(+), 56 deletions(-) diff --git a/core-services/release-controller/_repos/ocp-5.0-rhel98.repo b/core-services/release-controller/_repos/ocp-5.0-rhel98.repo index fb44998192ad7..98596e93f4105 100644 --- a/core-services/release-controller/_repos/ocp-5.0-rhel98.repo +++ b/core-services/release-controller/_repos/ocp-5.0-rhel98.repo @@ -1,51 +1,47 @@ [rhel-9.8-baseos] name = rhel-9.8-baseos -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-baseos-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/baseos/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-appstream] name = rhel-9.8-appstream -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-appstream-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/appstream/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true excludepkgs = toolbox* [rhel-9.8-nfv] name = rhel-9.8-nfv -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-nfv/ +baseurl = https://cdn.redhat.com/content/e4s/rhel9/9.8/x86_64/nfv/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-highavailability] name = rhel-9.8-highavailability -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-highavailability/ +baseurl = https://cdn.redhat.com/content/e4s/rhel9/9.8/x86_64/highavailability/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-fast-datapath] name = rhel-9.8-fast-datapath @@ -61,15 +57,15 @@ failovermethod = priority [rhel-98-codeready-builder-rpms] name = rhel-98-codeready-builder-rpms -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-codeready-builder-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/codeready-builder/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +# https://projects.engineering.redhat.com/browse/RCM-65421 +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-server-ose-5.0] name = rhel-9.8-server-ose-5.0 @@ -109,27 +105,25 @@ includepkgs = kernel,kernel-*,toolbox*, [rhel-9.8-baseos-ppc64le] name = rhel-9.8-baseos-ppc64le -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-baseos-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/baseos/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-appstream-ppc64le] name = rhel-9.8-appstream-ppc64le -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-appstream-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/appstream/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-fast-datapath-ppc64le] name = rhel-9.8-fast-datapath-ppc64le @@ -157,39 +151,36 @@ skip_if_unavailable = true [rhel-98-codeready-builder-rpms-ppc64le] name = rhel-98-codeready-builder-rpms-ppc64le -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-codeready-builder-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/codeready-builder/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-baseos-s390x] name = rhel-9.8-baseos-s390x -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-baseos-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/baseos/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-appstream-s390x] name = rhel-9.8-appstream-s390x -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-appstream-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/appstream/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-fast-datapath-s390x] name = rhel-9.8-fast-datapath-s390x @@ -217,39 +208,36 @@ skip_if_unavailable = true [rhel-98-codeready-builder-rpms-s390x] name = rhel-98-codeready-builder-rpms-s390x -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-codeready-builder-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/codeready-builder/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-baseos-aarch64] name = rhel-9.8-baseos-aarch64 -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-baseos-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/baseos/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-appstream-aarch64] name = rhel-9.8-appstream-aarch64 -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-appstream-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/appstream/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true [rhel-9.8-fast-datapath-aarch64] name = rhel-9.8-fast-datapath-aarch64 @@ -277,12 +265,11 @@ skip_if_unavailable = true [rhel-98-codeready-builder-rpms-aarch64] name = rhel-98-codeready-builder-rpms-aarch64 -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-codeready-builder-rpms/ +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/codeready-builder/os/ enabled = 1 gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted sslverify = false gpgcheck = 0 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password +sslclientkey = /tmp/key/rh-cdn.pem +sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -skip_if_unavailable = true