From 2c836492bfb1f9ba491ccfe82b3cc74d4be3841c Mon Sep 17 00:00:00 2001 From: Ashwin Das Date: Mon, 18 May 2026 10:44:47 -0400 Subject: [PATCH] ART: ocp-5.0-rhel98.repo: point rhel-9.8 repos to rhel-9 mirror2 paths Aligns with ocp-build-data#10654 which made rhel9 and rhel98 syncs point to the same locations. Switches codeready-builder from CDN EUS to mirror2 basic auth. Co-Authored-By: Claude Sonnet 4.6 --- .../_repos/ocp-5.0-rhel98.repo | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 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 2f60111ff5f25..fb44998192ad7 100644 --- a/core-services/release-controller/_repos/ocp-5.0-rhel98.repo +++ b/core-services/release-controller/_repos/ocp-5.0-rhel98.repo @@ -1,6 +1,6 @@ [rhel-9.8-baseos] name = rhel-9.8-baseos -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-baseos +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-baseos-rpms/ 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 @@ -12,7 +12,7 @@ skip_if_unavailable = true [rhel-9.8-appstream] name = rhel-9.8-appstream -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-appstream +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-appstream-rpms/ 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 @@ -25,7 +25,7 @@ excludepkgs = toolbox* [rhel-9.8-nfv] name = rhel-9.8-nfv -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-nfv +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-nfv/ 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 @@ -37,7 +37,7 @@ skip_if_unavailable = true [rhel-9.8-highavailability] name = rhel-9.8-highavailability -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-highavailability +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-highavailability/ 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 @@ -61,19 +61,19 @@ failovermethod = priority [rhel-98-codeready-builder-rpms] name = rhel-98-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/codeready-builder/os/ +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-codeready-builder-rpms/ 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 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem +username_file = /tmp/mirror-enterprise-basic-auth/username +password_file = /tmp/mirror-enterprise-basic-auth/password failovermethod = priority +skip_if_unavailable = true [rhel-9.8-server-ose-5.0] name = rhel-9.8-server-ose-5.0 -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-server-ose-rpms +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-server-ose-rpms/ 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 @@ -92,7 +92,7 @@ skip_if_unavailable = true # interested in. [rhel-9.8-early-kernel] name = rhel-9.8-early-kernel -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-server-ose-rpms +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-server-ose-rpms/ 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 @@ -109,7 +109,7 @@ includepkgs = kernel,kernel-*,toolbox*, [rhel-9.8-baseos-ppc64le] name = rhel-9.8-baseos-ppc64le -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-baseos-ppc64le +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-baseos-rpms/ 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 @@ -121,7 +121,7 @@ skip_if_unavailable = true [rhel-9.8-appstream-ppc64le] name = rhel-9.8-appstream-ppc64le -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-appstream-ppc64le +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-appstream-rpms/ 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 @@ -145,7 +145,7 @@ failovermethod = priority [rhel-9.8-server-ose-5.0-ppc64le] name = rhel-9.8-server-ose-5.0-ppc64le -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-server-ose-rpms +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-server-ose-rpms/ 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 @@ -157,19 +157,19 @@ skip_if_unavailable = true [rhel-98-codeready-builder-rpms-ppc64le] name = rhel-98-codeready-builder-rpms-ppc64le -baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/codeready-builder/os/ +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-codeready-builder-rpms/ 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 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem +username_file = /tmp/mirror-enterprise-basic-auth/username +password_file = /tmp/mirror-enterprise-basic-auth/password 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/rhel-98-baseos-s390x +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-baseos-rpms/ 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 @@ -181,7 +181,7 @@ skip_if_unavailable = true [rhel-9.8-appstream-s390x] name = rhel-9.8-appstream-s390x -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-appstream-s390x +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-appstream-rpms/ 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 @@ -205,7 +205,7 @@ failovermethod = priority [rhel-9.8-server-ose-5.0-s390x] name = rhel-9.8-server-ose-5.0-s390x -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-server-ose-rpms +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-server-ose-rpms/ 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 @@ -217,19 +217,19 @@ skip_if_unavailable = true [rhel-98-codeready-builder-rpms-s390x] name = rhel-98-codeready-builder-rpms-s390x -baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/codeready-builder/os/ +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-codeready-builder-rpms/ 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 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem +username_file = /tmp/mirror-enterprise-basic-auth/username +password_file = /tmp/mirror-enterprise-basic-auth/password 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/rhel-98-baseos-aarch64 +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-baseos-rpms/ 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 @@ -241,7 +241,7 @@ skip_if_unavailable = true [rhel-9.8-appstream-aarch64] name = rhel-9.8-appstream-aarch64 -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-98-appstream-aarch64 +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-appstream-rpms/ 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 @@ -265,7 +265,7 @@ failovermethod = priority [rhel-9.8-server-ose-5.0-aarch64] name = rhel-9.8-server-ose-5.0-aarch64 -baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-server-ose-rpms +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-server-ose-rpms/ 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 @@ -277,12 +277,12 @@ skip_if_unavailable = true [rhel-98-codeready-builder-rpms-aarch64] name = rhel-98-codeready-builder-rpms-aarch64 -baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/codeready-builder/os/ +baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-codeready-builder-rpms/ 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 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem +username_file = /tmp/mirror-enterprise-basic-auth/username +password_file = /tmp/mirror-enterprise-basic-auth/password failovermethod = priority +skip_if_unavailable = true