Skip to content

Commit fcbb493

Browse files
chai-bot: ocp-5.0-rhel98.repo: switch RHEL repos to CDN (9.8 GA) (#79475)
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/<arch>/<repo>/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.
1 parent a2a8a92 commit fcbb493

1 file changed

Lines changed: 43 additions & 56 deletions

File tree

core-services/release-controller/_repos/ocp-5.0-rhel98.repo

Lines changed: 43 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,47 @@
11
[rhel-9.8-baseos]
22
name = rhel-9.8-baseos
3-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-baseos-rpms/
3+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/baseos/os/
44
enabled = 1
55
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
66
sslverify = false
77
gpgcheck = 0
8-
username_file = /tmp/mirror-enterprise-basic-auth/username
9-
password_file = /tmp/mirror-enterprise-basic-auth/password
8+
sslclientkey = /tmp/key/rh-cdn.pem
9+
sslclientcert = /tmp/key/rh-cdn.pem
1010
failovermethod = priority
11-
skip_if_unavailable = true
1211

1312
[rhel-9.8-appstream]
1413
name = rhel-9.8-appstream
15-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-appstream-rpms/
14+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/appstream/os/
1615
enabled = 1
1716
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
1817
sslverify = false
1918
gpgcheck = 0
20-
username_file = /tmp/mirror-enterprise-basic-auth/username
21-
password_file = /tmp/mirror-enterprise-basic-auth/password
19+
sslclientkey = /tmp/key/rh-cdn.pem
20+
sslclientcert = /tmp/key/rh-cdn.pem
2221
failovermethod = priority
23-
skip_if_unavailable = true
2422
excludepkgs = toolbox*
2523

2624
[rhel-9.8-nfv]
2725
name = rhel-9.8-nfv
28-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-nfv/
26+
baseurl = https://cdn.redhat.com/content/e4s/rhel9/9.8/x86_64/nfv/os/
2927
enabled = 1
3028
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
3129
sslverify = false
3230
gpgcheck = 0
33-
username_file = /tmp/mirror-enterprise-basic-auth/username
34-
password_file = /tmp/mirror-enterprise-basic-auth/password
31+
sslclientkey = /tmp/key/rh-cdn.pem
32+
sslclientcert = /tmp/key/rh-cdn.pem
3533
failovermethod = priority
36-
skip_if_unavailable = true
3734

3835
[rhel-9.8-highavailability]
3936
name = rhel-9.8-highavailability
40-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-highavailability/
37+
baseurl = https://cdn.redhat.com/content/e4s/rhel9/9.8/x86_64/highavailability/os/
4138
enabled = 1
4239
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
4340
sslverify = false
4441
gpgcheck = 0
45-
username_file = /tmp/mirror-enterprise-basic-auth/username
46-
password_file = /tmp/mirror-enterprise-basic-auth/password
42+
sslclientkey = /tmp/key/rh-cdn.pem
43+
sslclientcert = /tmp/key/rh-cdn.pem
4744
failovermethod = priority
48-
skip_if_unavailable = true
4945

5046
[rhel-9.8-fast-datapath]
5147
name = rhel-9.8-fast-datapath
@@ -61,15 +57,15 @@ failovermethod = priority
6157

6258
[rhel-98-codeready-builder-rpms]
6359
name = rhel-98-codeready-builder-rpms
64-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0/rhel-9-codeready-builder-rpms/
60+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/codeready-builder/os/
6561
enabled = 1
6662
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
6763
sslverify = false
6864
gpgcheck = 0
69-
username_file = /tmp/mirror-enterprise-basic-auth/username
70-
password_file = /tmp/mirror-enterprise-basic-auth/password
65+
# https://projects.engineering.redhat.com/browse/RCM-65421
66+
sslclientkey = /tmp/key/rh-cdn.pem
67+
sslclientcert = /tmp/key/rh-cdn.pem
7168
failovermethod = priority
72-
skip_if_unavailable = true
7369

7470
[rhel-9.8-server-ose-5.0]
7571
name = rhel-9.8-server-ose-5.0
@@ -109,27 +105,25 @@ includepkgs = kernel,kernel-*,toolbox*,
109105

110106
[rhel-9.8-baseos-ppc64le]
111107
name = rhel-9.8-baseos-ppc64le
112-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-baseos-rpms/
108+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/baseos/os/
113109
enabled = 1
114110
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
115111
sslverify = false
116112
gpgcheck = 0
117-
username_file = /tmp/mirror-enterprise-basic-auth/username
118-
password_file = /tmp/mirror-enterprise-basic-auth/password
113+
sslclientkey = /tmp/key/rh-cdn.pem
114+
sslclientcert = /tmp/key/rh-cdn.pem
119115
failovermethod = priority
120-
skip_if_unavailable = true
121116

122117
[rhel-9.8-appstream-ppc64le]
123118
name = rhel-9.8-appstream-ppc64le
124-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-appstream-rpms/
119+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/appstream/os/
125120
enabled = 1
126121
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
127122
sslverify = false
128123
gpgcheck = 0
129-
username_file = /tmp/mirror-enterprise-basic-auth/username
130-
password_file = /tmp/mirror-enterprise-basic-auth/password
124+
sslclientkey = /tmp/key/rh-cdn.pem
125+
sslclientcert = /tmp/key/rh-cdn.pem
131126
failovermethod = priority
132-
skip_if_unavailable = true
133127

134128
[rhel-9.8-fast-datapath-ppc64le]
135129
name = rhel-9.8-fast-datapath-ppc64le
@@ -157,39 +151,36 @@ skip_if_unavailable = true
157151

158152
[rhel-98-codeready-builder-rpms-ppc64le]
159153
name = rhel-98-codeready-builder-rpms-ppc64le
160-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_ppc64le/rhel-9-codeready-builder-rpms/
154+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/codeready-builder/os/
161155
enabled = 1
162156
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
163157
sslverify = false
164158
gpgcheck = 0
165-
username_file = /tmp/mirror-enterprise-basic-auth/username
166-
password_file = /tmp/mirror-enterprise-basic-auth/password
159+
sslclientkey = /tmp/key/rh-cdn.pem
160+
sslclientcert = /tmp/key/rh-cdn.pem
167161
failovermethod = priority
168-
skip_if_unavailable = true
169162

170163
[rhel-9.8-baseos-s390x]
171164
name = rhel-9.8-baseos-s390x
172-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-baseos-rpms/
165+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/baseos/os/
173166
enabled = 1
174167
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
175168
sslverify = false
176169
gpgcheck = 0
177-
username_file = /tmp/mirror-enterprise-basic-auth/username
178-
password_file = /tmp/mirror-enterprise-basic-auth/password
170+
sslclientkey = /tmp/key/rh-cdn.pem
171+
sslclientcert = /tmp/key/rh-cdn.pem
179172
failovermethod = priority
180-
skip_if_unavailable = true
181173

182174
[rhel-9.8-appstream-s390x]
183175
name = rhel-9.8-appstream-s390x
184-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-appstream-rpms/
176+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/appstream/os/
185177
enabled = 1
186178
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
187179
sslverify = false
188180
gpgcheck = 0
189-
username_file = /tmp/mirror-enterprise-basic-auth/username
190-
password_file = /tmp/mirror-enterprise-basic-auth/password
181+
sslclientkey = /tmp/key/rh-cdn.pem
182+
sslclientcert = /tmp/key/rh-cdn.pem
191183
failovermethod = priority
192-
skip_if_unavailable = true
193184

194185
[rhel-9.8-fast-datapath-s390x]
195186
name = rhel-9.8-fast-datapath-s390x
@@ -217,39 +208,36 @@ skip_if_unavailable = true
217208

218209
[rhel-98-codeready-builder-rpms-s390x]
219210
name = rhel-98-codeready-builder-rpms-s390x
220-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_s390x/rhel-9-codeready-builder-rpms/
211+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/codeready-builder/os/
221212
enabled = 1
222213
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
223214
sslverify = false
224215
gpgcheck = 0
225-
username_file = /tmp/mirror-enterprise-basic-auth/username
226-
password_file = /tmp/mirror-enterprise-basic-auth/password
216+
sslclientkey = /tmp/key/rh-cdn.pem
217+
sslclientcert = /tmp/key/rh-cdn.pem
227218
failovermethod = priority
228-
skip_if_unavailable = true
229219

230220
[rhel-9.8-baseos-aarch64]
231221
name = rhel-9.8-baseos-aarch64
232-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-baseos-rpms/
222+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/baseos/os/
233223
enabled = 1
234224
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
235225
sslverify = false
236226
gpgcheck = 0
237-
username_file = /tmp/mirror-enterprise-basic-auth/username
238-
password_file = /tmp/mirror-enterprise-basic-auth/password
227+
sslclientkey = /tmp/key/rh-cdn.pem
228+
sslclientcert = /tmp/key/rh-cdn.pem
239229
failovermethod = priority
240-
skip_if_unavailable = true
241230

242231
[rhel-9.8-appstream-aarch64]
243232
name = rhel-9.8-appstream-aarch64
244-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-appstream-rpms/
233+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/appstream/os/
245234
enabled = 1
246235
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
247236
sslverify = false
248237
gpgcheck = 0
249-
username_file = /tmp/mirror-enterprise-basic-auth/username
250-
password_file = /tmp/mirror-enterprise-basic-auth/password
238+
sslclientkey = /tmp/key/rh-cdn.pem
239+
sslclientcert = /tmp/key/rh-cdn.pem
251240
failovermethod = priority
252-
skip_if_unavailable = true
253241

254242
[rhel-9.8-fast-datapath-aarch64]
255243
name = rhel-9.8-fast-datapath-aarch64
@@ -277,12 +265,11 @@ skip_if_unavailable = true
277265

278266
[rhel-98-codeready-builder-rpms-aarch64]
279267
name = rhel-98-codeready-builder-rpms-aarch64
280-
baseurl = https://mirror2.openshift.com/enterprise/reposync/5.0_aarch64/rhel-9-codeready-builder-rpms/
268+
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/codeready-builder/os/
281269
enabled = 1
282270
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
283271
sslverify = false
284272
gpgcheck = 0
285-
username_file = /tmp/mirror-enterprise-basic-auth/username
286-
password_file = /tmp/mirror-enterprise-basic-auth/password
273+
sslclientkey = /tmp/key/rh-cdn.pem
274+
sslclientcert = /tmp/key/rh-cdn.pem
287275
failovermethod = priority
288-
skip_if_unavailable = true

0 commit comments

Comments
 (0)