Skip to content

Commit 6e503e8

Browse files
croissannecroissanne
committed
.gitlab-ci.yml: use new 10.1 ga runners
1 parent a9768e0 commit 6e503e8

File tree

3 files changed

+16
-67
lines changed

3 files changed

+16
-67
lines changed

‎.gitlab-ci.yml‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ init:
9494
- aws/rhel-9.7-nightly-aarch64
9595
- aws/rhel-9.8-nightly-x86_64
9696
- aws/rhel-9.8-nightly-aarch64
97-
- aws/rhel-10.1-nightly-x86_64
98-
- aws/rhel-10.1-nightly-aarch64
9997
- aws/rhel-10.2-nightly-x86_64
10098
- aws/rhel-10.2-nightly-aarch64
10199
INTERNAL_NETWORK: ["true"]
@@ -119,8 +117,8 @@ RPM:
119117
- aws/rhel-8.10-ga-aarch64
120118
- aws/rhel-9.6-ga-x86_64
121119
- aws/rhel-9.6-ga-aarch64
122-
- aws/rhel-10.0-ga-x86_64
123-
- aws/rhel-10.0-ga-aarch64
120+
- aws/rhel-10.1-ga-x86_64
121+
- aws/rhel-10.1-ga-aarch64
124122
- aws/centos-stream-9-x86_64
125123
- aws/centos-stream-9-aarch64
126124
- aws/centos-stream-10-x86_64
@@ -184,7 +182,6 @@ Prepare-rhel-internal:
184182
# artifacts from all previous jobs and the last one wins
185183
- aws/rhel-9.7-nightly-x86_64
186184
- aws/rhel-9.8-nightly-x86_64
187-
- aws/rhel-10.1-nightly-x86_64
188185
- aws/rhel-10.2-nightly-x86_64
189186
INTERNAL_NETWORK: ["true"]
190187

@@ -207,8 +204,8 @@ Base:
207204
- aws/rhel-8.10-ga-aarch64
208205
- aws/rhel-9.6-ga-x86_64
209206
- aws/rhel-9.6-ga-aarch64
210-
- aws/rhel-10.0-ga-x86_64
211-
- aws/rhel-10.0-ga-aarch64
207+
- aws/rhel-10.1-ga-x86_64
208+
- aws/rhel-10.1-ga-aarch64
212209
- aws/centos-stream-9-x86_64
213210
- aws/centos-stream-9-aarch64
214211
- aws/centos-stream-10-x86_64
@@ -235,8 +232,8 @@ Base:
235232
- aws/rhel-8.10-ga-aarch64
236233
- aws/rhel-9.6-ga-x86_64
237234
- aws/rhel-9.6-ga-aarch64
238-
- aws/rhel-10.0-ga-x86_64
239-
- aws/rhel-10.0-ga-aarch64
235+
- aws/rhel-10.1-ga-x86_64
236+
- aws/rhel-10.1-ga-aarch64
240237
- aws/centos-stream-9-x86_64
241238
- aws/centos-stream-9-aarch64
242239
- aws/centos-stream-10-x86_64
@@ -288,7 +285,7 @@ regression-old-worker-new-composer:
288285
- RUNNER:
289286
- aws/rhel-8.10-ga-x86_64
290287
- aws/rhel-9.6-ga-x86_64
291-
- aws/rhel-10.0-ga-x86_64
288+
- aws/rhel-10.1-ga-x86_64
292289
INTERNAL_NETWORK: ["true"]
293290
extends: .regression
294291
variables:
@@ -343,10 +340,9 @@ regression-no-explicit-rootfs-definition:
343340
RUNNER:
344341
- aws/rhel-8.10-ga-x86_64
345342
- aws/rhel-9.6-ga-x86_64
346-
- aws/rhel-10.0-ga-x86_64
343+
- aws/rhel-10.1-ga-x86_64
347344
- aws/rhel-9.7-nightly-x86_64
348345
- aws/rhel-9.8-nightly-x86_64
349-
- aws/rhel-10.1-nightly-x86_64
350346
- aws/rhel-10.2-nightly-x86_64
351347
- aws/centos-stream-9-x86_64
352348
- aws/centos-stream-10-x86_64
@@ -446,7 +442,6 @@ OpenShift_Virtualization:
446442
- RUNNER:
447443
- aws/rhel-9.7-nightly-x86_64
448444
- aws/rhel-9.8-nightly-x86_64
449-
- aws/rhel-10.1-nightly-x86_64
450445
- aws/rhel-10.2-nightly-x86_64
451446
INTERNAL_NETWORK: ["true"]
452447

