Skip to content

Commit def6993

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

File tree

6 files changed

+176
-13
lines changed

6 files changed

+176
-13
lines changed

‎.github/workflows/kitchen.vagrant.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
instance:
1717
- freebsd-freebsd-130-master-py3
1818
- freebsd-freebsd-122-master-py3
19-
# - freebsd-freebsd-130-3003-1-py3
20-
# - freebsd-freebsd-122-3003-1-py3
19+
# - freebsd-freebsd-130-3004-0-py3
20+
# - freebsd-freebsd-122-3004-0-py3
2121
steps:
2222
- name: 'Check out code'
2323
uses: 'actions/checkout@v2'

‎.gitlab-ci.yml

+33-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
# debian-debian-9-tiamat-py3: {extends: '.test_instance'}
129136
# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
130137
# ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
138+
# redhat-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
131139
# redhat-centos-8-tiamat-py3: {extends: '.test_instance'}
132140
# redhat-centos-7-tiamat-py3: {extends: '.test_instance'}
133141
# redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -140,30 +148,50 @@ debian-debian-10-master-py3: {extends: '.test_instance'}
140148
debian-debian-9-master-py3: {extends: '.test_instance'}
141149
ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
142150
ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
151+
redhat-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
143152
redhat-centos-8-master-py3: {extends: '.test_instance'}
144153
redhat-centos-7-master-py3: {extends: '.test_instance'}
145154
redhat-fedora-34-master-py3: {extends: '.test_instance'}
146155
redhat-fedora-33-master-py3: {extends: '.test_instance'}
147156
suse-opensuse-leap-153-master-py3: {extends: '.test_instance'}
148157
suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
149-
suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
158+
suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
150159
redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
151160
redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
152161
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
153162
redhat-almalinux-8-master-py3: {extends: '.test_instance'}
154163
redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
164+
# debian-debian-11-3004-0-py3: {extends: '.test_instance'}
165+
# debian-debian-10-3004-0-py3: {extends: '.test_instance'}
166+
# debian-debian-9-3004-0-py3: {extends: '.test_instance'}
167+
# ubuntu-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
168+
# ubuntu-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
169+
# redhat-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
170+
# redhat-centos-8-3004-0-py3: {extends: '.test_instance'}
171+
# redhat-centos-7-3004-0-py3: {extends: '.test_instance'}
172+
# redhat-fedora-34-3004-0-py3: {extends: '.test_instance'}
173+
# redhat-fedora-33-3004-0-py3: {extends: '.test_instance'}
174+
# suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
175+
# suse-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
176+
# suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
177+
# redhat-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
178+
# redhat-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
179+
# redhat-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
180+
# redhat-almalinux-8-3004-0-py3: {extends: '.test_instance'}
181+
# redhat-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
155182
# debian-debian-11-3003-3-py3: {extends: '.test_instance'}
156183
# debian-debian-10-3003-3-py3: {extends: '.test_instance'}
157184
# debian-debian-9-3003-3-py3: {extends: '.test_instance'}
158185
# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
159186
# ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
187+
# redhat-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
160188
# redhat-centos-8-3003-3-py3: {extends: '.test_instance'}
161189
# redhat-centos-7-3003-3-py3: {extends: '.test_instance'}
162190
# redhat-fedora-34-3003-3-py3: {extends: '.test_instance'}
163191
# redhat-fedora-33-3003-3-py3: {extends: '.test_instance'}
164192
# suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
165193
# suse-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
166-
# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
194+
# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
167195
# redhat-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
168196
# redhat-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
169197
# redhat-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
@@ -179,7 +207,7 @@ redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
179207
# redhat-fedora-33-3002-7-py3: {extends: '.test_instance'}
180208
# suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
181209
# suse-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
182-
# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
210+
# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
183211
# redhat-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
184212
# redhat-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
185213
# redhat-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
@@ -193,7 +221,7 @@ redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
193221
# redhat-fedora-33-3001-8-py3: {extends: '.test_instance'}
194222
# suse-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
195223
# suse-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
196-
# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
224+
# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
197225
# redhat-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
198226
# redhat-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
199227
# redhat-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}

‎.travis.yml

