Skip to content

Commit ff3d96e

Browse files
tkoscielntkoscieln
committed
tests/CI: Add runners for RHEL 9.7 and 10.1
Add runners for RHEL 9.7 and 10.1 and remove 9.6 and 10.0 runners.
1 parent 943e147 commit ff3d96e

File tree

2 files changed

+133
-43
lines changed

2 files changed

+133
-43
lines changed

‎.gitlab-ci.yml

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ init:
7272

7373
.nightly_rules_all:
7474
rules:
75-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
76-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
75+
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9\.(6|7)-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
76+
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.\.(0|1)-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
7777

7878
.nightly_rules_x86_64:
7979
rules:
80-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
81-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.0-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
80+
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9\.(6|7)-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
81+
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.\.(0|1)-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
8282

8383
.ga_rules_all:
8484
rules:
@@ -91,10 +91,10 @@ init:
9191

9292
.RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL
9393
RUNNER:
94-
- aws/rhel-9.6-nightly-x86_64
95-
- aws/rhel-9.6-nightly-aarch64
96-
- aws/rhel-10.0-nightly-x86_64
97-
- aws/rhel-10.0-nightly-aarch64
94+
- aws/rhel-9.7-nightly-x86_64
95+
- aws/rhel-9.7-nightly-aarch64
96+
- aws/rhel-10.1-nightly-x86_64
97+
- aws/rhel-10.1-nightly-aarch64
9898

9999
INTERNAL_NETWORK: ["true"]
100100

@@ -178,8 +178,8 @@ Prepare-rhel-internal:
178178
- RUNNER:
179179
# NOTE: 1 runner prepares for all arches b/c subsequent jobs download
180180
# artifacts from all previous jobs and the last one wins
181-
- aws/rhel-9.6-nightly-x86_64
182-
- aws/rhel-10.0-nightly-x86_64
181+
- aws/rhel-9.7-nightly-x86_64
182+
- aws/rhel-10.1-nightly-x86_64
183183
INTERNAL_NETWORK: ["true"]
184184

185185
Base:
@@ -202,10 +202,10 @@ Base:
202202
- aws/rhel-9.5-ga-x86_64
203203
- aws/rhel-9.5-ga-aarch64
204204
- RUNNER:
205-
- aws/rhel-9.6-nightly-x86_64
206-
- aws/rhel-9.6-nightly-aarch64
207-
- aws/rhel-10.0-nightly-x86_64
208-
- aws/rhel-10.0-nightly-aarch64
205+
- aws/rhel-9.7-nightly-x86_64
206+
- aws/rhel-9.7-nightly-aarch64
207+
- aws/rhel-10.1-nightly-x86_64
208+
- aws/rhel-10.1-nightly-aarch64
209209
- aws/centos-stream-9-x86_64
210210
- aws/centos-stream-9-aarch64
211211
- aws/centos-stream-10-x86_64
@@ -232,10 +232,10 @@ Base:
232232
- aws/rhel-8.10-ga-aarch64
233233
- aws/rhel-9.5-ga-x86_64
234234
- aws/rhel-9.5-ga-aarch64
235-
- aws/rhel-9.6-nightly-x86_64
236-
- aws/rhel-9.6-nightly-aarch64
237-
- aws/rhel-10.0-nightly-x86_64
238-
- aws/rhel-10.0-nightly-aarch64
235+
- aws/rhel-9.7-nightly-x86_64
236+
- aws/rhel-9.7-nightly-aarch64
237+
- aws/rhel-10.1-nightly-x86_64
238+
- aws/rhel-10.1-nightly-aarch64
239239
- aws/centos-stream-9-x86_64
240240
- aws/centos-stream-9-aarch64
241241
- aws/centos-stream-10-x86_64
@@ -326,10 +326,10 @@ Image Tests:
326326
- RUNNER:
327327
- aws/rhel-8.10-ga-x86_64
328328
- aws/rhel-8.10-ga-aarch64
329-
- aws/rhel-9.6-nightly-x86_64
330-
- aws/rhel-9.6-nightly-aarch64
331-
- aws/rhel-10.0-nightly-x86_64
332-
- aws/rhel-10.0-nightly-aarch64
329+
- aws/rhel-9.7-nightly-x86_64
330+
- aws/rhel-9.7-nightly-aarch64
331+
- aws/rhel-10.1-nightly-x86_64
332+
- aws/rhel-10.1-nightly-aarch64
333333
INTERNAL_NETWORK: ["true"]
334334

