Skip to content

Commit ebe3841

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

File tree

3 files changed

+12
-247
lines changed

3 files changed

+12
-247
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
# repo-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-
# repo-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
# repo-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
# repo-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-
# repo-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
# repo-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-
# repo-opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
181-
opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
182172
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
183173
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
184174
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -208,12 +198,9 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
208198
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
209199
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
210200
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
211-
# default-centos-8-3004-0-py3: {extends: '.test_instance'}
212201
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
213202
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
214-
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
215203
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
216-
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
217204
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
218205
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
219206
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
@@ -223,61 +210,36 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
223210
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
224211
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
225212
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
226-
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
227213
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
228214
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
229215
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
230216
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
231217
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
232-
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
233218
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
219+
# default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
234220
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
235-
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
236221
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
237-
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
238222
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
239223
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
240224
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
241225
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
242-
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
243226
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
244227
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
245228
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
246-
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
247229
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
248230
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
249231
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
250232
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
251-
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
252233
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
234+
# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
253235
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
254-
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
255236
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
256-
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
257237
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
258238
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
259239
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
260240
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
261-
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
262241
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
263242
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
264-
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
265-
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
266-
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
267-
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
268-
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
269-
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
270-
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
271-
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
272-
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
273-
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
274-
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
275-
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
276-
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
277-
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
278-
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
279-
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
280-
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
281243

282244
###############################################################################
283245
# `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=repo-centos-stream8-master-py3
116115
- env: INSTANCE=centos-stream8-master-py3
117-
# - env: INSTANCE=default-centos-8-master-py3
118-
# - env: INSTANCE=repo-centos-8-master-py3
119-
- env: INSTANCE=centos-8-master-py3
120116
# - env: INSTANCE=default-centos-7-master-py3
121117
# - env: INSTANCE=repo-centos-7-master-py3
122118
- env: INSTANCE=centos-7-master-py3
123119
# - env: INSTANCE=default-fedora-34-master-py3
124120
# - env: INSTANCE=repo-fedora-34-master-py3
125121
- env: INSTANCE=fedora-34-master-py3
126-
# - env: INSTANCE=default-fedora-33-master-py3
127-
# - env: INSTANCE=repo-fedora-33-master-py3
128-
- env: INSTANCE=fedora-33-master-py3
129122
# - env: INSTANCE=default-opensuse-leap-153-master-py3
130123
# - env: INSTANCE=repo-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=repo-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=opensuse-tmbl-latest-master-py3
137127
# - env: INSTANCE=default-amazonlinux-2-master-py3
@@ -161,12 +151,9 @@ jobs:
161151
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
162152
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
163153
# - env: INSTANCE=default-centos-stream8-3004-0-py3
164-
# - env: INSTANCE=default-centos-8-3004-0-py3
165154
# - env: INSTANCE=default-centos-7-3004-0-py3
166155
# - env: INSTANCE=default-fedora-34-3004-0-py3
167-
# - env: INSTANCE=default-fedora-33-3004-0-py3
168156
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
169-
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
170157
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
171158
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
172159
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
@@ -176,61 +163,36 @@ jobs:
176163
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
177164
# - env: INSTANCE=default-almalinux-8-3004-0-py3
178165
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
179-
# - env: INSTANCE=default-debian-11-3003-3-py3
180166
# - env: INSTANCE=default-debian-10-3003-3-py3
181167
# - env: INSTANCE=default-debian-9-3003-3-py3
182168
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
183169
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
184170
# - env: INSTANCE=default-centos-stream8-3003-3-py3
185-
# - env: INSTANCE=default-centos-8-3003-3-py3
186171
# - env: INSTANCE=default-centos-7-3003-3-py3
172+
# - env: INSTANCE=default-fedora-35-3003-3-py3
187173
# - env: INSTANCE=default-fedora-34-3003-3-py3
188-
# - env: INSTANCE=default-fedora-33-3003-3-py3
189174
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
190-
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
191175
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
192176
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
193177
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
194178
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
195-
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
196179
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
197180
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
198181
# - env: INSTANCE=default-almalinux-8-3003-3-py3
199-
# - env: INSTANCE=default-debian-11-3002-7-py3
200182
# - env: INSTANCE=default-debian-10-3002-7-py3
201183
# - env: INSTANCE=default-debian-9-3002-7-py3
202184
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
203185
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
204-
# - env: INSTANCE=default-centos-8-3002-7-py3
205186
# - env: INSTANCE=default-centos-7-3002-7-py3
187+
# - env: INSTANCE=default-fedora-35-3002-7-py3
206188
# - env: INSTANCE=default-fedora-34-3002-7-py3
207-
# - env: INSTANCE=default-fedora-33-3002-7-py3
208189
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
209-
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
210190
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
211191
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
212192
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
213193
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
214-
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
215194
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
216195
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
217-
# - env: INSTANCE=default-debian-10-3001-8-py3
218-
# - env: INSTANCE=default-debian-9-3001-8-py3
219-
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
220-
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
221-
# - env: INSTANCE=default-centos-8-3001-8-py3
222-
# - env: INSTANCE=default-centos-7-3001-8-py3
223-
# - env: INSTANCE=default-fedora-34-3001-8-py3
224-
# - env: INSTANCE=default-fedora-33-3001-8-py3
225-
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
226-
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
227-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
228-
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
229-
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
230-
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
231-
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
232-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
233-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
234196

235197
## Define the release stage that runs `semantic-release`
236198
- stage: 'release'

0 commit comments

Comments
 (0)