Skip to content

Commit 29a797a

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

File tree

4 files changed

+154
-7
lines changed

4 files changed

+154
-7
lines changed

‎.gitlab-ci.yml‎

Lines changed: 34 additions & 7 deletions
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'}
@@ -162,6 +163,10 @@ repo-ubuntu-2004-master-py3: {extends: '.test_instance'}
162163
# archive-ubuntu-1804-master-py3: {extends: '.test_instance'}
163164
# source-ubuntu-1804-master-py3: {extends: '.test_instance'}
164165
repo-ubuntu-1804-master-py3: {extends: '.test_instance'}
166+
default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
167+
# archive-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
168+
# source-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
169+
# repo-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
165170
default-centos-8-master-py3: {extends: '.test_instance'}
166171
# archive-centos-8-master-py3: {extends: '.test_instance'}
167172
# source-centos-8-master-py3: {extends: '.test_instance'}
@@ -186,10 +191,10 @@ default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
186191
# archive-opensuse-leap-152-master-py3: {extends: '.test_instance'}
187192
# source-opensuse-leap-152-master-py3: {extends: '.test_instance'}
188193
# repo-opensuse-leap-152-master-py3: {extends: '.test_instance'}
189-
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
190-
# archive-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
191-
# source-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
192-
# repo-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
194+
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
195+
# archive-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
196+
# source-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
197+
# repo-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
193198
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
194199
archive-amazonlinux-2-master-py3: {extends: '.test_instance'}
195200
# source-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -222,18 +227,40 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
222227
# archive-rockylinux-8-master-py3: {extends: '.test_instance'}
223228
# source-rockylinux-8-master-py3: {extends: '.test_instance'}
224229
# repo-rockylinux-8-master-py3: {extends: '.test_instance'}
230+
# default-debian-11-3004-0-py3: {extends: '.test_instance'}
231+
# default-debian-10-3004-0-py3: {extends: '.test_instance'}
232+
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
233+
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
234+
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
235+
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
236+
# default-centos-8-3004-0-py3: {extends: '.test_instance'}
237+
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
238+
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
239+
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
240+
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
241+
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
242+
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
243+
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
244+
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
245+
# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
246+
# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
247+
# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
248+
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
249+
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
250+
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
225251
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
226252
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
227253
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
228254
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
229255
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
256+
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
230257
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
231258
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
232259
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
233260
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
234261
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
235262
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
236-
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
263+
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
237264
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
238265
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
239266
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
@@ -252,7 +279,7 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
252279
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
253280
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
254281
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
255-
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
282+
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
256283
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
257284
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
258285
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
@@ -269,7 +296,7 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
269296
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
270297
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
271298
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
272-
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
299+
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
273300
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
274301
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
275302
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}

‎.travis.yml‎

Lines changed: 27 additions & 0 deletions
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
@@ -115,6 +116,10 @@ jobs:
115116
# - env: INSTANCE=archive-ubuntu-1804-master-py3
116117
# - env: INSTANCE=source-ubuntu-1804-master-py3
117118
- env: INSTANCE=repo-ubuntu-1804-master-py3
119+
- env: INSTANCE=default-centos-stream8-master-py3
120+
# - env: INSTANCE=archive-centos-stream8-master-py3
121+
# - env: INSTANCE=source-centos-stream8-master-py3
122+
# - env: INSTANCE=repo-centos-stream8-master-py3
118123
- env: INSTANCE=default-centos-8-master-py3
119124
# - env: INSTANCE=archive-centos-8-master-py3
120125
# - env: INSTANCE=source-centos-8-master-py3
@@ -175,11 +180,33 @@ jobs:
175180
# - env: INSTANCE=archive-rockylinux-8-master-py3
176181
# - env: INSTANCE=source-rockylinux-8-master-py3
177182
# - env: INSTANCE=repo-rockylinux-8-master-py3
183+
# - env: INSTANCE=default-debian-11-3004-0-py3
184+
# - env: INSTANCE=default-debian-10-3004-0-py3
185+
# - env: INSTANCE=default-debian-9-3004-0-py3
186+
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
187+
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
188+
# - env: INSTANCE=default-centos-stream8-3004-0-py3
189+
# - env: INSTANCE=default-centos-8-3004-0-py3
190+
# - env: INSTANCE=default-centos-7-3004-0-py3
191+
# - env: INSTANCE=default-fedora-34-3004-0-py3
192+
# - env: INSTANCE=default-fedora-33-3004-0-py3
193+
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
194+
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
195+
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
196+
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
197+
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
198+
# - env: INSTANCE=default-oraclelinux-7-3004-0-py3
199+
# - env: INSTANCE=default-arch-base-latest-3004-0-py3
200+
# - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
201+
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
202+
# - env: INSTANCE=default-almalinux-8-3004-0-py3
203+
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
178204
# - env: INSTANCE=default-debian-11-3003-3-py3
179205
# - env: INSTANCE=default-debian-10-3003-3-py3
180206
# - env: INSTANCE=default-debian-9-3003-3-py3
181207
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
182208
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
209+
# - env: INSTANCE=default-centos-stream8-3003-3-py3
183210
# - env: INSTANCE=default-centos-8-3003-3-py3
184211
# - env: INSTANCE=default-centos-7-3003-3-py3
185212
# - env: INSTANCE=default-fedora-34-3003-3-py3

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
/test/integration/**/libraries/system.rb @saltstack-formulas/ssf
2727
/test/integration/**/inspec.yml @saltstack-formulas/ssf
2828
/test/integration/**/README.md @saltstack-formulas/ssf
29+
/test/salt/pillar/top.sls @saltstack-formulas/ssf
2930
/.gitignore @saltstack-formulas/ssf
3031
/.cirrus.yml @saltstack-formulas/ssf
3132
/.gitlab-ci.yml @saltstack-formulas/ssf

‎kitchen.yml‎

Lines changed: 92 additions & 0 deletions
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

0 commit comments

Comments
 (0)