Skip to content

Commit 6988c3f

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

File tree

4 files changed

+227
-331
lines changed

4 files changed

+227
-331
lines changed

‎.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
@@ -155,77 +155,60 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'}
155155
default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
156156
default-almalinux-8-master-py3: {extends: '.test_instance'}
157157
default-rockylinux-8-master-py3: {extends: '.test_instance'}
158-
# default-debian-11-3003-2-py3: {extends: '.test_instance'}
159-
# default-debian-10-3003-2-py3: {extends: '.test_instance'}
160-
# default-debian-9-3003-2-py3: {extends: '.test_instance'}
161-
# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
162-
# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
163-
# default-centos-8-3003-2-py3: {extends: '.test_instance'}
164-
# default-centos-7-3003-2-py3: {extends: '.test_instance'}
165-
# default-fedora-34-3003-2-py3: {extends: '.test_instance'}
166-
# default-fedora-33-3003-2-py3: {extends: '.test_instance'}
167-
# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
168-
# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
169-
# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
170-
# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
171-
# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
172-
# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
173-
# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
174-
# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
175-
# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
176-
# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
177-
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
178-
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
179-
# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
180-
# default-debian-11-3002-6-py3: {extends: '.test_instance'}
181-
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
182-
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
183-
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
184-
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
185-
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
186-
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
187-
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
188-
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
189-
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
190-
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
191-
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
192-
# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
193-
# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
194-
# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
195-
# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
196-
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
197-
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
198-
# default-debian-10-3001-7-py3: {extends: '.test_instance'}
199-
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
200-
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
201-
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
202-
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
203-
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
204-
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
205-
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
206-
# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
207-
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
208-
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
209-
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
210-
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
211-
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
212-
# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
213-
# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
214-
# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
215-
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
216-
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
217-
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
218-
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
219-
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
220-
# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
221-
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
222-
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
223-
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
224-
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
225-
# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
226-
# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
227-
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
228-
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
158+
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
159+
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
160+
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
161+
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
162+
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
163+
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
164+
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
165+
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
166+
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
167+
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
168+
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
169+
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
170+
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
171+
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
172+
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
173+
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
174+
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
175+
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
176+
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
177+
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
178+
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
179+
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
180+
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
181+
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
182+
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
183+
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
184+
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
185+
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
186+
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
187+
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
188+
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
189+
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
190+
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
191+
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
192+
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
193+
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
194+
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
195+
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
196+
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
197+
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
198+
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
199+
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
200+
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
201+
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
202+
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
203+
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
204+
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
205+
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
206+
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
207+
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
208+
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
209+
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
210+
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
211+
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
229212

230213
###############################################################################
231214
# `release` stage: `semantic-release`

‎.travis.yml

