Skip to content

Commit 0a1ff5c

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

File tree

3 files changed

+10
-219
lines changed

3 files changed

+10
-219
lines changed

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ rubocop:
136136
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
137137
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
138138
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
139-
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
140139
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
141140
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
142141
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
@@ -161,24 +160,15 @@ ubuntu-1804-master-py3: {extends: '.test_instance'}
161160
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
162161
# package-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
163162
centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
164-
# default-centos-8-master-py3: {extends: '.test_instance'}
165-
# package-centos-8-master-py3: {extends: '.test_instance'}
166-
centos-8-master-py3: {extends: '.test_instance'}
167163
# default-centos-7-master-py3: {extends: '.test_instance'}
168164
package-centos-7-master-py3: {extends: '.test_instance'}
169165
# centos-7-master-py3: {extends: '.test_instance'}
170166
# default-fedora-34-master-py3: {extends: '.test_instance'}
171167
# package-fedora-34-master-py3: {extends: '.test_instance'}
172168
fedora-34-master-py3: {extends: '.test_instance'}
173-
# default-fedora-33-master-py3: {extends: '.test_instance'}
174-
# package-fedora-33-master-py3: {extends: '.test_instance'}
175-
fedora-33-master-py3: {extends: '.test_instance'}
176169
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
177170
# package-opensuse-leap-153-master-py3: {extends: '.test_instance'}
178171
opensuse-leap-153-master-py3: {extends: '.test_instance'}
179-
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
180-
# package-opensuse-leap-152-master-py3: {extends: '.test_instance'}
181-
opensuse-leap-152-master-py3: {extends: '.test_instance'}
182172
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
183173
# package-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
184174
opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
@@ -212,12 +202,9 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
212202
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
213203
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
214204
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
215-
# default-centos-8-3004-0-py3: {extends: '.test_instance'}
216205
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
217206
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
218-
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
219207
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
220-
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
221208
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
222209
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
223210
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
@@ -227,61 +214,36 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
227214
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
228215
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
229216
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
230-
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
231217
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
232218
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
233219
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
234220
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
235221
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
236-
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
237222
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
223+
# default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
238224
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
239-
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
240225
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
241-
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
242226
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
243227
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
244228
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
245229
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
246-
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
247230
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
248231
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
249232
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
250-
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
251233
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
252234
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
253235
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
254236
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
255-
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
256237
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
238+
# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
257239
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
258-
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
259240
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
260-
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
261241
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
262242
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
263243
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
264244
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
265-
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
266245
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
267246
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
268-
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
269-
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
270-
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
271-
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
272-
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
273-
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
274-
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
275-
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
276-
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
277-
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
278-
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
279-
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
280-
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
281-
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
282-
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
283-
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
284-
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
285247

286248
###############################################################################
287249
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ jobs:
8989
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
9090
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
9191
# - env: INSTANCE=default-centos-stream8-tiamat-py3
92-
# - env: INSTANCE=default-centos-8-tiamat-py3
9392
# - env: INSTANCE=default-centos-7-tiamat-py3
9493
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
9594
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
@@ -114,24 +113,15 @@ jobs:
114113
# - env: INSTANCE=default-centos-stream8-master-py3
115114
# - env: INSTANCE=package-centos-stream8-master-py3
116115
- env: INSTANCE=centos-stream8-master-py3
117-
# - env: INSTANCE=default-centos-8-master-py3
118-
# - env: INSTANCE=package-centos-8-master-py3
119-
- env: INSTANCE=centos-8-master-py3
120116
# - env: INSTANCE=default-centos-7-master-py3
121117
- env: INSTANCE=package-centos-7-master-py3
122118
# - env: INSTANCE=centos-7-master-py3
123119
# - env: INSTANCE=default-fedora-34-master-py3
124120
# - env: INSTANCE=package-fedora-34-master-py3
125121
- env: INSTANCE=fedora-34-master-py3
126-
# - env: INSTANCE=default-fedora-33-master-py3
127-
# - env: INSTANCE=package-fedora-33-master-py3
128-
- env: INSTANCE=fedora-33-master-py3
129122
# - env: INSTANCE=default-opensuse-leap-153-master-py3
130123
# - env: INSTANCE=package-opensuse-leap-153-master-py3
131124
- env: INSTANCE=opensuse-leap-153-master-py3
132-
# - env: INSTANCE=default-opensuse-leap-152-master-py3
133-
# - env: INSTANCE=package-opensuse-leap-152-master-py3
134-
- env: INSTANCE=opensuse-leap-152-master-py3
135125
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
136126
# - env: INSTANCE=package-opensuse-tmbl-latest-master-py3
137127
- env: INSTANCE=opensuse-tmbl-latest-master-py3
@@ -165,12 +155,9 @@ jobs:
165155
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
166156
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
167157
# - env: INSTANCE=default-centos-stream8-3004-0-py3
168-
# - env: INSTANCE=default-centos-8-3004-0-py3
169158
# - env: INSTANCE=default-centos-7-3004-0-py3
170159
# - env: INSTANCE=default-fedora-34-3004-0-py3
171-
# - env: INSTANCE=default-fedora-33-3004-0-py3
172160
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
173-
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
174161
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
175162
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
176163
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
@@ -180,61 +167,36 @@ jobs:
180167
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
181168
# - env: INSTANCE=default-almalinux-8-3004-0-py3
182169
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
183-
# - env: INSTANCE=default-debian-11-3003-3-py3
184170
# - env: INSTANCE=default-debian-10-3003-3-py3
185171
# - env: INSTANCE=default-debian-9-3003-3-py3
186172
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
187173
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
188174
# - env: INSTANCE=default-centos-stream8-3003-3-py3
189-
# - env: INSTANCE=default-centos-8-3003-3-py3
190175
# - env: INSTANCE=default-centos-7-3003-3-py3
176+
# - env: INSTANCE=default-fedora-35-3003-3-py3
191177
# - env: INSTANCE=default-fedora-34-3003-3-py3
192-
# - env: INSTANCE=default-fedora-33-3003-3-py3
193178
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
194-
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
195179
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
196180
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
197181
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
198182
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
199-
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
200183
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
201184
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
202185
# - env: INSTANCE=default-almalinux-8-3003-3-py3
203-
# - env: INSTANCE=default-debian-11-3002-7-py3
204186
# - env: INSTANCE=default-debian-10-3002-7-py3
205187
# - env: INSTANCE=default-debian-9-3002-7-py3
206188
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
207189
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
208-
# - env: INSTANCE=default-centos-8-3002-7-py3
209190
# - env: INSTANCE=default-centos-7-3002-7-py3
191+
# - env: INSTANCE=default-fedora-35-3002-7-py3
210192
# - env: INSTANCE=default-fedora-34-3002-7-py3
211-
# - env: INSTANCE=default-fedora-33-3002-7-py3
212193
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
213-
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
214194
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
215195
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
216196
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
217197
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
218-
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
219198
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
220199
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
221-
# - env: INSTANCE=default-debian-10-3001-8-py3
222-
# - env: INSTANCE=default-debian-9-3001-8-py3
223-
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
224-
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
225-
# - env: INSTANCE=default-centos-8-3001-8-py3
226-
# - env: INSTANCE=default-centos-7-3001-8-py3
227-
# - env: INSTANCE=default-fedora-34-3001-8-py3
228-
# - env: INSTANCE=default-fedora-33-3001-8-py3
229-
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
230-
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
231-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
232-
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
233-
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
234-
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
235-
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
236-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
237-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
238200

239201
## Define the release stage that runs `semantic-release`
240202
- stage: 'release'

0 commit comments

Comments
 (0)