Skip to content

Commit 41a3819

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

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
@@ -200,55 +200,43 @@ almalinux-8-master-py3: {extends: '.test_instance'}
200200
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
201201
# appended-rockylinux-8-master-py3: {extends: '.test_instance'}
202202
rockylinux-8-master-py3: {extends: '.test_instance'}
203-
# default-debian-11-3004-0-py3: {extends: '.test_instance'}
204-
# default-debian-10-3004-0-py3: {extends: '.test_instance'}
205-
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
206-
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
207-
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
208-
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
209-
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
210-
# default-fedora-35-3004-0-py3: {extends: '.test_instance'}
211-
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
203+
# default-debian-11-3004-1-py3: {extends: '.test_instance'}
204+
# default-debian-10-3004-1-py3: {extends: '.test_instance'}
205+
# default-debian-9-3004-1-py3: {extends: '.test_instance'}
206+
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
207+
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
208+
# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
209+
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
210+
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
211+
# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
212+
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
213+
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
214+
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
215+
# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
216+
# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
217+
# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
218+
# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
219+
# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
212220
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
213221
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
214-
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
215-
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
216-
# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
217-
# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
218-
# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
219-
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
220-
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
221-
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
222-
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
223-
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
224-
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
225-
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
226-
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
227-
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
228-
# default-fedora-35-3003-3-py3: {extends: '.test_instance'}
229-
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
230-
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
231-
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
232-
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
233-
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
234-
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
235-
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
236-
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
237-
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
238-
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
239-
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
240-
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
241-
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
242-
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
243-
# default-fedora-35-3002-7-py3: {extends: '.test_instance'}
244-
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
245-
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
246-
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
247-
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
248-
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
249-
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
250-
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
251-
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
222+
# default-debian-10-3003-4-py3: {extends: '.test_instance'}
223+
# default-debian-9-3003-4-py3: {extends: '.test_instance'}
224+
# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
225+
# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
226+
# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
227+
# default-centos-7-3003-4-py3: {extends: '.test_instance'}
228+
# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
229+
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
230+
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
231+
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
232+
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
233+
# default-debian-9-3002-8-py3: {extends: '.test_instance'}
234+
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
235+
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
236+
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
237+
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
238+
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
239+
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
252240
# yamllint enable rule:line-length
253241

254242
###############################################################################

‎.travis.yml‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -152,55 +152,43 @@ jobs:
152152
# - env: INSTANCE=default-rockylinux-8-master-py3
153153
# - env: INSTANCE=appended-rockylinux-8-master-py3
154154
- env: INSTANCE=rockylinux-8-master-py3
155-
# - env: INSTANCE=default-debian-11-3004-0-py3
156-
# - env: INSTANCE=default-debian-10-3004-0-py3
157-
# - env: INSTANCE=default-debian-9-3004-0-py3
158-
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
159-
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
160-
# - env: INSTANCE=default-centos-stream8-3004-0-py3
161-
# - env: INSTANCE=default-centos-7-3004-0-py3
162-
# - env: INSTANCE=default-fedora-35-3004-0-py3
163-
# - env: INSTANCE=default-fedora-34-3004-0-py3
155+
# - env: INSTANCE=default-debian-11-3004-1-py3
156+
# - env: INSTANCE=default-debian-10-3004-1-py3
157+
# - env: INSTANCE=default-debian-9-3004-1-py3
158+
# - env: INSTANCE=default-ubuntu-2004-3004-1-py3
159+
# - env: INSTANCE=default-ubuntu-1804-3004-1-py3
160+
# - env: INSTANCE=default-centos-stream8-3004-1-py3
161+
# - env: INSTANCE=default-centos-7-3004-1-py3
162+
# - env: INSTANCE=default-fedora-35-3004-1-py3
163+
# - env: INSTANCE=default-fedora-34-3004-1-py3
164+
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3
165+
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
166+
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
167+
# - env: INSTANCE=default-arch-base-latest-3004-1-py3
168+
# - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
169+
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
170+
# - env: INSTANCE=default-almalinux-8-3004-1-py3
171+
# - env: INSTANCE=default-rockylinux-8-3004-1-py3
164172
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
165173
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
166-
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
167-
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
168-
# - env: INSTANCE=default-oraclelinux-7-3004-0-py3
169-
# - env: INSTANCE=default-arch-base-latest-3004-0-py3
170-
# - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
171-
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
172-
# - env: INSTANCE=default-almalinux-8-3004-0-py3
173-
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
174-
# - env: INSTANCE=default-debian-10-3003-3-py3
175-
# - env: INSTANCE=default-debian-9-3003-3-py3
176-
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
177-
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
178-
# - env: INSTANCE=default-centos-stream8-3003-3-py3
179-
# - env: INSTANCE=default-centos-7-3003-3-py3
180-
# - env: INSTANCE=default-fedora-35-3003-3-py3
181-
# - env: INSTANCE=default-fedora-34-3003-3-py3
182-
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
183-
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
184-
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
185-
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
186-
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
187-
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
188-
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
189-
# - env: INSTANCE=default-almalinux-8-3003-3-py3
190-
# - env: INSTANCE=default-debian-10-3002-7-py3
191-
# - env: INSTANCE=default-debian-9-3002-7-py3
192-
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
193-
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
194-
# - env: INSTANCE=default-centos-7-3002-7-py3
195-
# - env: INSTANCE=default-fedora-35-3002-7-py3
196-
# - env: INSTANCE=default-fedora-34-3002-7-py3
197-
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
198-
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
199-
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
200-
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
201-
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
202-
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
203-
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
174+
# - env: INSTANCE=default-debian-10-3003-4-py3
175+
# - env: INSTANCE=default-debian-9-3003-4-py3
176+
# - env: INSTANCE=default-ubuntu-2004-3003-4-py3
177+
# - env: INSTANCE=default-ubuntu-1804-3003-4-py3
178+
# - env: INSTANCE=default-centos-stream8-3003-4-py3
179+
# - env: INSTANCE=default-centos-7-3003-4-py3
180+
# - env: INSTANCE=default-amazonlinux-2-3003-4-py3
181+
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
182+
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3
183+
# - env: INSTANCE=default-almalinux-8-3003-4-py3
184+
# - env: INSTANCE=default-debian-10-3002-8-py3
185+
# - env: INSTANCE=default-debian-9-3002-8-py3
186+
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
187+
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
188+
# - env: INSTANCE=default-centos-7-3002-8-py3
189+
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
190+
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
191+
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3
204192

205193
## Define the release stage that runs `semantic-release`
206194
- stage: 'release'

0 commit comments

Comments
 (0)