Skip to content

Commit eede9fa

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

File tree

3 files changed

+10
-207
lines changed

3 files changed

+10
-207
lines changed

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 34 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'}
@@ -149,12 +148,9 @@ default-debian-9-master-py3: {extends: '.test_instance'}
149148
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
150149
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
151150
default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
152-
default-centos-8-master-py3: {extends: '.test_instance'}
153151
default-centos-7-master-py3: {extends: '.test_instance'}
154152
default-fedora-34-master-py3: {extends: '.test_instance'}
155-
default-fedora-33-master-py3: {extends: '.test_instance'}
156153
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
157-
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
158154
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
159155
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
160156
default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -170,12 +166,9 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
170166
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
171167
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
172168
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
173-
# default-centos-8-3004-0-py3: {extends: '.test_instance'}
174169
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
175170
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
176-
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
177171
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
178-
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
179172
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
180173
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
181174
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
@@ -185,61 +178,36 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
185178
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
186179
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
187180
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
188-
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
189181
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
190182
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
191183
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
192184
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
193185
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
194-
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
195186
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
187+
# default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
196188
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
197-
# default-fedora-33-3003-3-py3: {extends: '.test_instance'}
198189
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
199-
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
200190
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
201191
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
202192
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
203193
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
204-
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
205194
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
206195
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
207196
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
208-
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
209197
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
210198
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
211199
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
212200
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
213-
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
214201
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
202+
# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
215203
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
216-
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
217204
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
218-
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
219205
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
220206
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
221207
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
222208
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
223-
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
224209
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
225210
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
226-
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
227-
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
228-
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
229-
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
230-
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
231-
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
232-
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
233-
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
234-
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
235-
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
236-
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
237-
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
238-
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
239-
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
240-
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
241-
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
242-
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
243211

244212
###############################################################################
245213
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 2 additions & 34 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
@@ -102,12 +101,9 @@ jobs:
102101
- env: INSTANCE=default-ubuntu-2004-master-py3
103102
- env: INSTANCE=default-ubuntu-1804-master-py3
104103
- env: INSTANCE=default-centos-stream8-master-py3
105-
- env: INSTANCE=default-centos-8-master-py3
106104
- env: INSTANCE=default-centos-7-master-py3
107105
- env: INSTANCE=default-fedora-34-master-py3
108-
- env: INSTANCE=default-fedora-33-master-py3
109106
- env: INSTANCE=default-opensuse-leap-153-master-py3
110-
- env: INSTANCE=default-opensuse-leap-152-master-py3
111107
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
112108
- env: INSTANCE=default-amazonlinux-2-master-py3
113109
- env: INSTANCE=default-oraclelinux-8-master-py3
@@ -123,12 +119,9 @@ jobs:
123119
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
124120
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
125121
# - env: INSTANCE=default-centos-stream8-3004-0-py3
126-
# - env: INSTANCE=default-centos-8-3004-0-py3
127122
# - env: INSTANCE=default-centos-7-3004-0-py3
128123
# - env: INSTANCE=default-fedora-34-3004-0-py3
129-
# - env: INSTANCE=default-fedora-33-3004-0-py3
130124
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
131-
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
132125
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
133126
# - env: INSTANCE=default-amazonlinux-2-3004-0-py3
134127
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
@@ -138,61 +131,36 @@ jobs:
138131
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
139132
# - env: INSTANCE=default-almalinux-8-3004-0-py3
140133
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
141-
# - env: INSTANCE=default-debian-11-3003-3-py3
142134
# - env: INSTANCE=default-debian-10-3003-3-py3
143135
# - env: INSTANCE=default-debian-9-3003-3-py3
144136
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
145137
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
146138
# - env: INSTANCE=default-centos-stream8-3003-3-py3
147-
# - env: INSTANCE=default-centos-8-3003-3-py3
148139
# - env: INSTANCE=default-centos-7-3003-3-py3
140+
# - env: INSTANCE=default-fedora-35-3003-3-py3
149141
# - env: INSTANCE=default-fedora-34-3003-3-py3
150-
# - env: INSTANCE=default-fedora-33-3003-3-py3
151142
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
152-
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
153143
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
154144
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
155145
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
156146
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
157-
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
158147
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
159148
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
160149
# - env: INSTANCE=default-almalinux-8-3003-3-py3
161-
# - env: INSTANCE=default-debian-11-3002-7-py3
162150
# - env: INSTANCE=default-debian-10-3002-7-py3
163151
# - env: INSTANCE=default-debian-9-3002-7-py3
164152
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
165153
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
166-
# - env: INSTANCE=default-centos-8-3002-7-py3
167154
# - env: INSTANCE=default-centos-7-3002-7-py3
155+
# - env: INSTANCE=default-fedora-35-3002-7-py3
168156
# - env: INSTANCE=default-fedora-34-3002-7-py3
169-
# - env: INSTANCE=default-fedora-33-3002-7-py3
170157
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
171-
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
172158
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
173159
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
174160
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
175161
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
176-
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
177162
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
178163
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
179-
# - env: INSTANCE=default-debian-10-3001-8-py3
180-
# - env: INSTANCE=default-debian-9-3001-8-py3
181-
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
182-
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
183-
# - env: INSTANCE=default-centos-8-3001-8-py3
184-
# - env: INSTANCE=default-centos-7-3001-8-py3
185-
# - env: INSTANCE=default-fedora-34-3001-8-py3
186-
# - env: INSTANCE=default-fedora-33-3001-8-py3
187-
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
188-
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
189-
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
190-
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
191-
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
192-
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
193-
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
194-
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
195-
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
196164

197165
## Define the release stage that runs `semantic-release`
198166
- stage: 'release'

0 commit comments

Comments
 (0)