Skip to content

Commit a6f516b

Browse files
fgallottPrucek
authored andcommitted
fix rhel9 repo names for 4.22 and 5.0 (openshift#78086)
rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED
1 parent 6f670bd commit a6f516b

2 files changed

Lines changed: 88 additions & 88 deletions

File tree

core-services/release-controller/_repos/ocp-4.22-rhel9.repo

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[rhel-9.8-baseos]
2-
name = rhel-9.8-baseos
1+
[rhel-9-baseos]
2+
name = rhel-9-baseos
33
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-baseos
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
@@ -10,8 +10,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
1010
failovermethod = priority
1111
skip_if_unavailable = true
1212

13-
[rhel-9.8-appstream]
14-
name = rhel-9.8-appstream
13+
[rhel-9-appstream]
14+
name = rhel-9-appstream
1515
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-appstream
1616
enabled = 1
1717
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
@@ -23,8 +23,8 @@ failovermethod = priority
2323
skip_if_unavailable = true
2424
excludepkgs=toolbox*
2525

26-
[rhel-9.8-nfv]
27-
name = rhel-9.8-nfv
26+
[rhel-9-nfv]
27+
name = rhel-9-nfv
2828
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-nfv
2929
enabled = 1
3030
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
@@ -35,8 +35,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
3535
failovermethod = priority
3636
skip_if_unavailable = true
3737

38-
[rhel-9.8-highavailability]
39-
name = rhel-9.8-highavailability
38+
[rhel-9-highavailability]
39+
name = rhel-9-highavailability
4040
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-highavailability
4141
enabled = 1
4242
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
@@ -47,8 +47,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
4747
failovermethod = priority
4848
skip_if_unavailable = true
4949

50-
[rhel-9.8-fast-datapath]
51-
name = rhel-9.8-fast-datapath
50+
[rhel-9-fast-datapath]
51+
name = rhel-9-fast-datapath
5252
baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/fast-datapath/os/
5353
enabled = 1
5454
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
@@ -59,8 +59,8 @@ sslclientkey = /tmp/key/rh-cdn.pem
5959
sslclientcert = /tmp/key/rh-cdn.pem
6060
failovermethod = priority
6161

62-
[rhel-98-codeready-builder-rpms]
63-
name = rhel-98-codeready-builder-rpms
62+
[rhel-9-codeready-builder-rpms]
63+
name = rhel-9-codeready-builder-rpms
6464
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/x86_64/codeready-builder/os/
6565
enabled = 1
6666
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
@@ -71,8 +71,8 @@ sslclientkey = /tmp/key/rh-cdn.pem
7171
sslclientcert = /tmp/key/rh-cdn.pem
7272
failovermethod = priority
7373

74-
[rhel-9.8-server-ose-4.22]
75-
name = rhel-9.8-server-ose-4.22
74+
[rhel-9-server-ose]
75+
name = rhel-9-server-ose
7676
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-9-server-ose-rpms
7777
enabled = 1
7878
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
@@ -106,8 +106,8 @@ skip_if_unavailable = true
106106
# https://issues.redhat.com/browse/OCPBUGS-56600
107107
includepkgs=kernel,kernel-*,toolbox*,
108108

109-
[rhel-9.8-baseos-ppc64le]
110-
name = rhel-9.8-baseos-ppc64le
109+
[rhel-9-baseos-ppc64le]
110+
name = rhel-9-baseos-ppc64le
111111
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-baseos-ppc64le
112112
enabled = 1
113113
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
@@ -118,8 +118,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
118118
failovermethod = priority
119119
skip_if_unavailable = true
120120

121-
[rhel-9.8-appstream-ppc64le]
122-
name = rhel-9.8-appstream-ppc64le
121+
[rhel-9-appstream-ppc64le]
122+
name = rhel-9-appstream-ppc64le
123123
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-appstream-ppc64le
124124
enabled = 1
125125
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
@@ -130,8 +130,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
130130
failovermethod = priority
131131
skip_if_unavailable = true
132132

133-
[rhel-9.8-fast-datapath-ppc64le]
134-
name = rhel-9.8-fast-datapath-ppc64le
133+
[rhel-9-fast-datapath-ppc64le]
134+
name = rhel-9-fast-datapath-ppc64le
135135
baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/ppc64le/fast-datapath/os/
136136
enabled = 1
137137
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
@@ -142,8 +142,8 @@ sslclientkey = /tmp/key/rh-cdn.pem
142142
sslclientcert = /tmp/key/rh-cdn.pem
143143
failovermethod = priority
144144

145-
[rhel-9.8-server-ose-4.22-ppc64le]
146-
name = rhel-9.8-server-ose-4.22-ppc64le
145+
[rhel-9-server-ose-ppc64le]
146+
name = rhel-9-server-ose-ppc64le
147147
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22_ppc64le/rhel-9-server-ose-rpms
148148
enabled = 1
149149
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
@@ -154,8 +154,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
154154
failovermethod = priority
155155
skip_if_unavailable = true
156156

157-
[rhel-98-codeready-builder-rpms-ppc64le]
158-
name = rhel-98-codeready-builder-rpms-ppc64le
157+
[rhel-9-codeready-builder-rpms-ppc64le]
158+
name = rhel-9-codeready-builder-rpms-ppc64le
159159
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/ppc64le/codeready-builder/os/
160160
enabled = 1
161161
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
@@ -166,8 +166,8 @@ sslclientkey = /tmp/key/rh-cdn.pem
166166
sslclientcert = /tmp/key/rh-cdn.pem
167167
failovermethod = priority
168168

169-
[rhel-9.8-baseos-s390x]
170-
name = rhel-9.8-baseos-s390x
169+
[rhel-9-baseos-s390x]
170+
name = rhel-9-baseos-s390x
171171
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-baseos-s390x
172172
enabled = 1
173173
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
@@ -178,8 +178,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
178178
failovermethod = priority
179179
skip_if_unavailable = true
180180

181-
[rhel-9.8-appstream-s390x]
182-
name = rhel-9.8-appstream-s390x
181+
[rhel-9-appstream-s390x]
182+
name = rhel-9-appstream-s390x
183183
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-appstream-s390x
184184
enabled = 1
185185
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
@@ -190,8 +190,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
190190
failovermethod = priority
191191
skip_if_unavailable = true
192192

193-
[rhel-9.8-fast-datapath-s390x]
194-
name = rhel-9.8-fast-datapath-s390x
193+
[rhel-9-fast-datapath-s390x]
194+
name = rhel-9-fast-datapath-s390x
195195
baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/s390x/fast-datapath/os/
196196
enabled = 1
197197
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
@@ -202,8 +202,8 @@ sslclientkey = /tmp/key/rh-cdn.pem
202202
sslclientcert = /tmp/key/rh-cdn.pem
203203
failovermethod = priority
204204

205-
[rhel-9.8-server-ose-4.22-s390x]
206-
name = rhel-9.8-server-ose-4.22-s390x
205+
[rhel-9-server-ose-s390x]
206+
name = rhel-9-server-ose-s390x
207207
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22_s390x/rhel-9-server-ose-rpms
208208
enabled = 1
209209
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
@@ -214,8 +214,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
214214
failovermethod = priority
215215
skip_if_unavailable = true
216216

217-
[rhel-98-codeready-builder-rpms-s390x]
218-
name = rhel-98-codeready-builder-rpms-s390x
217+
[rhel-9-codeready-builder-rpms-s390x]
218+
name = rhel-9-codeready-builder-rpms-s390x
219219
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/s390x/codeready-builder/os/
220220
enabled = 1
221221
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
@@ -226,8 +226,8 @@ sslclientkey = /tmp/key/rh-cdn.pem
226226
sslclientcert = /tmp/key/rh-cdn.pem
227227
failovermethod = priority
228228

229-
[rhel-9.8-baseos-aarch64]
230-
name = rhel-9.8-baseos-aarch64
229+
[rhel-9-baseos-aarch64]
230+
name = rhel-9-baseos-aarch64
231231
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-baseos-aarch64
232232
enabled = 1
233233
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
@@ -238,8 +238,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
238238
failovermethod = priority
239239
skip_if_unavailable = true
240240

241-
[rhel-9.8-appstream-aarch64]
242-
name = rhel-9.8-appstream-aarch64
241+
[rhel-9-appstream-aarch64]
242+
name = rhel-9-appstream-aarch64
243243
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22/rhel-98-appstream-aarch64
244244
enabled = 1
245245
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
@@ -250,8 +250,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
250250
failovermethod = priority
251251
skip_if_unavailable = true
252252

253-
[rhel-9.8-fast-datapath-aarch64]
254-
name = rhel-9.8-fast-datapath-aarch64
253+
[rhel-9-fast-datapath-aarch64]
254+
name = rhel-9-fast-datapath-aarch64
255255
baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/aarch64/fast-datapath/os/
256256
enabled = 1
257257
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
@@ -262,8 +262,8 @@ sslclientkey = /tmp/key/rh-cdn.pem
262262
sslclientcert = /tmp/key/rh-cdn.pem
263263
failovermethod = priority
264264

265-
[rhel-9.8-server-ose-4.22-aarch64]
266-
name = rhel-9.8-server-ose-4.22-aarch64
265+
[rhel-9-server-ose-aarch64]
266+
name = rhel-9-server-ose-aarch64
267267
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.22_aarch64/rhel-9-server-ose-rpms
268268
enabled = 1
269269
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
@@ -274,8 +274,8 @@ password_file = /tmp/mirror-enterprise-basic-auth/password
274274
failovermethod = priority
275275
skip_if_unavailable = true
276276

277-
[rhel-98-codeready-builder-rpms-aarch64]
278-
name = rhel-98-codeready-builder-rpms-aarch64
277+
[rhel-9-codeready-builder-rpms-aarch64]
278+
name = rhel-9-codeready-builder-rpms-aarch64
279279
baseurl = https://cdn.redhat.com/content/eus/rhel9/9.8/aarch64/codeready-builder/os/
280280
enabled = 1
281281
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

0 commit comments

Comments
 (0)