Skip to content

Commit 7fcb960

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

File tree

3 files changed

+10
-229
lines changed

3 files changed

+10
-229
lines changed

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 38 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,20 +160,13 @@ ubuntu-1804-master-py3: {extends: '.test_instance'}
161160
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
162161
# passenger-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-
# passenger-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
# passenger-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
# fedora-34-master-py3: {extends: '.test_instance'}
172-
default-fedora-33-master-py3: {extends: '.test_instance'}
173-
# fedora-33-master-py3: {extends: '.test_instance'}
174168
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
175169
# opensuse-leap-153-master-py3: {extends: '.test_instance'}
176-
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
177-
# opensuse-leap-152-master-py3: {extends: '.test_instance'}
178170
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
179171
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
180172
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -202,12 +194,9 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
202194
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
203195
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
204196
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
205-
# default-centos-8-3004-0-py3: {extends: '.test_instance'}
206197
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
207198
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
208-
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
209199
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
210-
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
211200
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
212201
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
213202
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
@@ -217,61 +206,36 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
217206
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
218207
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
219208
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
220-
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
221209
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
222210
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
223211
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
224212
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
225213
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
226-
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
227214
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
215+
# default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
228216
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
229-
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
230217
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
231-
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
232218
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
233219
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
234220
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
235221
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
236-
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
237222
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
238223
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
239224
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
240-
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
241225
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
242226
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
243227
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
244228
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
245-
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
246229
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
230+
# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
247231
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
248-
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
249232
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
250-
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
251233
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
252234
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
253235
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
254236
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
255-
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
256237
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
257238
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
258-
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
259-
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
260-
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
261-
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
262-
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
263-
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
264-
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
265-
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
266-
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
267-
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
268-
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
269-
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
270-
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
271-
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
272-
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
273-
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
274-
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
275239

276240
###############################################################################
277241
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 2 additions & 38 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,20 +113,13 @@ jobs:
114113
# - env: INSTANCE=default-centos-stream8-master-py3
115114
# - env: INSTANCE=passenger-centos-stream8-master-py3
116115
- env: INSTANCE=centos-stream8-master-py3
117-
# - env: INSTANCE=default-centos-8-master-py3
118-
# - env: INSTANCE=passenger-centos-8-master-py3
119-
- env: INSTANCE=centos-8-master-py3
120116
# - env: INSTANCE=default-centos-7-master-py3
121117
# - env: INSTANCE=passenger-centos-7-master-py3
122118
- env: INSTANCE=centos-7-master-py3
123119
- env: INSTANCE=default-fedora-34-master-py3
124120
# - env: INSTANCE=fedora-34-master-py3
125-
- env: INSTANCE=default-fedora-33-master-py3
126-
# - env: INSTANCE=fedora-33-master-py3
127121
- env: INSTANCE=default-opensuse-leap-153-master-py3
128122
# - env: INSTANCE=opensuse-leap-153-master-py3
129-
- env: INSTANCE=default-opensuse-leap-152-master-py3
130-
# - env: INSTANCE=opensuse-leap-152-master-py3
131123
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
132124
# - env: INSTANCE=opensuse-tmbl-latest-master-py3
133125
- env: INSTANCE=default-amazonlinux-2-master-py3
@@ -155,12 +147,9 @@ jobs:
155147
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
156148
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
157149
# - env: INSTANCE=default-centos-stream8-3004-0-py3
158-
# - env: INSTANCE=default-centos-8-3004-0-py3
159150
# - env: INSTANCE=default-centos-7-3004-0-py3
160151
# - env: INSTANCE=default-fedora-34-3004-0-py3
161-
# - env: INSTANCE=default-fedora-33-3004-0-py3
162152
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
163-
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
164153
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
165154
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
166155
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
@@ -170,61 +159,36 @@ jobs:
170159
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
171160
# - env: INSTANCE=default-almalinux-8-3004-0-py3
172161
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
173-
# - env: INSTANCE=default-debian-11-3003-3-py3
174162
# - env: INSTANCE=default-debian-10-3003-3-py3
175163
# - env: INSTANCE=default-debian-9-3003-3-py3
176164
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
177165
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
178166
# - env: INSTANCE=default-centos-stream8-3003-3-py3
179-
# - env: INSTANCE=default-centos-8-3003-3-py3
180167
# - env: INSTANCE=default-centos-7-3003-3-py3
168+
# - env: INSTANCE=default-fedora-35-3003-3-py3
181169
# - env: INSTANCE=default-fedora-34-3003-3-py3
182-
# - env: INSTANCE=default-fedora-33-3003-3-py3
183170
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
184-
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
185171
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
186172
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
187173
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
188174
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
189-
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
190175
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
191176
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
192177
# - env: INSTANCE=default-almalinux-8-3003-3-py3
193-
# - env: INSTANCE=default-debian-11-3002-7-py3
194178
# - env: INSTANCE=default-debian-10-3002-7-py3
195179
# - env: INSTANCE=default-debian-9-3002-7-py3
196180
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
197181
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
198-
# - env: INSTANCE=default-centos-8-3002-7-py3
199182
# - env: INSTANCE=default-centos-7-3002-7-py3
183+
# - env: INSTANCE=default-fedora-35-3002-7-py3
200184
# - env: INSTANCE=default-fedora-34-3002-7-py3
201-
# - env: INSTANCE=default-fedora-33-3002-7-py3
202185
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
203-
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
204186
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
205187
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
206188
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
207189
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
208-
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
209190
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
210191
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
211-
# - env: INSTANCE=default-debian-10-3001-8-py3
212-
# - env: INSTANCE=default-debian-9-3001-8-py3
213-
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
214-
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
215-
# - env: INSTANCE=default-centos-8-3001-8-py3
216-
# - env: INSTANCE=default-centos-7-3001-8-py3
217-
# - env: INSTANCE=default-fedora-34-3001-8-py3
218-
# - env: INSTANCE=default-fedora-33-3001-8-py3
219-
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
220-
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
221-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
222-
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
223-
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
224-
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
225-
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
226-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
227-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
228192

229193
## Define the release stage that runs `semantic-release`
230194
- stage: 'release'

0 commit comments

Comments
 (0)