Skip to content

Commit 30f87cc

Browse files
myiimyii
committed
ci(kitchen+ci): update with 3004 pre-salted images/boxes [skip ci]
* Automated using myii/ssf-formula#385
1 parent c5894e0 commit 30f87cc

File tree

6 files changed

+170
-11
lines changed

6 files changed

+170
-11
lines changed

Diff for: ‎.github/workflows/kitchen.vagrant.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
# - freebsd-130-master-py3
1919
- default-freebsd-122-master-py3
2020
# - freebsd-122-master-py3
21-
# - default-freebsd-130-3003-1-py3
22-
# - default-freebsd-122-3003-1-py3
21+
# - default-freebsd-130-3004-0-py3
22+
# - default-freebsd-122-3004-0-py3
2323
steps:
2424
- name: 'Check out code'
2525
uses: 'actions/checkout@v2'

Diff for: ‎.gitlab-ci.yml

+31-5
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ rubocop:
135135
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
136136
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
137137
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
138+
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
138139
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
139140
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
140141
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -157,6 +158,9 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
157158
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
158159
# passenger-ubuntu-1804-master-py3: {extends: '.test_instance'}
159160
ubuntu-1804-master-py3: {extends: '.test_instance'}
161+
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
162+
# passenger-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
163+
centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
160164
# default-centos-8-master-py3: {extends: '.test_instance'}
161165
# passenger-centos-8-master-py3: {extends: '.test_instance'}
162166
centos-8-master-py3: {extends: '.test_instance'}
@@ -171,8 +175,8 @@ default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
171175
# opensuse-leap-153-master-py3: {extends: '.test_instance'}
172176
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
173177
# opensuse-leap-152-master-py3: {extends: '.test_instance'}
174-
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
175-
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
178+
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
179+
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
176180
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
177181
# amazonlinux-2-master-py3: {extends: '.test_instance'}
178182
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -192,18 +196,40 @@ almalinux-8-master-py3: {extends: '.test_instance'}
192196
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
193197
# passenger-rockylinux-8-master-py3: {extends: '.test_instance'}
194198
rockylinux-8-master-py3: {extends: '.test_instance'}
199+
# default-debian-11-3004-0-py3: {extends: '.test_instance'}
200+
# default-debian-10-3004-0-py3: {extends: '.test_instance'}
201+
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
202+
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
203+
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
204+
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
205+
# default-centos-8-3004-0-py3: {extends: '.test_instance'}
206+
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
207+
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
208+
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
209+
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
210+
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
211+
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
212+
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
213+
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
214+
# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
215+
# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
216+
# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
217+
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
218+
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
219+
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
195220
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
196221
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
197222
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
198223
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
199224
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
225+
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
200226
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
201227
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
202228
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
203229
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
204230
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
205231
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
206-
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
232+
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
207233
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
208234
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
209235
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
@@ -222,7 +248,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
222248
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
223249
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
224250
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
225-
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
251+
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
226252
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
227253
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
228254
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
@@ -239,7 +265,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
239265
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
240266
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
241267
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
242-
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
268+
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
243269
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
244270
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
245271
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}

Diff for: ‎.travis.yml

+26
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
# - env: INSTANCE=default-debian-9-tiamat-py3
8989
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
9090
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
91+
# - env: INSTANCE=default-centos-stream8-tiamat-py3
9192
# - env: INSTANCE=default-centos-8-tiamat-py3
9293
# - env: INSTANCE=default-centos-7-tiamat-py3
9394
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
@@ -110,6 +111,9 @@ jobs:
110111
# - env: INSTANCE=default-ubuntu-1804-master-py3
111112
# - env: INSTANCE=passenger-ubuntu-1804-master-py3
112113
- env: INSTANCE=ubuntu-1804-master-py3
114+
# - env: INSTANCE=default-centos-stream8-master-py3
115+
# - env: INSTANCE=passenger-centos-stream8-master-py3
116+
- env: INSTANCE=centos-stream8-master-py3
113117
# - env: INSTANCE=default-centos-8-master-py3
114118
# - env: INSTANCE=passenger-centos-8-master-py3
115119
- env: INSTANCE=centos-8-master-py3
@@ -145,11 +149,33 @@ jobs:
145149
# - env: INSTANCE=default-rockylinux-8-master-py3
146150
# - env: INSTANCE=passenger-rockylinux-8-master-py3
147151
- env: INSTANCE=rockylinux-8-master-py3
152+
# - env: INSTANCE=default-debian-11-3004-0-py3
153+
# - env: INSTANCE=default-debian-10-3004-0-py3
154+
# - env: INSTANCE=default-debian-9-3004-0-py3
155+
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
156+
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
157+
# - env: INSTANCE=default-centos-stream8-3004-0-py3
158+
# - env: INSTANCE=default-centos-8-3004-0-py3
159+
# - env: INSTANCE=default-centos-7-3004-0-py3
160+
# - env: INSTANCE=default-fedora-34-3004-0-py3
161+
# - env: INSTANCE=default-fedora-33-3004-0-py3
162+
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
163+
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
164+
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
165+
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
166+
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
167+
# - env: INSTANCE=default-oraclelinux-7-3004-0-py3
168+
# - env: INSTANCE=default-arch-base-latest-3004-0-py3
169+
# - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
170+
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
171+
# - env: INSTANCE=default-almalinux-8-3004-0-py3
172+
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
148173
# - env: INSTANCE=default-debian-11-3003-3-py3
149174
# - env: INSTANCE=default-debian-10-3003-3-py3
150175
# - env: INSTANCE=default-debian-9-3003-3-py3
151176
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
152177
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
178+
# - env: INSTANCE=default-centos-stream8-3003-3-py3
153179
# - env: INSTANCE=default-centos-8-3003-3-py3
154180
# - env: INSTANCE=default-centos-7-3003-3-py3
155181
# - env: INSTANCE=default-fedora-34-3003-3-py3

