Skip to content

Commit 43b98a0

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

File tree

4 files changed

+153
-5
lines changed

4 files changed

+153
-5
lines changed

Diff for: ‎.gitlab-ci.yml

+36-5
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ rubocop:
102102
###############################################################################
103103
# Define `test` template
104104
###############################################################################
105-
.test_instance:
105+
.test_instance: &test_instance
106106
stage: *stage_test
107107
image: *image_dindruby
108108
services: *services_docker_dind
@@ -117,6 +117,13 @@ rubocop:
117117
# Alternative value to consider: `${CI_JOB_NAME}`
118118
- 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
119119

120+
###############################################################################
121+
# Define `test` template (`allow_failure: true`)
122+
###############################################################################
123+
.test_instance_failure_permitted:
124+
<<: *test_instance
125+
allow_failure: true
126+
120127
###############################################################################
121128
# `test` stage: each instance below uses the `test` template above
122129
###############################################################################
@@ -128,6 +135,7 @@ rubocop:
128135
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
129136
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
130137
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
138+
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
131139
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
132140
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
133141
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -140,13 +148,14 @@ default-debian-10-master-py3: {extends: '.test_instance'}
140148
default-debian-9-master-py3: {extends: '.test_instance'}
141149
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
142150
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
151+
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
143152
# default-centos-8-master-py3: {extends: '.test_instance'}
144153
default-centos-7-master-py3: {extends: '.test_instance'}
145154
default-fedora-34-master-py3: {extends: '.test_instance'}
146155
default-fedora-33-master-py3: {extends: '.test_instance'}
147156
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
148157
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
149-
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
158+
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
150159
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
151160
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
152161
default-oraclelinux-7-master-py3: {extends: '.test_instance'}
@@ -155,18 +164,40 @@ default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
155164
default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
156165
# default-almalinux-8-master-py3: {extends: '.test_instance'}
157166
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
167+
# default-debian-11-3004-0-py3: {extends: '.test_instance'}
168+
# default-debian-10-3004-0-py3: {extends: '.test_instance'}
169+
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
170+
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
171+
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
172+
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
173+
# default-centos-8-3004-0-py3: {extends: '.test_instance'}
174+
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
175+
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
176+
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
177+
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
178+
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
179+
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
180+
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
181+
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
182+
# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
183+
# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
184+
# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
185+
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
186+
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
187+
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
158188
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
159189
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
160190
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
161191
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
162192
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
193+
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
163194
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
164195
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
165196
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
166197
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
167198
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
168199
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
169-
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
200+
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
170201
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
171202
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
172203
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
@@ -185,7 +216,7 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
185216
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
186217
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
187218
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
188-
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
219+
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
189220
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
190221
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
191222
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
@@ -202,7 +233,7 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
202233
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
203234
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
204235
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
205-
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
236+
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
206237
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
207238
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
208239
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}

Diff for: ‎.travis.yml

+24
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
@@ -100,6 +101,7 @@ jobs:
100101
- env: INSTANCE=default-debian-9-master-py3
101102
- env: INSTANCE=default-ubuntu-2004-master-py3
102103
- env: INSTANCE=default-ubuntu-1804-master-py3
104+
# - env: INSTANCE=default-centos-stream8-master-py3
103105
# - env: INSTANCE=default-centos-8-master-py3
104106
- env: INSTANCE=default-centos-7-master-py3
105107
- env: INSTANCE=default-fedora-34-master-py3
@@ -115,11 +117,33 @@ jobs:
115117
- env: INSTANCE=default-gentoo-stage3-systemd-master-py3
116118
# - env: INSTANCE=default-almalinux-8-master-py3
117119
# - env: INSTANCE=default-rockylinux-8-master-py3
120+
# - env: INSTANCE=default-debian-11-3004-0-py3
121+
# - env: INSTANCE=default-debian-10-3004-0-py3
122+
# - env: INSTANCE=default-debian-9-3004-0-py3
123+
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
124+
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
125+
# - env: INSTANCE=default-centos-stream8-3004-0-py3
126+
# - env: INSTANCE=default-centos-8-3004-0-py3
127+
# - env: INSTANCE=default-centos-7-3004-0-py3
128+
# - env: INSTANCE=default-fedora-34-3004-0-py3
129+
# - env: INSTANCE=default-fedora-33-3004-0-py3
130+
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
131+
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
132+
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
133+
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
134+
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
135+
# - env: INSTANCE=default-oraclelinux-7-3004-0-py3
136+
# - env: INSTANCE=default-arch-base-latest-3004-0-py3
137+
# - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
138+
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
139+
# - env: INSTANCE=default-almalinux-8-3004-0-py3
140+
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
118141
# - env: INSTANCE=default-debian-11-3003-3-py3
119142
# - env: INSTANCE=default-debian-10-3003-3-py3
120143
# - env: INSTANCE=default-debian-9-3003-3-py3
121144
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
122145
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
146+
# - env: INSTANCE=default-centos-stream8-3003-3-py3
123147
# - env: INSTANCE=default-centos-8-3003-3-py3
124148
# - env: INSTANCE=default-centos-7-3003-3-py3
125149
# - 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.yml

+92
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)