Skip to content

Commit 2ad9e65

Browse files
author
CKI KWF Bot
committed
Merge: gitlab-ci: add jobs for rhel9 automotive pipelines
MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-9/-/merge_requests/3456 Part of https://gitlab.com/cki-project/kernel-ark/-/issues/175 Upstream Status: RHEL-only JIRA: INTERNAL Signed-off-by: Michael Hofmann <[email protected]> Approved-by: Bruno Goncalves <[email protected]> Approved-by: Tales da Aparecida <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: CKI KWF Bot <[email protected]>
2 parents 32a4629 + fb0944e commit 2ad9e65

File tree

1 file changed

+52
-18
lines changed

1 file changed

+52
-18
lines changed

.gitlab-ci.yml

Lines changed: 52 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,33 @@ workflow: !reference [.workflow]
4242
skip_test: 'true'
4343
skip_results: 'true'
4444

45-
.automotive_full_c9s:
45+
.automotive_disttag:
4646
variables:
47-
kpet_tree_name: autosd
4847
disttag_override: '.el9iv'
49-
AWS_UPT_IMAGE_NAME_FILTER: 'auto-osbuild-qemu-cs9-cki-ostree-*'
48+
49+
.automotive_branch:
50+
variables:
5051
RUN_ONLY_FOR_AUTOMOTIVE: 'true'
5152

52-
.automotive_check_c9s_overrides:
53-
trigger:
54-
branch: c9s-automotive
53+
.automotive_autosd:
54+
variables:
55+
kpet_tree_name: autosd
56+
57+
.automotive_rhivos:
5558
variables:
56-
RUN_ONLY_FOR_AUTOMOTIVE: 'false'
59+
kpet_tree_name: rhivos
60+
61+
.automotive_pipeline_c9s:
62+
extends: [.automotive_disttag, .automotive_autosd, .automotive_branch]
63+
64+
.automotive_check_c9s:
65+
extends: [.automotive_disttag, .automotive_autosd]
66+
67+
.automotive_pipeline_rhel9:
68+
extends: [.automotive_disttag, .automotive_rhivos, .automotive_branch]
69+
70+
.automotive_check_rhel9:
71+
extends: [.automotive_disttag, .automotive_rhivos]
5772

5873
# c9s CI
5974
c9s_merge_request:
@@ -80,12 +95,13 @@ c9s_64k_merge_request:
8095

8196
c9s_automotive_check_merge_request:
8297
extends: [.trusted, .merge_request,
83-
.9-common, .trigger_c9s_pipeline, .automotive_full_c9s, .automotive_check_c9s_overrides,
84-
.automotive_check_common]
98+
.9-common, .trigger_c9s_pipeline,
99+
.automotive_check_common, .automotive_check_c9s]
85100

86101
c9s_baseline_coverage_build:
87102
extends: [.trusted, .baseline, .rhel_common, .only_build_and_publish,
88-
.9-common, .coverage, .trigger_c9s_pipeline]
103+
.9-common, .trigger_c9s_pipeline,
104+
.coverage]
89105

90106
c9s_rhel9_compat_merge_request:
91107
extends: [.centos_stream_rhel_internal, .merge_request, .rhel_common, .with_notifications,
@@ -94,15 +110,14 @@ c9s_rhel9_compat_merge_request:
94110
# c9s automotive branch CI
95111
c9s_automotive_merge_request:
96112
extends: [.trusted, .merge_request,
97-
.9-common,
98-
.automotive_pipeline_common,
99-
.trigger_c9s_pipeline, .automotive_full_c9s]
113+
.9-common, .trigger_c9s_pipeline,
114+
.automotive_pipeline_common, .automotive_pipeline_c9s]
100115

101116
c9s_automotive_baseline_coverage:
102-
extends: [.trusted, .baseline, .9-common,
103-
.automotive_pipeline_common,
104-
.coverage,
105-
.trigger_c9s_pipeline, .automotive_full_c9s]
117+
extends: [.trusted, .baseline,
118+
.9-common, .trigger_c9s_pipeline,
119+
.automotive_pipeline_common, .automotive_pipeline_c9s,
120+
.coverage]
106121

107122
# RHEL9 CI
108123
rhel9_merge_request:
@@ -127,9 +142,22 @@ rhel9_64k_merge_request:
127142
.9-common, .trigger_rhel9_pipeline,
128143
.64k_common]
129144

145+
rhel9_automotive_check_merge_request:
146+
# Don't add .rhel_common as we overwrite those configs
147+
extends: [.internal, .merge_request, .with_notifications,
148+
.9-common, .trigger_rhel9_pipeline,
149+
.automotive_check_common, .automotive_check_rhel9]
150+
130151
rhel9_baseline_coverage_build:
131152
extends: [.internal, .baseline, .rhel_common, .only_build_and_publish,
132-
.9-common, .coverage, .trigger_rhel9_pipeline]
153+
.9-common, .trigger_rhel9_pipeline,
154+
.coverage]
155+
156+
# RHEL9 automotive branch CI
157+
rhel9_automotive_merge_request:
158+
extends: [.internal, .merge_request,
159+
.9-common, .trigger_rhel9_pipeline,
160+
.automotive_pipeline_common, .automotive_pipeline_rhel9]
133161

134162
# RHEL9 private CI (including RT branches)
135163
rhel9_merge_request_private:
@@ -153,3 +181,9 @@ rhel9_64k_merge_request_private:
153181
extends: [.scratch, .merge_request,
154182
.9-common, .trigger_rhel9_pipeline,
155183
.64k_common]
184+
185+
rhel9_automotive_check_merge_request_private:
186+
# Don't add .rhel_common as we overwrite those configs
187+
extends: [.scratch, .merge_request,
188+
.9-common, .trigger_rhel9_pipeline,
189+
.automotive_check_common, .automotive_check_rhel9]

0 commit comments

Comments
 (0)