Skip to content

Commit 9964b38

Browse files
committed
ci(kitchen): move provisioner block & update run_command [skip ci]
* Automated using myii/ssf-formula#344
1 parent 9b6a34f commit 9964b38

File tree

1 file changed

+35
-30
lines changed

1 file changed

+35
-30
lines changed

kitchen.yml

+35-30
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,36 @@ driver:
66
name: docker
77
use_sudo: false
88
privileged: true
9-
run_command: /lib/systemd/systemd
9+
run_command: /usr/lib/systemd/systemd
10+
11+
provisioner:
12+
name: salt_solo
13+
log_level: debug
14+
salt_install: none
15+
require_chef: false
16+
formula: php
17+
salt_copy_filter:
18+
- .kitchen
19+
- .git
1020

1121
platforms:
1222
## SALT `tiamat`
1323
- name: debian-10-tiamat-py3
1424
driver:
1525
image: saltimages/salt-tiamat-py3:debian-10
26+
run_command: /lib/systemd/systemd
1627
- name: debian-9-tiamat-py3
1728
driver:
1829
image: saltimages/salt-tiamat-py3:debian-9
30+
run_command: /lib/systemd/systemd
1931
- name: ubuntu-2004-tiamat-py3
2032
driver:
2133
image: saltimages/salt-tiamat-py3:ubuntu-20.04
34+
run_command: /lib/systemd/systemd
2235
- name: ubuntu-1804-tiamat-py3
2336
driver:
2437
image: saltimages/salt-tiamat-py3:ubuntu-18.04
38+
run_command: /lib/systemd/systemd
2539
- name: centos-8-tiamat-py3
2640
driver:
2741
image: saltimages/salt-tiamat-py3:centos-8
@@ -48,15 +62,19 @@ platforms:
4862
- name: debian-10-master-py3
4963
driver:
5064
image: saltimages/salt-master-py3:debian-10
65+
run_command: /lib/systemd/systemd
5166
- name: debian-9-master-py3
5267
driver:
5368
image: saltimages/salt-master-py3:debian-9
69+
run_command: /lib/systemd/systemd
5470
- name: ubuntu-2004-master-py3
5571
driver:
5672
image: saltimages/salt-master-py3:ubuntu-20.04
73+
run_command: /lib/systemd/systemd
5774
- name: ubuntu-1804-master-py3
5875
driver:
5976
image: saltimages/salt-master-py3:ubuntu-18.04
77+
run_command: /lib/systemd/systemd
6078
- name: centos-8-master-py3
6179
driver:
6280
image: saltimages/salt-master-py3:centos-8
@@ -72,23 +90,20 @@ platforms:
7290
- name: opensuse-leap-153-master-py3
7391
driver:
7492
image: saltimages/salt-master-py3:opensuse-leap-15.3
75-
run_command: /usr/lib/systemd/systemd
7693
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
7794
# => SCP did not finish successfully (255): (Net::SCP::Error)
7895
transport:
7996
max_ssh_sessions: 1
8097
- name: opensuse-leap-152-master-py3
8198
driver:
8299
image: saltimages/salt-master-py3:opensuse-leap-15.2
83-
run_command: /usr/lib/systemd/systemd
84100
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
85101
# => SCP did not finish successfully (255): (Net::SCP::Error)
86102
transport:
87103
max_ssh_sessions: 1
88104
- name: opensuse-tmbl-latest-master-py3
89105
driver:
90106
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
91-
run_command: /usr/lib/systemd/systemd
92107
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
93108
# => SCP did not finish successfully (255): (Net::SCP::Error)
94109
transport:
@@ -105,7 +120,6 @@ platforms:
105120
- name: arch-base-latest-master-py3
106121
driver:
107122
image: saltimages/salt-master-py3:arch-base-latest
108-
run_command: /usr/lib/systemd/systemd
109123
- name: gentoo-stage3-latest-master-py3
110124
driver:
111125
image: saltimages/salt-master-py3:gentoo-stage3-latest
@@ -124,15 +138,19 @@ platforms:
124138
- name: debian-10-3003-1-py3
125139
driver:
126140
image: saltimages/salt-3003.1-py3:debian-10
141+
run_command: /lib/systemd/systemd
127142
- name: debian-9-3003-1-py3
128143
driver:
129144
image: saltimages/salt-3003.1-py3:debian-9
145+
run_command: /lib/systemd/systemd
130146
- name: ubuntu-2004-3003-1-py3
131147
driver:
132148
image: saltimages/salt-3003.1-py3:ubuntu-20.04
149+
run_command: /lib/systemd/systemd
133150
- name: ubuntu-1804-3003-1-py3
134151
driver:
135152
image: saltimages/salt-3003.1-py3:ubuntu-18.04
153+
run_command: /lib/systemd/systemd
136154
- name: centos-8-3003-1-py3
137155
driver:
138156
image: saltimages/salt-3003.1-py3:centos-8
@@ -148,23 +166,20 @@ platforms:
148166
- name: opensuse-leap-153-3003-1-py3
149167
driver:
150168
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
151-
run_command: /usr/lib/systemd/systemd
152169
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
153170
# => SCP did not finish successfully (255): (Net::SCP::Error)
154171
transport:
155172
max_ssh_sessions: 1
156173
- name: opensuse-leap-152-3003-1-py3
157174
driver:
158175
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
159-
run_command: /usr/lib/systemd/systemd
160176
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
161177
# => SCP did not finish successfully (255): (Net::SCP::Error)
162178
transport:
163179
max_ssh_sessions: 1
164180
- name: opensuse-tmbl-latest-3003-1-py3
165181
driver:
166182
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
167-
run_command: /usr/lib/systemd/systemd
168183
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
169184
# => SCP did not finish successfully (255): (Net::SCP::Error)
170185
transport:
@@ -181,7 +196,6 @@ platforms:
181196
- name: arch-base-latest-3003-1-py3
182197
driver:
183198
image: saltimages/salt-3003.1-py3:arch-base-latest
184-
run_command: /usr/lib/systemd/systemd
185199
- name: gentoo-stage3-latest-3003-1-py3
186200
driver:
187201
image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
@@ -194,15 +208,19 @@ platforms:
194208
- name: debian-10-3002-6-py3
195209
driver:
196210
image: saltimages/salt-3002.6-py3:debian-10
211+
run_command: /lib/systemd/systemd
197212
- name: debian-9-3002-6-py3
198213
driver:
199214
image: saltimages/salt-3002.6-py3:debian-9
215+
run_command: /lib/systemd/systemd
200216
- name: ubuntu-2004-3002-6-py3
201217
driver:
202218
image: saltimages/salt-3002.6-py3:ubuntu-20.04
219+
run_command: /lib/systemd/systemd
203220
- name: ubuntu-1804-3002-6-py3
204221
driver:
205222
image: saltimages/salt-3002.6-py3:ubuntu-18.04
223+
run_command: /lib/systemd/systemd
206224
- name: centos-8-3002-6-py3
207225
driver:
208226
image: saltimages/salt-3002.6-py3:centos-8
@@ -227,7 +245,6 @@ platforms:
227245
- name: arch-base-latest-3002-6-py3
228246
driver:
229247
image: saltimages/salt-3002.6-py3:arch-base-latest
230-
run_command: /usr/lib/systemd/systemd
231248
- name: gentoo-stage3-latest-3002-6-py3
232249
driver:
233250
image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
@@ -240,23 +257,20 @@ platforms:
240257
- name: opensuse-leap-153-3002-2-py3
241258
driver:
242259
image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
243-
run_command: /usr/lib/systemd/systemd
244260
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
245261
# => SCP did not finish successfully (255): (Net::SCP::Error)
246262
transport:
247263
max_ssh_sessions: 1
248264
- name: opensuse-leap-152-3002-2-py3
249265
driver:
250266
image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
251-
run_command: /usr/lib/systemd/systemd
252267
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
253268
# => SCP did not finish successfully (255): (Net::SCP::Error)
254269
transport:
255270
max_ssh_sessions: 1
256271
- name: opensuse-tmbl-latest-3002-2-py3
257272
driver:
258273
image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
259-
run_command: /usr/lib/systemd/systemd
260274
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
261275
# => SCP did not finish successfully (255): (Net::SCP::Error)
262276
transport:
@@ -266,15 +280,19 @@ platforms:
266280
- name: debian-10-3001-7-py3
267281
driver:
268282
image: saltimages/salt-3001.7-py3:debian-10
283+
run_command: /lib/systemd/systemd
269284
- name: debian-9-3001-7-py3
270285
driver:
271286
image: saltimages/salt-3001.7-py3:debian-9
287+
run_command: /lib/systemd/systemd
272288
- name: ubuntu-2004-3001-7-py3
273289
driver:
274290
image: saltimages/salt-3001.7-py3:ubuntu-20.04
291+
run_command: /lib/systemd/systemd
275292
- name: ubuntu-1804-3001-7-py3
276293
driver:
277294
image: saltimages/salt-3001.7-py3:ubuntu-18.04
295+
run_command: /lib/systemd/systemd
278296
- name: centos-8-3001-7-py3
279297
driver:
280298
image: saltimages/salt-3001.7-py3:centos-8
@@ -290,23 +308,20 @@ platforms:
290308
- name: opensuse-leap-153-3001-7-py3
291309
driver:
292310
image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
293-
run_command: /usr/lib/systemd/systemd
294311
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
295312
# => SCP did not finish successfully (255): (Net::SCP::Error)
296313
transport:
297314
max_ssh_sessions: 1
298315
- name: opensuse-leap-152-3001-7-py3
299316
driver:
300317
image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
301-
run_command: /usr/lib/systemd/systemd
302318
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
303319
# => SCP did not finish successfully (255): (Net::SCP::Error)
304320
transport:
305321
max_ssh_sessions: 1
306322
- name: opensuse-tmbl-latest-3001-7-py3
307323
driver:
308324
image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
309-
run_command: /usr/lib/systemd/systemd
310325
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
311326
# => SCP did not finish successfully (255): (Net::SCP::Error)
312327
transport:
@@ -323,7 +338,6 @@ platforms:
323338
- name: arch-base-latest-3001-7-py3
324339
driver:
325340
image: saltimages/salt-3001.7-py3:arch-base-latest
326-
run_command: /usr/lib/systemd/systemd
327341
- name: gentoo-stage3-latest-3001-7-py3
328342
driver:
329343
image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
@@ -336,12 +350,15 @@ platforms:
336350
- name: debian-10-3000-9-py3
337351
driver:
338352
image: saltimages/salt-3000.9-py3:debian-10
353+
run_command: /lib/systemd/systemd
339354
- name: debian-9-3000-9-py3
340355
driver:
341356
image: saltimages/salt-3000.9-py3:debian-9
357+
run_command: /lib/systemd/systemd
342358
- name: ubuntu-1804-3000-9-py3
343359
driver:
344360
image: saltimages/salt-3000.9-py3:ubuntu-18.04
361+
run_command: /lib/systemd/systemd
345362
- name: centos-8-3000-9-py3
346363
driver:
347364
image: saltimages/salt-3000.9-py3:centos-8
@@ -351,15 +368,13 @@ platforms:
351368
- name: opensuse-leap-153-3000-9-py3
352369
driver:
353370
image: saltimages/salt-3000.9-py3:opensuse-leap-15.3
354-
run_command: /usr/lib/systemd/systemd
355371
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
356372
# => SCP did not finish successfully (255): (Net::SCP::Error)
357373
transport:
358374
max_ssh_sessions: 1
359375
- name: opensuse-leap-152-3000-9-py3
360376
driver:
361377
image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
362-
run_command: /usr/lib/systemd/systemd
363378
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
364379
# => SCP did not finish successfully (255): (Net::SCP::Error)
365380
transport:
@@ -383,20 +398,10 @@ platforms:
383398
- name: ubuntu-1804-3000-9-py2
384399
driver:
385400
image: saltimages/salt-3000.9-py2:ubuntu-18.04
401+
run_command: /lib/systemd/systemd
386402
- name: arch-base-latest-3000-9-py2
387403
driver:
388404
image: saltimages/salt-3000.9-py2:arch-base-latest
389-
run_command: /usr/lib/systemd/systemd
390-
391-
provisioner:
392-
name: salt_solo
393-
log_level: debug
394-
salt_install: none
395-
require_chef: false
396-
formula: php
397-
salt_copy_filter:
398-
- .kitchen
399-
- .git
400405

401406
verifier:
402407
# https://www.inspec.io/

0 commit comments

Comments
 (0)