Skip to content

Commit 3c2ee6e

Browse files
myiimyii
committed
ci(kitchen+gitlab): update for new pre-salted images [skip ci]
* Automated using myii/ssf-formula#426
1 parent ffbaeb5 commit 3c2ee6e

File tree

3 files changed

+154
-230
lines changed

3 files changed

+154
-230
lines changed

‎.gitlab-ci.yml‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -219,55 +219,43 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
219219
# archive-rockylinux-8-master-py3: {extends: '.test_instance'}
220220
# source-rockylinux-8-master-py3: {extends: '.test_instance'}
221221
# repo-rockylinux-8-master-py3: {extends: '.test_instance'}
222-
# default-debian-11-3004-0-py3: {extends: '.test_instance'}
223-
# default-debian-10-3004-0-py3: {extends: '.test_instance'}
224-
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
225-
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
226-
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
227-
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
228-
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
229-
# default-fedora-35-3004-0-py3: {extends: '.test_instance'}
230-
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
222+
# default-debian-11-3004-1-py3: {extends: '.test_instance'}
223+
# default-debian-10-3004-1-py3: {extends: '.test_instance'}
224+
# default-debian-9-3004-1-py3: {extends: '.test_instance'}
225+
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
226+
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
227+
# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
228+
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
229+
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
230+
# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
231+
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
232+
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
233+
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
234+
# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
235+
# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
236+
# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
237+
# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
238+
# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
231239
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
232240
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
233-
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
234-
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
235-
# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
236-
# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
237-
# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
238-
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
239-
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
240-
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
241-
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
242-
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
243-
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
244-
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
245-
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
246-
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
247-
# default-fedora-35-3003-3-py3: {extends: '.test_instance'}
248-
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
249-
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
250-
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
251-
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
252-
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
253-
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
254-
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
255-
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
256-
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
257-
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
258-
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
259-
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
260-
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
261-
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
262-
# default-fedora-35-3002-7-py3: {extends: '.test_instance'}
263-
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
264-
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
265-
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
266-
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
267-
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
268-
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
269-
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
270-
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
241+
# default-debian-10-3003-4-py3: {extends: '.test_instance'}
242+
# default-debian-9-3003-4-py3: {extends: '.test_instance'}
243+
# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
244+
# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
245+
# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
246+
# default-centos-7-3003-4-py3: {extends: '.test_instance'}
247+
# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
248+
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
249+
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
250+
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
251+
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
252+
# default-debian-9-3002-8-py3: {extends: '.test_instance'}
253+
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
254+
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
255+
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
256+
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
257+
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
258+
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
271259
# yamllint enable rule:line-length
272260

273261
###############################################################################

‎.travis.yml‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -171,55 +171,43 @@ jobs:
171171
# - env: INSTANCE=archive-rockylinux-8-master-py3
172172
# - env: INSTANCE=source-rockylinux-8-master-py3
173173
# - env: INSTANCE=repo-rockylinux-8-master-py3
174-
# - env: INSTANCE=default-debian-11-3004-0-py3
175-
# - env: INSTANCE=default-debian-10-3004-0-py3
176-
# - env: INSTANCE=default-debian-9-3004-0-py3
177-
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
178-
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
179-
# - env: INSTANCE=default-centos-stream8-3004-0-py3
180-
# - env: INSTANCE=default-centos-7-3004-0-py3
181-
# - env: INSTANCE=default-fedora-35-3004-0-py3
182-
# - env: INSTANCE=default-fedora-34-3004-0-py3
174+
# - env: INSTANCE=default-debian-11-3004-1-py3
175+
# - env: INSTANCE=default-debian-10-3004-1-py3
176+
# - env: INSTANCE=default-debian-9-3004-1-py3
177+
# - env: INSTANCE=default-ubuntu-2004-3004-1-py3
178+
# - env: INSTANCE=default-ubuntu-1804-3004-1-py3
179+
# - env: INSTANCE=default-centos-stream8-3004-1-py3
180+
# - env: INSTANCE=default-centos-7-3004-1-py3
181+
# - env: INSTANCE=default-fedora-35-3004-1-py3
182+
# - env: INSTANCE=default-fedora-34-3004-1-py3
183+
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3
184+
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
185+
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
186+
# - env: INSTANCE=default-arch-base-latest-3004-1-py3
187+
# - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
188+
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
189+
# - env: INSTANCE=default-almalinux-8-3004-1-py3
190+
# - env: INSTANCE=default-rockylinux-8-3004-1-py3
183191
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
184192
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
185-
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
186-
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
187-
# - env: INSTANCE=default-oraclelinux-7-3004-0-py3
188-
# - env: INSTANCE=default-arch-base-latest-3004-0-py3
189-
# - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
190-
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
191-
# - env: INSTANCE=default-almalinux-8-3004-0-py3
192-
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
193-
# - env: INSTANCE=default-debian-10-3003-3-py3
194-
# - env: INSTANCE=default-debian-9-3003-3-py3
195-
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
196-
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
197-
# - env: INSTANCE=default-centos-stream8-3003-3-py3
198-
# - env: INSTANCE=default-centos-7-3003-3-py3
199-
# - env: INSTANCE=default-fedora-35-3003-3-py3
200-
# - env: INSTANCE=default-fedora-34-3003-3-py3
201-
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
202-
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
203-
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
204-
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
205-
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
206-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
207-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
208-
# - env: INSTANCE=default-almalinux-8-3003-3-py3
209-
# - env: INSTANCE=default-debian-10-3002-7-py3
210-
# - env: INSTANCE=default-debian-9-3002-7-py3
211-
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
212-
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
213-
# - env: INSTANCE=default-centos-7-3002-7-py3
214-
# - env: INSTANCE=default-fedora-35-3002-7-py3
215-
# - env: INSTANCE=default-fedora-34-3002-7-py3
216-
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
217-
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
218-
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
219-
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
220-
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
221-
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
222-
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
193+
# - env: INSTANCE=default-debian-10-3003-4-py3
194+
# - env: INSTANCE=default-debian-9-3003-4-py3
195+
# - env: INSTANCE=default-ubuntu-2004-3003-4-py3
196+
# - env: INSTANCE=default-ubuntu-1804-3003-4-py3
197+
# - env: INSTANCE=default-centos-stream8-3003-4-py3
198+
# - env: INSTANCE=default-centos-7-3003-4-py3
199+
# - env: INSTANCE=default-amazonlinux-2-3003-4-py3
200+
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
201+
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3
202+
# - env: INSTANCE=default-almalinux-8-3003-4-py3
203+
# - env: INSTANCE=default-debian-10-3002-8-py3
204+
# - env: INSTANCE=default-debian-9-3002-8-py3
205+
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
206+
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
207+
# - env: INSTANCE=default-centos-7-3002-8-py3
208+
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
209+
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
210+
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3
223211

224212
## Define the release stage that runs `semantic-release`
225213
- stage: 'release'

0 commit comments

Comments
 (0)