Diff for: ‎CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
/test/integration/**/libraries/system.rb @saltstack-formulas/ssf
2323
/test/integration/**/inspec.yml @saltstack-formulas/ssf
2424
/test/integration/**/README.md @saltstack-formulas/ssf
25+
/test/salt/pillar/top.sls @saltstack-formulas/ssf
2526
/.gitignore @saltstack-formulas/ssf
2627
/.cirrus.yml @saltstack-formulas/ssf
2728
/.gitlab-ci.yml @saltstack-formulas/ssf

Diff for: ‎kitchen.vagrant.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ platforms:
2525
- name: freebsd-122-master-py3
2626
driver:
2727
box: myii/freebsd-12.2-master-py3
28-
- name: freebsd-130-3003-1-py3
28+
- name: freebsd-130-3004-0-py3
2929
driver:
30-
box: myii/freebsd-13.0-3003.1-py3
30+
box: myii/freebsd-13.0-3004.0-py3
3131
synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
32-
- name: freebsd-122-3003-1-py3
32+
- name: freebsd-122-3004-0-py3
3333
driver:
34-
box: myii/freebsd-12.2-3003.1-py3
34+
box: myii/freebsd-12.2-3004.0-py3

Diff for: ‎kitchen.yml

+106
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ platforms:
4040
driver:
4141
image: saltimages/salt-tiamat-py3:ubuntu-18.04
4242
run_command: /lib/systemd/systemd
43+
- name: centos-stream8-tiamat-py3
44+
driver:
45+
image: saltimages/salt-tiamat-py3:centos-stream8
4346
- name: centos-8-tiamat-py3
4447
driver:
4548
image: saltimages/salt-tiamat-py3:centos-8
@@ -83,6 +86,9 @@ platforms:
8386
driver:
8487
image: saltimages/salt-master-py3:ubuntu-18.04
8588
run_command: /lib/systemd/systemd
89+
- name: centos-stream8-master-py3
90+
driver:
91+
image: saltimages/salt-master-py3:centos-stream8
8692
- name: centos-8-master-py3
8793
driver:
8894
image: saltimages/salt-master-py3:centos-8
@@ -142,6 +148,89 @@ platforms:
142148
driver:
143149
image: saltimages/salt-master-py3:rockylinux-8
144150