@@ -523,8 +518,7 @@ filesystem.sh:
523518
- CUSTOMIZATION_TYPE: "disk-plain"
524519
RUNNER:
525520
- aws/rhel-9.6-ga-x86_64
526-
- aws/rhel-10.0-ga-x86_64
527-
- aws/rhel-10.1-nightly-x86_64
521+
- aws/rhel-10.1-ga-x86_64
528522
- aws/rhel-10.2-nightly-x86_64
529523
INTERNAL_NETWORK: ["true"]
530524
- CUSTOMIZATION_TYPE: "disk-lvm"
@@ -587,8 +581,7 @@ API:
587581
- vsphere
588582
RUNNER:
589583
# Add all RHEL 10 runners here to exclude Edge for them
590-
- aws/rhel-10.0-ga-x86_64
591-
- aws/rhel-10.1-nightly-x86_64
584+
- aws/rhel-10.1-ga-x86_64
592585
- aws/rhel-10.2-nightly-x86_64
593586
INTERNAL_NETWORK: ["true"]
594587
- IMAGE_TYPE: ["iot-commit"]
@@ -602,7 +595,7 @@ API:
602595
RUNNER:
603596
- aws/rhel-8.10-ga-aarch64
604597
- aws/rhel-9.6-ga-aarch64
605-
- aws/rhel-10.0-ga-aarch64
598+
- aws/rhel-10.1-ga-aarch64
606599
INTERNAL_NETWORK: ["true"]
607600

608601
API-module-hotfixes:
@@ -649,10 +642,9 @@ API-module-hotfixes:
649642
- RUNNER:
650643
- gcp/rhel-8.10-ga-x86_64
651644
- gcp/rhel-9.6-ga-x86_64
652-
- gcp/rhel-10.0-ga-x86_64
645+
- gcp/rhel-10.1-ga-x86_64
653646
- gcp/rhel-9.7-nightly-x86_64
654647
- gcp/rhel-9.8-nightly-x86_64
655-
- gcp/rhel-10.1-nightly-x86_64
656648
- gcp/rhel-10.2-nightly-x86_64
657649
- gcp/centos-stream-9-x86_64
658650
INTERNAL_NETWORK: ["true"]
@@ -677,8 +669,7 @@ ubi-wsl.sh:
677669
- RUNNER:
678670
- aws/rhel-8.10-ga-x86_64
679671
- aws/rhel-9.6-ga-x86_64
680-
- aws/rhel-10.0-ga-x86_64
681-
- aws/rhel-10.1-nightly-x86_64
672+
- aws/rhel-10.1-ga-x86_64
682673
- aws/rhel-10.2-nightly-x86_64
683674
INTERNAL_NETWORK: "true"
684675

@@ -780,7 +771,6 @@ Upgrade:
780771
- RUNNER:
781772
- rhos-01/rhel-9.7-nightly-x86_64-large
782773
- rhos-01/rhel-9.8-nightly-x86_64-large
783-
- rhos-01/rhel-10.1-nightly-x86_64-large
784774
- rhos-01/rhel-10.2-nightly-x86_64-large
785775

786776
NIGHTLY_FAIL:
@@ -837,7 +827,6 @@ Installer:
837827
- rhos-01/rhel-9.7-nightly-x86_64
838828
- rhos-01/rhel-9.8-nightly-x86_64
839829
- rhos-01/centos-stream-9-x86_64
840-
- rhos-01/rhel-10.1-nightly-x86_64
841830
- rhos-01/rhel-10.2-nightly-x86_64
842831
- rhos-01/centos-stream-10-x86_64
843832

@@ -873,7 +862,6 @@ ContainerEmbedding:
873862
- aws/centos-stream-10-x86_64
874863
- aws/rhel-9.7-nightly-x86_64
875864
- aws/rhel-9.8-nightly-x86_64
876-
- aws/rhel-10.1-nightly-x86_64
877865
- aws/rhel-10.2-nightly-x86_64
878866

879867
WorkerExecutor:

‎Schutzfile‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -252,46 +252,7 @@
252252
"osbuild": {
253253
"commit": "a52e256c481c00e61f785f3ad68e29e1ac8a09fb"
254254
}
255-
},
256-
"repos": [
257-
{
258-
"file": "/etc/yum.repos.d/rhel10internal.repo",
259-
"x86_64": [
260-
{
261-
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
262-
"name": "baseos",
263-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.1-20251023"
264-
},
265-
{
266-
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
267-
"name": "appstream",
268-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.1-20251023"
269-
},
270-
{
271-
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
272-
"name": "crb",
273-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.1-20251023"
274-
}
275-
],
276-
"aarch64": [
277-
{
278-
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
279-
"name": "baseos",
280-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.1-20251023"
281-
},
282-
{
283-
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
284-
"name": "appstream",
285-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.1-20251023"
286-
},
287-
{
288-
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
289-
"name": "crb",
290-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.1-20251023"
291-
}
292-
]
293-
}
294-
]
255+
}
295256
},
296257
"rhel-10.2": {
297258
"dependencies": {
@@ -445,4 +406,4 @@
445406
}
446407
]
447408
}
448-
}
409+
}

‎schutzbot/terraform‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c5ff0cf74a790e472f3f885ac640c82f0ec39a5e
1+
37259c2cdc5dc3f1f983dc9508cb8b1cf73da1d3

0 commit comments

Comments
 (0)