335335
Trigger-rhel-edge-ci:
@@ -357,8 +357,8 @@ Trigger-rhel-edge-ci:
357357
RUNNER:
358358
- aws/rhel-8.10-ga-x86_64
359359
- aws/rhel-9.5-ga-x86_64
360-
- aws/rhel-9.6-nightly-x86_64
361-
- aws/rhel-10.0-nightly-x86_64
360+
- aws/rhel-9.7-nightly-x86_64
361+
- aws/rhel-10.1-nightly-x86_64
362362
- aws/centos-stream-9-x86_64
363363
- aws/centos-stream-10-x86_64
364364
INTERNAL_NETWORK: ["true"]
@@ -455,8 +455,8 @@ OpenShift_Virtualization:
455455
parallel:
456456
matrix:
457457
- RUNNER:
458-
- aws/rhel-9.6-nightly-x86_64
459-
- aws/rhel-10.0-nightly-x86_64
458+
- aws/rhel-9.7-nightly-x86_64
459+
- aws/rhel-10.1-nightly-x86_64
460460
INTERNAL_NETWORK: ["true"]
461461

462462
azure.sh:
@@ -533,10 +533,11 @@ filesystem.sh:
533533
RUNNER:
534534
- aws/rhel-9.5-ga-x86_64
535535
- aws/rhel-10.0-nightly-x86_64
536+
- aws/rhel-10.1-nightly-x86_64
536537
INTERNAL_NETWORK: ["true"]
537538
- CUSTOMIZATION_TYPE: "disk-lvm"
538539
RUNNER:
539-
- aws/rhel-9.6-nightly-x86_64
540+
- aws/rhel-9.7-nightly-x86_64
540541
INTERNAL_NETWORK: ["true"]
541542
- CUSTOMIZATION_TYPE: "disk-lvm"
542543
RUNNER:
@@ -580,7 +581,7 @@ API:
580581
RUNNER:
581582
- aws/rhel-8.10-ga-x86_64
582583
- aws/rhel-9.5-ga-x86_64
583-
- aws/rhel-9.6-nightly-x86_64
584+
- aws/rhel-9.7-nightly-x86_64
584585
INTERNAL_NETWORK: ["true"]
585586
# el10 for now supports only a subset of image types
586587
- IMAGE_TYPE:
@@ -649,10 +650,10 @@ API-module-hotfixes:
649650
- RUNNER:
650651
- gcp/rhel-8.10-ga-x86_64
651652
- gcp/rhel-9.5-ga-x86_64
652-
- gcp/rhel-9.6-nightly-x86_64
653+
- gcp/rhel-9.7-nightly-x86_64
653654
# TODO: replace the rhos-01 runner with this gcp runner once it's available
654655
# - gcp/rhel-10.0-nightly-x86_64
655-
- rhos-01/rhel-10.0-nightly-x86_64
656+
- gcp/rhel-10.1-nightly-x86_64
656657
- gcp/centos-stream-9-x86_64
657658
INTERNAL_NETWORK: ["true"]
658659

@@ -693,14 +694,14 @@ weldr-distro-dot-notation+aliases:
693694
matrix:
694695
- RUNNER:
695696
- aws/rhel-8.8-ga-x86_64
696-
- aws/rhel-9.6-nightly-x86_64
697+
- aws/rhel-9.7-nightly-x86_64
697698
INTERNAL_NETWORK: ["true"]
698699

699700
.generic_s3:
700701
extends: .libvirt_integration
701702
rules:
702703
# BLACKLIST
703-
- if: $RUNNER !~ "/^.*(rhel-9.6).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
704+
- if: $RUNNER !~ "/^.*(rhel-9.7).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
704705
- !reference [.nightly_rules_all, rules]
705706
- !reference [.ga_rules_all, rules]
706707

@@ -775,8 +776,8 @@ Upgrade:
775776
parallel:
776777
matrix:
777778
- RUNNER:
778-
- rhos-01/rhel-9.6-nightly-x86_64-large
779-
- rhos-01/rhel-10.0-nightly-x86_64-large
779+
- rhos-01/rhel-9.7-nightly-x86_64-large
780+
- rhos-01/rhel-10.1-nightly-x86_64-large
780781

