Skip to content

Commit aa68f67

Browse files
Rolv-Apnesethdebarshiray
authored andcommitted
.zuul: Parameterise system test job definitions
#1806 Assisted-by: Claude (claude-opus-4-6) Signed-off-by: Rolv Apneseth <rolv.apneseth@gmail.com>
1 parent 11f62c7 commit aa68f67

1 file changed

Lines changed: 26 additions & 29 deletions

File tree

.zuul.yaml

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,153 +56,150 @@
5656
dependencies_playbook: dependencies-fedora-restricted.yaml
5757

5858
- job:
59-
name: system-test-fedora-rawhide-commands-options
60-
description: Run Toolbx's commands-options system tests in Fedora Rawhide
59+
name: system-test-fedora
60+
abstract: true
61+
timeout: 6300
62+
pre-run: playbooks/setup-env.yaml
63+
64+
- job:
65+
name: system-test-fedora-rawhide
66+
abstract: true
67+
parent: system-test-fedora
6168
ansible-version: 11
6269
timeout: 7200
70+
71+
- job:
72+
name: system-test-fedora-rawhide-commands-options
73+
parent: system-test-fedora-rawhide
74+
description: Run Toolbx's commands-options system tests in Fedora Rawhide
6375
nodeset:
6476
nodes:
6577
- name: fedora-rawhide
6678
label: cloud-fedora-rawhide
67-
pre-run: playbooks/setup-env.yaml
6879
run: playbooks/system-test-commands-options.yaml
6980

7081
- job:
7182
name: system-test-fedora-rawhide-runtime-environment-arch-fedora
83+
parent: system-test-fedora-rawhide
7284
description: Run Toolbx's (arch-fedora,runtime-environment) system tests in Fedora Rawhide
73-
ansible-version: 11
74-
timeout: 7200
7585
nodeset:
7686
nodes:
7787
- name: fedora-rawhide
7888
label: cloud-fedora-rawhide
79-
pre-run: playbooks/setup-env.yaml
8089
run: playbooks/system-test-runtime-environment-arch-fedora.yaml
8190

8291
- job:
8392
name: system-test-fedora-rawhide-runtime-environment-ubuntu
93+
parent: system-test-fedora-rawhide
8494
description: Run Toolbx's (runtime-environment,ubuntu) system tests in Fedora Rawhide
85-
ansible-version: 11
86-
timeout: 7200
8795
nodeset:
8896
nodes:
8997
- name: fedora-rawhide
9098
label: cloud-fedora-rawhide
91-
pre-run: playbooks/setup-env.yaml
9299
run: playbooks/system-test-runtime-environment-ubuntu.yaml
93100

94101
- job:
95102
name: system-test-fedora-44-commands-options
103+
parent: system-test-fedora
96104
description: Run Toolbx's commands-options system tests in Fedora 44
97-
timeout: 6300
98105
nodeset:
99106
nodes:
100107
- name: fedora-44
101108
label: cloud-fedora-44
102-
pre-run: playbooks/setup-env.yaml
103109
run: playbooks/system-test-commands-options.yaml
104110

105111
- job:
106112
name: system-test-fedora-44-runtime-environment-arch-fedora
113+
parent: system-test-fedora
107114
description: Run Toolbx's (arch-fedora,runtime-environment) system tests in Fedora 44
108-
timeout: 6300
109115
nodeset:
110116
nodes:
111117
- name: fedora-44
112118
label: cloud-fedora-44
113-
pre-run: playbooks/setup-env.yaml
114119
run: playbooks/system-test-runtime-environment-arch-fedora.yaml
115120

116121
- job:
117122
name: system-test-fedora-44-runtime-environment-ubuntu
123+
parent: system-test-fedora
118124
description: Run Toolbx's (runtime-environment,ubuntu) system tests in Fedora 44
119-
timeout: 6300
120125
nodeset:
121126
nodes:
122127
- name: fedora-44
123128
label: cloud-fedora-44
124-
pre-run: playbooks/setup-env.yaml
125129
run: playbooks/system-test-runtime-environment-ubuntu.yaml
126130

127131
- job:
128132
name: system-test-fedora-43-commands-options
133+
parent: system-test-fedora
129134
description: Run Toolbx's commands-options system tests in Fedora 43
130-
timeout: 6300
131135
nodeset:
132136
nodes:
133137
- name: fedora-43
134138
label: cloud-fedora-43
135-
pre-run: playbooks/setup-env.yaml
136139
run: playbooks/system-test-commands-options.yaml
137140

138141
- job:
139142
name: system-test-fedora-43-runtime-environment-arch-fedora
143+
parent: system-test-fedora
140144
description: Run Toolbx's (arch-fedora,runtime-environment) system tests in Fedora 43
141-
timeout: 6300
142145
nodeset:
143146
nodes:
144147
- name: fedora-43
145148
label: cloud-fedora-43
146-
pre-run: playbooks/setup-env.yaml
147149
run: playbooks/system-test-runtime-environment-arch-fedora.yaml
148150

149151
- job:
150152
name: system-test-fedora-43-runtime-environment-ubuntu
153+
parent: system-test-fedora
151154
description: Run Toolbx's (runtime-environment,ubuntu) system tests in Fedora 43
152-
timeout: 6300
153155
nodeset:
154156
nodes:
155157
- name: fedora-43
156158
label: cloud-fedora-43
157-
pre-run: playbooks/setup-env.yaml
158159
run: playbooks/system-test-runtime-environment-ubuntu.yaml
159160

160161
- job:
161162
name: system-test-fedora-42-commands-options
163+
parent: system-test-fedora
162164
description: Run Toolbx's commands-options system tests in Fedora 42
163-
timeout: 6300
164165
nodeset:
165166
nodes:
166167
- name: fedora-42
167168
label: cloud-fedora-42
168-
pre-run: playbooks/setup-env.yaml
169169
run: playbooks/system-test-commands-options.yaml
170170

171171
- job:
172172
name: system-test-fedora-42-runtime-environment-arch-fedora
173+
parent: system-test-fedora
173174
description: Run Toolbx's (arch-fedora,runtime-environment) system tests in Fedora 42
174-
timeout: 6300
175175
nodeset:
176176
nodes:
177177
- name: fedora-42
178178
label: cloud-fedora-42
179-
pre-run: playbooks/setup-env.yaml
180179
run: playbooks/system-test-runtime-environment-arch-fedora.yaml
181180

182181
- job:
183182
name: system-test-fedora-42-runtime-environment-ubuntu
183+
parent: system-test-fedora
184184
description: Run Toolbx's (runtime-environment,ubuntu) system tests in Fedora 42
185-
timeout: 6300
186185
nodeset:
187186
nodes:
188187
- name: fedora-42
189188
label: cloud-fedora-42
190-
pre-run: playbooks/setup-env.yaml
191189
run: playbooks/system-test-runtime-environment-ubuntu.yaml
192190

193191
- job:
194192
name: system-test-fedora-coreos
195193
abstract: true
194+
parent: system-test-fedora
196195
voting: false
197-
timeout: 6300
198196
vars:
199197
dependencies_playbook: dependencies-fedora-coreos.yaml
200198
# Redirect installs from read-only /usr to writable /usr/local
201199
meson_setup_args: >-
202200
-Dfish_completions_dir=/usr/local/share/fish/vendor_completions.d
203201
-Dprofile_dir=/usr/local/share/profile.d
204202
-Dtmpfiles_dir=/usr/local/lib/tmpfiles.d
205-
pre-run: playbooks/setup-env.yaml
206203
207204
- job:
208205
name: system-test-fedora-coreos-next-commands-options

0 commit comments

Comments
 (0)