+54-71
Original file line numberDiff line numberDiff line change
@@ -115,77 +115,60 @@ jobs:
115115
- env: INSTANCE=default-gentoo-stage3-systemd-master-py3
116116
- env: INSTANCE=default-almalinux-8-master-py3
117117
- env: INSTANCE=default-rockylinux-8-master-py3
118-
# - env: INSTANCE=default-debian-11-3003-2-py3
119-
# - env: INSTANCE=default-debian-10-3003-2-py3
120-
# - env: INSTANCE=default-debian-9-3003-2-py3
121-
# - env: INSTANCE=default-ubuntu-2004-3003-2-py3
122-
# - env: INSTANCE=default-ubuntu-1804-3003-2-py3
123-
# - env: INSTANCE=default-centos-8-3003-2-py3
124-
# - env: INSTANCE=default-centos-7-3003-2-py3
125-
# - env: INSTANCE=default-fedora-34-3003-2-py3
126-
# - env: INSTANCE=default-fedora-33-3003-2-py3
127-
# - env: INSTANCE=default-opensuse-leap-153-3003-2-py3
128-
# - env: INSTANCE=default-opensuse-leap-152-3003-2-py3
129-
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3
130-
# - env: INSTANCE=default-amazonlinux-2-3003-2-py3
131-
# - env: INSTANCE=default-oraclelinux-8-3003-2-py3
132-
# - env: INSTANCE=default-oraclelinux-7-3003-2-py3
133-
# - env: INSTANCE=default-arch-base-latest-3003-2-py3
134-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3
135-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3
136-
# - env: INSTANCE=default-almalinux-8-3003-2-py3
137-
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
138-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
139-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
140-
# - env: INSTANCE=default-debian-11-3002-6-py3
141-
# - env: INSTANCE=default-debian-10-3002-6-py3
142-
# - env: INSTANCE=default-debian-9-3002-6-py3
143-
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
144-
# - env: INSTANCE=default-ubuntu-1804-3002-6-py3
145-
# - env: INSTANCE=default-centos-8-3002-6-py3
146-
# - env: INSTANCE=default-centos-7-3002-6-py3
147-
# - env: INSTANCE=default-fedora-34-3002-6-py3
148-
# - env: INSTANCE=default-fedora-33-3002-6-py3
149-
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
150-
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
151-
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
152-
# - env: INSTANCE=default-arch-base-latest-3002-6-py3
153-
# - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3
154-
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3
155-
# - env: INSTANCE=default-opensuse-leap-153-3002-2-py3
156-
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
157-
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
158-
# - env: INSTANCE=default-debian-10-3001-7-py3
159-
# - env: INSTANCE=default-debian-9-3001-7-py3
160-
# - env: INSTANCE=default-ubuntu-2004-3001-7-py3
161-
# - env: INSTANCE=default-ubuntu-1804-3001-7-py3
162-
# - env: INSTANCE=default-centos-8-3001-7-py3
163-
# - env: INSTANCE=default-centos-7-3001-7-py3
164-
# - env: INSTANCE=default-fedora-34-3001-7-py3
165-
# - env: INSTANCE=default-fedora-33-3001-7-py3
166-
# - env: INSTANCE=default-opensuse-leap-153-3001-7-py3
167-
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
168-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
169-
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
170-
# - env: INSTANCE=default-oraclelinux-8-3001-7-py3
171-
# - env: INSTANCE=default-oraclelinux-7-3001-7-py3
172-
# - env: INSTANCE=default-arch-base-latest-3001-7-py3
173-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3
174-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3
175-
# - env: INSTANCE=default-debian-10-3000-9-py3
176-
# - env: INSTANCE=default-debian-9-3000-9-py3
177-
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
178-
# - env: INSTANCE=default-centos-8-3000-9-py3
179-
# - env: INSTANCE=default-centos-7-3000-9-py3
180-
# - env: INSTANCE=default-opensuse-leap-153-3000-9-py3
181-
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
182-
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
183-
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
184-
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
185-
# - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3
186-
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3
187-
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
188-
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
118+
# - env: INSTANCE=default-debian-11-3003-3-py3
119+
# - env: INSTANCE=default-debian-10-3003-3-py3
120+
# - env: INSTANCE=default-debian-9-3003-3-py3
121+
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
122+
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
123+
# - env: INSTANCE=default-centos-8-3003-3-py3
124+
# - env: INSTANCE=default-centos-7-3003-3-py3
125+
# - env: INSTANCE=default-fedora-34-3003-3-py3
126+
# - env: INSTANCE=default-fedora-33-3003-3-py3
127+
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
128+
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
129+
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
130+
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
131+
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
132+
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
133+
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
134+
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
135+
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
136+
# - env: INSTANCE=default-almalinux-8-3003-3-py3
137+
# - env: INSTANCE=default-debian-11-3002-7-py3
138+
# - env: INSTANCE=default-debian-10-3002-7-py3
139+
# - env: INSTANCE=default-debian-9-3002-7-py3
140+
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
141+
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
142+
# - env: INSTANCE=default-centos-8-3002-7-py3
143+
# - env: INSTANCE=default-centos-7-3002-7-py3
144+
# - env: INSTANCE=default-fedora-34-3002-7-py3
145+
# - env: INSTANCE=default-fedora-33-3002-7-py3
146+
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
147+
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
148+
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
149+
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
150+
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
151+
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
152+
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
153+
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
154+
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
155+
# - env: INSTANCE=default-debian-10-3001-8-py3
156+
# - env: INSTANCE=default-debian-9-3001-8-py3
157+
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
158+
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
159+
# - env: INSTANCE=default-centos-8-3001-8-py3
160+
# - env: INSTANCE=default-centos-7-3001-8-py3
161+
# - env: INSTANCE=default-fedora-34-3001-8-py3
162+
# - env: INSTANCE=default-fedora-33-3001-8-py3
163+
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
164+
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
165+
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
166+
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
167+
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
168+
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
169+
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
170+
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
171+
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
189172

190173
## Define the release stage that runs `semantic-release`
191174
- stage: 'release'

0 commit comments

Comments
 (0)