Skip to content

Commit 8eb304b

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

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
@@ -181,55 +181,43 @@ arch-base-latest-master-py3: {extends: '.test_instance'}
181181
almalinux-8-master-py3: {extends: '.test_instance'}
182182
# prod-server-rockylinux-8-master-py3: {extends: '.test_instance'}
183183
rockylinux-8-master-py3: {extends: '.test_instance'}
184-
# prod-server-debian-11-3004-0-py3: {extends: '.test_instance'}
185-
# prod-server-debian-10-3004-0-py3: {extends: '.test_instance'}
186-
# prod-server-debian-9-3004-0-py3: {extends: '.test_instance'}
187-
# prod-server-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
188-
# prod-server-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
189-
# prod-server-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
190-
# prod-server-centos-7-3004-0-py3: {extends: '.test_instance'}
191-
# prod-server-fedora-35-3004-0-py3: {extends: '.test_instance'}
192-
# prod-server-fedora-34-3004-0-py3: {extends: '.test_instance'}
184+
# prod-server-debian-11-3004-1-py3: {extends: '.test_instance'}
185+
# prod-server-debian-10-3004-1-py3: {extends: '.test_instance'}
186+
# prod-server-debian-9-3004-1-py3: {extends: '.test_instance'}
187+
# prod-server-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
188+
# prod-server-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
189+
# prod-server-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
190+
# prod-server-centos-7-3004-1-py3: {extends: '.test_instance'}
191+
# prod-server-fedora-35-3004-1-py3: {extends: '.test_instance'}
192+
# prod-server-fedora-34-3004-1-py3: {extends: '.test_instance'}
193+
# prod-server-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
194+
# prod-server-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
195+
# prod-server-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
196+
# prod-server-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
197+
# prod-server-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
198+
# prod-server-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
199+
# prod-server-almalinux-8-3004-1-py3: {extends: '.test_instance'}
200+
# prod-server-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
193201
# prod-server-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
194202
# prod-server-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
195-
# prod-server-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
196-
# prod-server-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
197-
# prod-server-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
198-
# prod-server-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
199-
# prod-server-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
200-
# prod-server-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
201-
# prod-server-almalinux-8-3004-0-py3: {extends: '.test_instance'}
202-
# prod-server-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
203-
# prod-server-debian-10-3003-3-py3: {extends: '.test_instance'}
204-
# prod-server-debian-9-3003-3-py3: {extends: '.test_instance'}
205-
# prod-server-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
206-
# prod-server-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
207-
# prod-server-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
208-
# prod-server-centos-7-3003-3-py3: {extends: '.test_instance'}
209-
# prod-server-fedora-35-3003-3-py3: {extends: '.test_instance'}
210-
# prod-server-fedora-34-3003-3-py3: {extends: '.test_instance'}
211-
# prod-server-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
212-
# prod-server-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
213-
# prod-server-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
214-
# prod-server-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
215-
# prod-server-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
216-
# prod-server-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
217-
# prod-server-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
218-
# prod-server-almalinux-8-3003-3-py3: {extends: '.test_instance'}
219-
# prod-server-debian-10-3002-7-py3: {extends: '.test_instance'}
220-
# prod-server-debian-9-3002-7-py3: {extends: '.test_instance'}
221-
# prod-server-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
222-
# prod-server-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
223-
# prod-server-centos-7-3002-7-py3: {extends: '.test_instance'}
224-
# prod-server-fedora-35-3002-7-py3: {extends: '.test_instance'}
225-
# prod-server-fedora-34-3002-7-py3: {extends: '.test_instance'}
226-
# prod-server-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
227-
# prod-server-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
228-
# prod-server-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
229-
# prod-server-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
230-
# prod-server-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
231-
# prod-server-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
232-
# prod-server-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
203+
# prod-server-debian-10-3003-4-py3: {extends: '.test_instance'}
204+
# prod-server-debian-9-3003-4-py3: {extends: '.test_instance'}
205+
# prod-server-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
206+
# prod-server-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
207+
# prod-server-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
208+
# prod-server-centos-7-3003-4-py3: {extends: '.test_instance'}
209+
# prod-server-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
210+
# prod-server-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
211+
# prod-server-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
212+
# prod-server-almalinux-8-3003-4-py3: {extends: '.test_instance'}
213+
# prod-server-debian-10-3002-8-py3: {extends: '.test_instance'}
214+
# prod-server-debian-9-3002-8-py3: {extends: '.test_instance'}
215+
# prod-server-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
216+
# prod-server-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
217+
# prod-server-centos-7-3002-8-py3: {extends: '.test_instance'}
218+
# prod-server-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
219+
# prod-server-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
220+
# prod-server-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
233221
# yamllint enable rule:line-length
234222

