Skip to content

Commit e041418

Browse files
myiimyii
committed
ci(kitchen+ci): update with latest CVE pre-salted images [skip ci]
* Automated using myii/ssf-formula#374
1 parent 3233185 commit e041418

File tree

6 files changed

+251
-371
lines changed

6 files changed

+251
-371
lines changed

‎.github/workflows/kitchen.vagrant.yml

-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ jobs:
1818
# - freebsd-130-master-py3
1919
- default-freebsd-122-master-py3
2020
# - freebsd-122-master-py3
21-
- default-freebsd-114-master-py3
22-
# - freebsd-114-master-py3
2321
# - default-freebsd-130-3003-1-py3
2422
# - default-freebsd-122-3003-1-py3
25-
# - default-freebsd-114-3003-1-py3
2623
steps:
2724
- name: 'Check out code'
2825
uses: 'actions/checkout@v2'

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ tmp/
127127
# `salt-formula` -- Vagrant Specific files
128128
.vagrant
129129
top.sls
130+
!test/salt/pillar/top.sls
130131

131132
# `suricata-formula` -- Platform binaries
132133
*.rpm

‎.gitlab-ci.yml

+54-71
Original file line numberDiff line numberDiff line change
@@ -192,77 +192,60 @@ almalinux-8-master-py3: {extends: '.test_instance'}
192192
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
193193
# passenger-rockylinux-8-master-py3: {extends: '.test_instance'}
194194
rockylinux-8-master-py3: {extends: '.test_instance'}
195-
# default-debian-11-3003-2-py3: {extends: '.test_instance'}
196-
# default-debian-10-3003-2-py3: {extends: '.test_instance'}
197-
# default-debian-9-3003-2-py3: {extends: '.test_instance'}
198-
# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
199-
# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
200-
# default-centos-8-3003-2-py3: {extends: '.test_instance'}
201-
# default-centos-7-3003-2-py3: {extends: '.test_instance'}
202-
# default-fedora-34-3003-2-py3: {extends: '.test_instance'}
203-
# default-fedora-33-3003-2-py3: {extends: '.test_instance'}
204-
# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
205-
# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
206-
# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
207-
# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
208-
# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
209-
# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
210-
# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
211-
# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
212-
# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
213-
# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
214-
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
215-
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
216-
# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
217-
# default-debian-11-3002-6-py3: {extends: '.test_instance'}
218-
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
219-
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
220-
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
221-
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
222-
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
223-
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
224-
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
225-
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
226-
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
227-
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
228-
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
229-
# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
230-
# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
231-
# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
232-
# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
233-
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
234-
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
235-
# default-debian-10-3001-7-py3: {extends: '.test_instance'}
236-
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
237-
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
238-
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
239-
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
240-
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
241-
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
242-
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
243-
# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
244-
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
245-
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
246-
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
247-
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
248-
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
249-
# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
250-
# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
251-
# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
252-
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
253-
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
254-
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
255-
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
256-
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
257-
# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
258-
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
259-
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
260-
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
261-
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
262-
# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
263-
# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
264-
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
265-
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
195+
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
196+
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
197+
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
198+
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
199+
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
200+
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
201+
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
202+
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
203+
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
204+
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
205+
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
206+
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
207+
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
208+
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
209+
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
210+
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
211+
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
212+
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
213+
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
214+
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
215+
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
216+
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
217+
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
218+
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
219+
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
220+
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
221+
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
222+
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
223+
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
224+
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
225+
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
226+
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
227+
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
228+
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
229+
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
230+
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
231+
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
232+
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
233+
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
234+
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
235+
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
236+
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
237+
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
238+
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
239+
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
240+
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
241+
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
242+
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
243+
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
244+
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
245+
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
246+
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
247+
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
248+
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
266249

267250
###############################################################################
268251
# `release` stage: `semantic-release`

‎.travis.yml