781782
NIGHTLY_FAIL:
782783
stage: finish
@@ -821,20 +822,17 @@ Installer:
821822
extends: .terraform/openstack
822823
rules:
823824
- !reference [.upstream_rules_all, rules]
824-
# Disable Installer test for RHEL 10.0 nightly pipeline because fix for dracut issue won't make to nightly composes
825-
# For more info see: https://issues.redhat.com/browse/RHEL-80160
826-
# - !reference [.nightly_rules_all, rules]
827-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
825+
- !reference [.nightly_rules_all, rules]
828826
- !reference [.ga_rules_all, rules]
829827
script:
830828
- schutzbot/deploy.sh
831829
- /usr/libexec/tests/osbuild-composer/installers.sh
832830
parallel:
833831
matrix:
834832
- RUNNER:
835-
- rhos-01/rhel-9.6-nightly-x86_64
833+
- rhos-01/rhel-9.7-nightly-x86_64
836834
- rhos-01/centos-stream-9-x86_64
837-
- rhos-01/rhel-10.0-nightly-x86_64
835+
- rhos-01/rhel-10.1-nightly-x86_64
838836
- rhos-01/centos-stream-10-x86_64
839837

840838
ContainerUpload:
@@ -867,8 +865,8 @@ ContainerEmbedding:
867865
RUNNER:
868866
- aws/centos-stream-9-x86_64
869867
- aws/centos-stream-10-x86_64
870-
- aws/rhel-9.6-nightly-x86_64
871-
- aws/rhel-10.0-nightly-x86_64
868+
- aws/rhel-9.7-nightly-x86_64
869+
- aws/rhel-10.1-nightly-x86_64
872870

873871
WorkerExecutor:
874872
stage: test

‎Schutzfile

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,56 @@
187187
}
188188
]
189189
},
190+
"rhel-9.7": {
191+
"dependencies": {
192+
"osbuild": {
193+
"commit": "59fe07a6ab37120b4dd532e972c26deb7e7c7383"
194+
}
195+
},
196+
"repos": [
197+
{
198+
"file": "/etc/yum.repos.d/rhel9internal.repo",
199+
"x86_64": [
200+
{
201+
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
202+
"name": "baseos",
203+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.7-20250428"
204+
},
205+
{
206+
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
207+
"name": "appstream",
208+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.7-20250428"
209+
},
210+
{
211+
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
212+
"name": "crb",
213+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.7-20250428"
214+
}
215+
],
216+
"aarch64": [
217+
{
218+
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
219+
"name": "baseos",
220+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.7-20250428"
221+
},
222+
{
223+
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
224+
"name": "appstream",
225+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.7-20250428"
226+
},
227+
{
228+
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
229+
"name": "crb",
230+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.7-20250428"
231+
}
232+
]
233+
}
234+
]
235+
},
190236
"rhel-10.0": {
191237
"dependencies": {
192238
"osbuild": {
193-
"commit": "aced2eaa00b8f85608b36e294d13ad7ee9ac467d"
239+
"commit": "59fe07a6ab37120b4dd532e972c26deb7e7c7383"
194240
}
195241
},
196242
"repos": [
@@ -233,6 +279,52 @@
233279
}
234280
]
235281
},
282+
"rhel-10.1": {
283+
"dependencies": {
284+
"osbuild": {
285+
"commit": "aced2eaa00b8f85608b36e294d13ad7ee9ac467d"
286+
}
287+
},
288+
"repos": [
289+
{
290+
"file": "/etc/yum.repos.d/rhel10internal.repo",
291+
"x86_64": [
292+
{
293+
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
294+
"name": "baseos",
295+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.1-20250501"
296+
},
297+
{
298+
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
299+
"name": "appstream",
300+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.1-20250501"
301+
},
302+
{
303+
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
304+
"name": "crb",
305+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.1-20250501"
306+
}
307+
],
308+
"aarch64": [
309+
{
310+
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
311+
"name": "baseos",
312+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.1-20250501"
313+
},
314+
{
315+
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
316+
"name": "appstream",
317+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.1-20250501"
318+
},
319+
{
320+
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
321+
"name": "crb",
322+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.1-20250501"
323+
}
324+
]
325+
}
326+
]
327+
},
236328
"centos-9": {
237329
"dependencies": {
238330
"osbuild": {

0 commit comments

Comments
 (0)