235223
###############################################################################

‎.travis.yml‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -133,55 +133,43 @@ jobs:
133133
- env: INSTANCE=almalinux-8-master-py3
134134
# - env: INSTANCE=prod-server-rockylinux-8-master-py3
135135
- env: INSTANCE=rockylinux-8-master-py3
136-
# - env: INSTANCE=prod-server-debian-11-3004-0-py3
137-
# - env: INSTANCE=prod-server-debian-10-3004-0-py3
138-
# - env: INSTANCE=prod-server-debian-9-3004-0-py3
139-
# - env: INSTANCE=prod-server-ubuntu-2004-3004-0-py3
140-
# - env: INSTANCE=prod-server-ubuntu-1804-3004-0-py3
141-
# - env: INSTANCE=prod-server-centos-stream8-3004-0-py3
142-
# - env: INSTANCE=prod-server-centos-7-3004-0-py3
143-
# - env: INSTANCE=prod-server-fedora-35-3004-0-py3
144-
# - env: INSTANCE=prod-server-fedora-34-3004-0-py3
136+
# - env: INSTANCE=prod-server-debian-11-3004-1-py3
137+
# - env: INSTANCE=prod-server-debian-10-3004-1-py3
138+
# - env: INSTANCE=prod-server-debian-9-3004-1-py3
139+
# - env: INSTANCE=prod-server-ubuntu-2004-3004-1-py3
140+
# - env: INSTANCE=prod-server-ubuntu-1804-3004-1-py3
141+
# - env: INSTANCE=prod-server-centos-stream8-3004-1-py3
142+
# - env: INSTANCE=prod-server-centos-7-3004-1-py3
143+
# - env: INSTANCE=prod-server-fedora-35-3004-1-py3
144+
# - env: INSTANCE=prod-server-fedora-34-3004-1-py3
145+
# - env: INSTANCE=prod-server-amazonlinux-2-3004-1-py3
146+
# - env: INSTANCE=prod-server-oraclelinux-8-3004-1-py3
147+
# - env: INSTANCE=prod-server-oraclelinux-7-3004-1-py3
148+
# - env: INSTANCE=prod-server-arch-base-latest-3004-1-py3
149+
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3004-1-py3
150+
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3004-1-py3
151+
# - env: INSTANCE=prod-server-almalinux-8-3004-1-py3
152+
# - env: INSTANCE=prod-server-rockylinux-8-3004-1-py3
145153
# - env: INSTANCE=prod-server-opensuse-leap-153-3004-0-py3
146154
# - env: INSTANCE=prod-server-opensuse-tmbl-latest-3004-0-py3
147-
# - env: INSTANCE=prod-server-amazonlinux-2-3004-0-py3
148-
# - env: INSTANCE=prod-server-oraclelinux-8-3004-0-py3
149-
# - env: INSTANCE=prod-server-oraclelinux-7-3004-0-py3
150-
# - env: INSTANCE=prod-server-arch-base-latest-3004-0-py3
151-
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3004-0-py3
152-
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3004-0-py3
153-
# - env: INSTANCE=prod-server-almalinux-8-3004-0-py3
154-
# - env: INSTANCE=prod-server-rockylinux-8-3004-0-py3
155-
# - env: INSTANCE=prod-server-debian-10-3003-3-py3
156-
# - env: INSTANCE=prod-server-debian-9-3003-3-py3
157-
# - env: INSTANCE=prod-server-ubuntu-2004-3003-3-py3
158-
# - env: INSTANCE=prod-server-ubuntu-1804-3003-3-py3
159-
# - env: INSTANCE=prod-server-centos-stream8-3003-3-py3
160-
# - env: INSTANCE=prod-server-centos-7-3003-3-py3
161-
# - env: INSTANCE=prod-server-fedora-35-3003-3-py3
162-
# - env: INSTANCE=prod-server-fedora-34-3003-3-py3
163-
# - env: INSTANCE=prod-server-opensuse-leap-153-3003-3-py3
164-
# - env: INSTANCE=prod-server-opensuse-tmbl-latest-3003-3-py3
165-
# - env: INSTANCE=prod-server-amazonlinux-2-3003-3-py3
166-
# - env: INSTANCE=prod-server-oraclelinux-8-3003-3-py3
167-
# - env: INSTANCE=prod-server-oraclelinux-7-3003-3-py3
168-
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3003-3-py3
169-
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3003-3-py3
170-
# - env: INSTANCE=prod-server-almalinux-8-3003-3-py3
171-
# - env: INSTANCE=prod-server-debian-10-3002-7-py3
172-
# - env: INSTANCE=prod-server-debian-9-3002-7-py3
173-
# - env: INSTANCE=prod-server-ubuntu-2004-3002-7-py3
174-
# - env: INSTANCE=prod-server-ubuntu-1804-3002-7-py3
175-
# - env: INSTANCE=prod-server-centos-7-3002-7-py3
176-
# - env: INSTANCE=prod-server-fedora-35-3002-7-py3
177-
# - env: INSTANCE=prod-server-fedora-34-3002-7-py3
178-
# - env: INSTANCE=prod-server-opensuse-leap-153-3002-7-py3
179-
# - env: INSTANCE=prod-server-opensuse-tmbl-latest-3002-7-py3
180-
# - env: INSTANCE=prod-server-amazonlinux-2-3002-7-py3
181-
# - env: INSTANCE=prod-server-oraclelinux-8-3002-7-py3
182-
# - env: INSTANCE=prod-server-oraclelinux-7-3002-7-py3
183-
# - env: INSTANCE=prod-server-gentoo-stage3-latest-3002-7-py3
184-
# - env: INSTANCE=prod-server-gentoo-stage3-systemd-3002-7-py3
155+
# - env: INSTANCE=prod-server-debian-10-3003-4-py3
156+
# - env: INSTANCE=prod-server-debian-9-3003-4-py3
157+
# - env: INSTANCE=prod-server-ubuntu-2004-3003-4-py3
158+
# - env: INSTANCE=prod-server-ubuntu-1804-3003-4-py3
159+
# - env: INSTANCE=prod-server-centos-stream8-3003-4-py3
160+
# - env: INSTANCE=prod-server-centos-7-3003-4-py3
161+
# - env: INSTANCE=prod-server-amazonlinux-2-3003-4-py3
162+
# - env: INSTANCE=prod-server-oraclelinux-8-3003-4-py3
163+
# - env: INSTANCE=prod-server-oraclelinux-7-3003-4-py3
164+
# - env: INSTANCE=prod-server-almalinux-8-3003-4-py3
165+
# - env: INSTANCE=prod-server-debian-10-3002-8-py3
166+
# - env: INSTANCE=prod-server-debian-9-3002-8-py3
167+
# - env: INSTANCE=prod-server-ubuntu-2004-3002-8-py3
168+
# - env: INSTANCE=prod-server-ubuntu-1804-3002-8-py3
169+
# - env: INSTANCE=prod-server-centos-7-3002-8-py3
170+
# - env: INSTANCE=prod-server-amazonlinux-2-3002-8-py3
171+
# - env: INSTANCE=prod-server-oraclelinux-8-3002-8-py3
172+
# - env: INSTANCE=prod-server-oraclelinux-7-3002-8-py3
185173

186174
## Define the release stage that runs `semantic-release`
187175
- stage: 'release'

0 commit comments

Comments
 (0)