+54-71
Original file line numberDiff line numberDiff line change
@@ -145,77 +145,60 @@ jobs:
145145
# - env: INSTANCE=default-rockylinux-8-master-py3
146146
# - env: INSTANCE=passenger-rockylinux-8-master-py3
147147
- env: INSTANCE=rockylinux-8-master-py3
148-
# - env: INSTANCE=default-debian-11-3003-2-py3
149-
# - env: INSTANCE=default-debian-10-3003-2-py3
150-
# - env: INSTANCE=default-debian-9-3003-2-py3
151-
# - env: INSTANCE=default-ubuntu-2004-3003-2-py3
152-
# - env: INSTANCE=default-ubuntu-1804-3003-2-py3
153-
# - env: INSTANCE=default-centos-8-3003-2-py3
154-
# - env: INSTANCE=default-centos-7-3003-2-py3
155-
# - env: INSTANCE=default-fedora-34-3003-2-py3
156-
# - env: INSTANCE=default-fedora-33-3003-2-py3
157-
# - env: INSTANCE=default-opensuse-leap-153-3003-2-py3
158-
# - env: INSTANCE=default-opensuse-leap-152-3003-2-py3
159-
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3
160-
# - env: INSTANCE=default-amazonlinux-2-3003-2-py3
161-
# - env: INSTANCE=default-oraclelinux-8-3003-2-py3
162-
# - env: INSTANCE=default-oraclelinux-7-3003-2-py3
163-
# - env: INSTANCE=default-arch-base-latest-3003-2-py3
164-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3
165-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3
166-
# - env: INSTANCE=default-almalinux-8-3003-2-py3
167-
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
168-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
169-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
170-
# - env: INSTANCE=default-debian-11-3002-6-py3
171-
# - env: INSTANCE=default-debian-10-3002-6-py3
172-
# - env: INSTANCE=default-debian-9-3002-6-py3
173-
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
174-
# - env: INSTANCE=default-ubuntu-1804-3002-6-py3
175-
# - env: INSTANCE=default-centos-8-3002-6-py3
176-
# - env: INSTANCE=default-centos-7-3002-6-py3
177-
# - env: INSTANCE=default-fedora-34-3002-6-py3
178-
# - env: INSTANCE=default-fedora-33-3002-6-py3
179-
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
180-
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
181-
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
182-
# - env: INSTANCE=default-arch-base-latest-3002-6-py3
183-
# - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3
184-
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3
185-
# - env: INSTANCE=default-opensuse-leap-153-3002-2-py3
186-
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
187-
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
188-
# - env: INSTANCE=default-debian-10-3001-7-py3
189-
# - env: INSTANCE=default-debian-9-3001-7-py3
190-
# - env: INSTANCE=default-ubuntu-2004-3001-7-py3
191-
# - env: INSTANCE=default-ubuntu-1804-3001-7-py3
192-
# - env: INSTANCE=default-centos-8-3001-7-py3
193-
# - env: INSTANCE=default-centos-7-3001-7-py3
194-
# - env: INSTANCE=default-fedora-34-3001-7-py3
195-
# - env: INSTANCE=default-fedora-33-3001-7-py3
196-
# - env: INSTANCE=default-opensuse-leap-153-3001-7-py3
197-
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
198-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
199-
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
200-
# - env: INSTANCE=default-oraclelinux-8-3001-7-py3
201-
# - env: INSTANCE=default-oraclelinux-7-3001-7-py3
202-
# - env: INSTANCE=default-arch-base-latest-3001-7-py3
203-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3
204-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3
205-
# - env: INSTANCE=default-debian-10-3000-9-py3
206-
# - env: INSTANCE=default-debian-9-3000-9-py3
207-
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
208-
# - env: INSTANCE=default-centos-8-3000-9-py3
209-
# - env: INSTANCE=default-centos-7-3000-9-py3
210-
# - env: INSTANCE=default-opensuse-leap-153-3000-9-py3
211-
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
212-
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
213-
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
214-
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
215-
# - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3
216-
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3
217-
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
218-
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
148+
# - env: INSTANCE=default-debian-11-3003-3-py3
149+
# - env: INSTANCE=default-debian-10-3003-3-py3
150+
# - env: INSTANCE=default-debian-9-3003-3-py3
151+
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
152+
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
153+
# - env: INSTANCE=default-centos-8-3003-3-py3
154+
# - env: INSTANCE=default-centos-7-3003-3-py3
155+
# - env: INSTANCE=default-fedora-34-3003-3-py3
156+
# - env: INSTANCE=default-fedora-33-3003-3-py3
157+
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
158+
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
159+
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
160+
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
161+
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
162+
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
163+
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
164+
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
165+
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
166+
# - env: INSTANCE=default-almalinux-8-3003-3-py3
167+
# - env: INSTANCE=default-debian-11-3002-7-py3
168+
# - env: INSTANCE=default-debian-10-3002-7-py3
169+
# - env: INSTANCE=default-debian-9-3002-7-py3
170+
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
171+
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
172+
# - env: INSTANCE=default-centos-8-3002-7-py3
173+
# - env: INSTANCE=default-centos-7-3002-7-py3
174+
# - env: INSTANCE=default-fedora-34-3002-7-py3
175+
# - env: INSTANCE=default-fedora-33-3002-7-py3
176+
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
177+
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
178+
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
179+
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
180+
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
181+
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
182+
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
183+
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
184+
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
185+
# - env: INSTANCE=default-debian-10-3001-8-py3
186+
# - env: INSTANCE=default-debian-9-3001-8-py3
187+
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
188+
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
189+
# - env: INSTANCE=default-centos-8-3001-8-py3
190+
# - env: INSTANCE=default-centos-7-3001-8-py3
191+
# - env: INSTANCE=default-fedora-34-3001-8-py3
192+
# - env: INSTANCE=default-fedora-33-3001-8-py3
193+
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
194+
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
195+
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
196+
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
197+
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
198+
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
199+
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
200+
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
201+
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
219202

220203
## Define the release stage that runs `semantic-release`
221204
- stage: 'release'

‎kitchen.vagrant.yml

-6
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,10 @@ platforms:
2525
- name: freebsd-122-master-py3
2626
driver:
2727
box: myii/freebsd-12.2-master-py3
28-
- name: freebsd-114-master-py3
29-
driver:
30-
box: myii/freebsd-11.4-master-py3
3128
- name: freebsd-130-3003-1-py3
3229
driver:
3330
box: myii/freebsd-13.0-3003.1-py3
3431
synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
3532
- name: freebsd-122-3003-1-py3
3633
driver:
3734
box: myii/freebsd-12.2-3003.1-py3
38-
- name: freebsd-114-3003-1-py3
39-
driver:
40-
box: myii/freebsd-11.4-3003.1-py3

0 commit comments

Comments
 (0)