+21
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
# - env: INSTANCE=debian-debian-9-tiamat-py3
8989
# - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
9090
# - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
91+
# - env: INSTANCE=redhat-centos-stream8-tiamat-py3
9192
# - env: INSTANCE=redhat-centos-8-tiamat-py3
9293
# - env: INSTANCE=redhat-centos-7-tiamat-py3
9394
# - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3
@@ -100,6 +101,7 @@ jobs:
100101
- env: INSTANCE=debian-debian-9-master-py3
101102
- env: INSTANCE=ubuntu-ubuntu-2004-master-py3
102103
- env: INSTANCE=ubuntu-ubuntu-1804-master-py3
104+
- env: INSTANCE=redhat-centos-stream8-master-py3
103105
- env: INSTANCE=redhat-centos-8-master-py3
104106
- env: INSTANCE=redhat-centos-7-master-py3
105107
- env: INSTANCE=redhat-fedora-34-master-py3
@@ -112,11 +114,30 @@ jobs:
112114
- env: INSTANCE=redhat-oraclelinux-7-master-py3
113115
- env: INSTANCE=redhat-almalinux-8-master-py3
114116
- env: INSTANCE=redhat-rockylinux-8-master-py3
117+
# - env: INSTANCE=debian-debian-11-3004-0-py3
118+
# - env: INSTANCE=debian-debian-10-3004-0-py3
119+
# - env: INSTANCE=debian-debian-9-3004-0-py3
120+
# - env: INSTANCE=ubuntu-ubuntu-2004-3004-0-py3
121+
# - env: INSTANCE=ubuntu-ubuntu-1804-3004-0-py3
122+
# - env: INSTANCE=redhat-centos-stream8-3004-0-py3
123+
# - env: INSTANCE=redhat-centos-8-3004-0-py3
124+
# - env: INSTANCE=redhat-centos-7-3004-0-py3
125+
# - env: INSTANCE=redhat-fedora-34-3004-0-py3
126+
# - env: INSTANCE=redhat-fedora-33-3004-0-py3
127+
# - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3
128+
# - env: INSTANCE=suse-opensuse-leap-152-3004-0-py3
129+
# - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3
130+
# - env: INSTANCE=redhat-amazonlinux-2-3004-0-py3
131+
# - env: INSTANCE=redhat-oraclelinux-8-3004-0-py3
132+
# - env: INSTANCE=redhat-oraclelinux-7-3004-0-py3
133+
# - env: INSTANCE=redhat-almalinux-8-3004-0-py3
134+
# - env: INSTANCE=redhat-rockylinux-8-3004-0-py3
115135
# - env: INSTANCE=debian-debian-11-3003-3-py3
116136
# - env: INSTANCE=debian-debian-10-3003-3-py3
117137
# - env: INSTANCE=debian-debian-9-3003-3-py3
118138
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
119139
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
140+
# - env: INSTANCE=redhat-centos-stream8-3003-3-py3
120141
# - env: INSTANCE=redhat-centos-8-3003-3-py3
121142
# - env: INSTANCE=redhat-centos-7-3003-3-py3
122143
# - env: INSTANCE=redhat-fedora-34-3003-3-py3

‎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

‎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

‎kitchen.yml

+115-2
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
@@ -380,6 +472,9 @@ suites:
380472
- debian-11-master-py3
381473
- debian-10-master-py3
382474
- debian-9-master-py3
475+
- debian-11-3004-0-py3
476+
- debian-10-3004-0-py3
477+
- debian-9-3004-0-py3
383478
- debian-11-3003-3-py3
384479
- debian-10-3003-3-py3
385480
- debian-9-3003-3-py3
@@ -415,6 +510,8 @@ suites:
415510
- ubuntu-1804-tiamat-py3
416511
- ubuntu-2004-master-py3
417512
- ubuntu-1804-master-py3
513+
- ubuntu-2004-3004-0-py3
514+
- ubuntu-1804-3004-0-py3
418515
- ubuntu-2004-3003-3-py3
419516
- ubuntu-1804-3003-3-py3
420517
- ubuntu-2004-3002-7-py3
@@ -446,13 +543,15 @@ suites:
446543
- path: test/integration/default
447544
- name: redhat
448545
includes:
546+
- centos-stream8-tiamat-py3
449547
- centos-8-tiamat-py3
450548
- centos-7-tiamat-py3
451549
- amazonlinux-2-tiamat-py3
452550
- oraclelinux-8-tiamat-py3
453551
- oraclelinux-7-tiamat-py3
454552
- almalinux-8-tiamat-py3
455553
- rockylinux-8-tiamat-py3
554+
- centos-stream8-master-py3
456555
- centos-8-master-py3
457556
- centos-7-master-py3
458557
- fedora-34-master-py3
@@ -462,6 +561,17 @@ suites:
462561
- oraclelinux-7-master-py3
463562
- almalinux-8-master-py3
464563
- rockylinux-8-master-py3
564+
- centos-stream8-3004-0-py3
565+
- centos-8-3004-0-py3
566+
- centos-7-3004-0-py3
567+
- fedora-34-3004-0-py3
568+
- fedora-33-3004-0-py3
569+
- amazonlinux-2-3004-0-py3
570+
- oraclelinux-8-3004-0-py3
571+
- oraclelinux-7-3004-0-py3
572+
- almalinux-8-3004-0-py3
573+
- rockylinux-8-3004-0-py3
574+
- centos-stream8-3003-3-py3
465575
- centos-8-3003-3-py3
466576
- centos-7-3003-3-py3
467577
- fedora-34-3003-3-py3
@@ -505,6 +615,9 @@ suites:
505615
- opensuse-leap-153-master-py3
506616
- opensuse-leap-152-master-py3
507617
- opensuse-tmbl-latest-master-py3
618+
- opensuse-leap-153-3004-0-py3
619+
- opensuse-leap-152-3004-0-py3
620+
- opensuse-tmbl-latest-3004-0-py3
508621
- opensuse-leap-153-3003-3-py3
509622
- opensuse-leap-152-3003-3-py3
510623
- opensuse-tmbl-latest-3003-3-py3
@@ -534,8 +647,8 @@ suites:
534647
includes:
535648
- freebsd-130-master-py3
536649
- freebsd-122-master-py3
537-
- freebsd-130-3003-1-py3
538-
- freebsd-122-3003-1-py3
650+
- freebsd-130-3004-0-py3
651+
- freebsd-122-3004-0-py3
539652
provisioner:
540653
state_top:
541654
base:

0 commit comments

Comments
 (0)