151+
## SALT `3004.0`
152+
- name: debian-11-3004-0-py3
153+
driver:
154+
image: saltimages/salt-3004.0-py3:debian-11
155+
run_command: /lib/systemd/systemd
156+
- name: debian-10-3004-0-py3
157+
driver:
158+
image: saltimages/salt-3004.0-py3:debian-10
159+
run_command: /lib/systemd/systemd
160+
- name: debian-9-3004-0-py3
161+
driver:
162+
image: saltimages/salt-3004.0-py3:debian-9
163+
run_command: /lib/systemd/systemd
164+
- name: ubuntu-2004-3004-0-py3
165+
driver:
166+
image: saltimages/salt-3004.0-py3:ubuntu-20.04
167+
run_command: /lib/systemd/systemd
168+
- name: ubuntu-1804-3004-0-py3
169+
driver:
170+
image: saltimages/salt-3004.0-py3:ubuntu-18.04
171+
run_command: /lib/systemd/systemd
172+
- name: centos-stream8-3004-0-py3
173+
driver:
174+
image: saltimages/salt-3004.0-py3:centos-stream8
175+
- name: centos-8-3004-0-py3
176+
driver:
177+
image: saltimages/salt-3004.0-py3:centos-8
178+
- name: centos-7-3004-0-py3
179+
driver:
180+
image: saltimages/salt-3004.0-py3:centos-7
181+
- name: fedora-34-3004-0-py3
182+
driver:
183+
image: saltimages/salt-3004.0-py3:fedora-34
184+
- name: fedora-33-3004-0-py3
185+
driver:
186+
image: saltimages/salt-3004.0-py3:fedora-33
187+
- name: opensuse-leap-153-3004-0-py3
188+
driver:
189+
image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
190+
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
191+
# => SCP did not finish successfully (255): (Net::SCP::Error)
192+
transport:
193+
max_ssh_sessions: 1
194+
- name: opensuse-leap-152-3004-0-py3
195+
driver:
196+
image: saltimages/salt-3004.0-py3:opensuse-leap-15.2
197+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
198+
# => SCP did not finish successfully (255): (Net::SCP::Error)
199+
transport:
200+
max_ssh_sessions: 1
201+
- name: opensuse-tmbl-latest-3004-0-py3
202+
driver:
203+
image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
204+
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
205+
# => SCP did not finish successfully (255): (Net::SCP::Error)
206+
transport:
207+
max_ssh_sessions: 1
208+
- name: amazonlinux-2-3004-0-py3
209+
driver:
210+
image: saltimages/salt-3004.0-py3:amazonlinux-2
211+
- name: oraclelinux-8-3004-0-py3
212+
driver:
213+
image: saltimages/salt-3004.0-py3:oraclelinux-8
214+
- name: oraclelinux-7-3004-0-py3
215+
driver:
216+
image: saltimages/salt-3004.0-py3:oraclelinux-7
217+
- name: arch-base-latest-3004-0-py3
218+
driver:
219+
image: saltimages/salt-3004.0-py3:arch-base-latest
220+
- name: gentoo-stage3-latest-3004-0-py3
221+
driver:
222+
image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
223+
run_command: /sbin/init
224+
- name: gentoo-stage3-systemd-3004-0-py3
225+
driver:
226+
image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
227+
- name: almalinux-8-3004-0-py3
228+
driver:
229+
image: saltimages/salt-3004.0-py3:almalinux-8
230+
- name: rockylinux-8-3004-0-py3
231+
driver:
232+
image: saltimages/salt-3004.0-py3:rockylinux-8
233+
145234
## SALT `3003.3`
146235
- name: debian-11-3003-3-py3
147236
driver:
@@ -163,6 +252,9 @@ platforms:
163252
driver:
164253
image: saltimages/salt-3003.3-py3:ubuntu-18.04
165254
run_command: /lib/systemd/systemd
255+
- name: centos-stream8-3003-3-py3
256+
driver:
257+
image: saltimages/salt-3003.3-py3:centos-stream8
166258
- name: centos-8-3003-3-py3
167259
driver:
168260
image: saltimages/salt-3003.3-py3:centos-8
@@ -400,6 +492,7 @@ suites:
400492
- debian-9-tiamat-py3
401493
- ubuntu-2004-tiamat-py3
402494
- ubuntu-1804-tiamat-py3
495+
- centos-stream8-tiamat-py3
403496
- centos-8-tiamat-py3
404497
- centos-7-tiamat-py3
405498
- oraclelinux-8-tiamat-py3
@@ -410,16 +503,29 @@ suites:
410503
- debian-9-master-py3
411504
- ubuntu-2004-master-py3
412505
- ubuntu-1804-master-py3
506+
- centos-stream8-master-py3
413507
- centos-8-master-py3
414508
- centos-7-master-py3
415509
- oraclelinux-8-master-py3
416510
- almalinux-8-master-py3
417511
- rockylinux-8-master-py3
512+
- debian-11-3004-0-py3
513+
- debian-10-3004-0-py3
514+
- debian-9-3004-0-py3
515+
- ubuntu-2004-3004-0-py3
516+
- ubuntu-1804-3004-0-py3
517+
- centos-stream8-3004-0-py3
518+
- centos-8-3004-0-py3
519+
- centos-7-3004-0-py3
520+
- oraclelinux-8-3004-0-py3
521+
- almalinux-8-3004-0-py3
522+
- rockylinux-8-3004-0-py3
418523
- debian-11-3003-3-py3
419524
- debian-10-3003-3-py3
420525
- debian-9-3003-3-py3
421526
- ubuntu-2004-3003-3-py3
422527
- ubuntu-1804-3003-3-py3
528+
- centos-stream8-3003-3-py3
423529
- centos-8-3003-3-py3
424530
- centos-7-3003-3-py3
425531
- oraclelinux-8-3003-3-py3

0 commit comments

Comments
 (0)