Skip to content

Commit d15f3de

Browse files
myiimyii
committed
ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]
* Automated using myii/ssf-formula#331
1 parent faf54bd commit d15f3de

File tree

3 files changed

+0
-54
lines changed

3 files changed

+0
-54
lines changed

‎.gitlab-ci.yml

-12
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ rubocop:
127127
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
128128
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
129129
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
130-
# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
131130
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
132131
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
133132
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -145,8 +144,6 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
145144
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
146145
# passenger-ubuntu-1804-master-py3: {extends: '.test_instance'}
147146
ubuntu-1804-master-py3: {extends: '.test_instance'}
148-
default-ubuntu-1604-master-py3: {extends: '.test_instance'}
149-
# ubuntu-1604-master-py3: {extends: '.test_instance'}
150147
# default-centos-8-master-py3: {extends: '.test_instance'}
151148
# passenger-centos-8-master-py3: {extends: '.test_instance'}
152149
centos-8-master-py3: {extends: '.test_instance'}
@@ -157,8 +154,6 @@ default-fedora-34-master-py3: {extends: '.test_instance'}
157154
# fedora-34-master-py3: {extends: '.test_instance'}
158155
default-fedora-33-master-py3: {extends: '.test_instance'}
159156
# fedora-33-master-py3: {extends: '.test_instance'}
160-
default-fedora-32-master-py3: {extends: '.test_instance'}
161-
# fedora-32-master-py3: {extends: '.test_instance'}
162157
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
163158
# opensuse-leap-152-master-py3: {extends: '.test_instance'}
164159
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
@@ -184,7 +179,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
184179
# default-centos-7-3003-0-py3: {extends: '.test_instance'}
185180
# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
186181
# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
187-
# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
188182
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
189183
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
190184
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
@@ -195,12 +189,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
195189
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
196190
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
197191
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
198-
# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
199192
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
200193
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
201194
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
202195
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
203-
# default-fedora-32-3002-6-py3: {extends: '.test_instance'}
204196
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
205197
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
206198
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
@@ -213,12 +205,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
213205
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
214206
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
215207
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
216-
# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
217208
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
218209
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
219210
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
220211
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
221-
# default-fedora-32-3001-7-py3: {extends: '.test_instance'}
222212
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
223213
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
224214
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
@@ -230,15 +220,13 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
230220
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
231221
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
232222
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
233-
# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
234223
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
235224
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
236225
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
237226
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
238227
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
239228
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
240229
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
241-
# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
242230
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
243231
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
244232
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}

‎.travis.yml

-12
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ jobs:
8787
# - env: INSTANCE=default-debian-9-tiamat-py3
8888
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
8989
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
90-
# - env: INSTANCE=default-ubuntu-1604-tiamat-py3
9190
# - env: INSTANCE=default-centos-8-tiamat-py3
9291
# - env: INSTANCE=default-centos-7-tiamat-py3
9392
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
@@ -105,8 +104,6 @@ jobs:
105104
# - env: INSTANCE=default-ubuntu-1804-master-py3
106105
# - env: INSTANCE=passenger-ubuntu-1804-master-py3
107106
- env: INSTANCE=ubuntu-1804-master-py3
108-
- env: INSTANCE=default-ubuntu-1604-master-py3
109-
# - env: INSTANCE=ubuntu-1604-master-py3
110107
# - env: INSTANCE=default-centos-8-master-py3
111108
# - env: INSTANCE=passenger-centos-8-master-py3
112109
- env: INSTANCE=centos-8-master-py3
@@ -117,8 +114,6 @@ jobs:
117114
# - env: INSTANCE=fedora-34-master-py3
118115
- env: INSTANCE=default-fedora-33-master-py3
119116
# - env: INSTANCE=fedora-33-master-py3
120-
- env: INSTANCE=default-fedora-32-master-py3
121-
# - env: INSTANCE=fedora-32-master-py3
122117
- env: INSTANCE=default-opensuse-leap-152-master-py3
123118
# - env: INSTANCE=opensuse-leap-152-master-py3
124119
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
@@ -144,7 +139,6 @@ jobs:
144139
# - env: INSTANCE=default-centos-7-3003-0-py3
145140
# - env: INSTANCE=default-fedora-34-3003-0-py3
146141
# - env: INSTANCE=default-fedora-33-3003-0-py3
147-
# - env: INSTANCE=default-fedora-32-3003-0-py3
148142
# - env: INSTANCE=default-amazonlinux-2-3003-0-py3
149143
# - env: INSTANCE=default-oraclelinux-8-3003-0-py3
150144
# - env: INSTANCE=default-oraclelinux-7-3003-0-py3
@@ -155,12 +149,10 @@ jobs:
155149
# - env: INSTANCE=default-debian-9-3002-6-py3
156150
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
157151
# - env: INSTANCE=default-ubuntu-1804-3002-6-py3
158-
# - env: INSTANCE=default-ubuntu-1604-3002-6-py3
159152
# - env: INSTANCE=default-centos-8-3002-6-py3
160153
# - env: INSTANCE=default-centos-7-3002-6-py3
161154
# - env: INSTANCE=default-fedora-34-3002-6-py3
162155
# - env: INSTANCE=default-fedora-33-3002-6-py3
163-
# - env: INSTANCE=default-fedora-32-3002-6-py3
164156
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
165157
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
166158
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
@@ -173,12 +165,10 @@ jobs:
173165
# - env: INSTANCE=default-debian-9-3001-7-py3
174166
# - env: INSTANCE=default-ubuntu-2004-3001-7-py3
175167
# - env: INSTANCE=default-ubuntu-1804-3001-7-py3
176-
# - env: INSTANCE=default-ubuntu-1604-3001-7-py3
177168
# - env: INSTANCE=default-centos-8-3001-7-py3
178169
# - env: INSTANCE=default-centos-7-3001-7-py3
179170
# - env: INSTANCE=default-fedora-34-3001-7-py3
180171
# - env: INSTANCE=default-fedora-33-3001-7-py3
181-
# - env: INSTANCE=default-fedora-32-3001-7-py3
182172
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
183173
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
184174
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
@@ -190,15 +180,13 @@ jobs:
190180
# - env: INSTANCE=default-debian-10-3000-9-py3
191181
# - env: INSTANCE=default-debian-9-3000-9-py3
192182
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
193-
# - env: INSTANCE=default-ubuntu-1604-3000-9-py3
194183
# - env: INSTANCE=default-centos-8-3000-9-py3
195184
# - env: INSTANCE=default-centos-7-3000-9-py3
196185
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
197186
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
198187
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
199188
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
200189
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
201-
# - env: INSTANCE=default-ubuntu-1604-3000-9-py2
202190
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
203191
# - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
204192
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3

‎kitchen.yml

-30
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ platforms:
2222
- name: ubuntu-1804-tiamat-py3
2323
driver:
2424
image: saltimages/salt-tiamat-py3:ubuntu-18.04
25-
- name: ubuntu-1604-tiamat-py3
26-
driver:
27-
image: saltimages/salt-tiamat-py3:ubuntu-16.04
2825
- name: centos-8-tiamat-py3
2926
driver:
3027
image: saltimages/salt-tiamat-py3:centos-8
@@ -54,9 +51,6 @@ platforms:
5451
- name: ubuntu-1804-master-py3
5552
driver:
5653
image: saltimages/salt-master-py3:ubuntu-18.04
57-
- name: ubuntu-1604-master-py3
58-
driver:
59-
image: saltimages/salt-master-py3:ubuntu-16.04
6054
- name: centos-8-master-py3
6155
driver:
6256
image: saltimages/salt-master-py3:centos-8
@@ -69,9 +63,6 @@ platforms:
6963
- name: fedora-33-master-py3
7064
driver:
7165
image: saltimages/salt-master-py3:fedora-33
72-
- name: fedora-32-master-py3
73-
driver:
74-
image: saltimages/salt-master-py3:fedora-32
7566
- name: opensuse-leap-152-master-py3
7667
driver:
7768
image: saltimages/salt-master-py3:opensuse-leap-15.2
@@ -134,9 +125,6 @@ platforms:
134125
- name: fedora-33-3003-0-py3
135126
driver:
136127
image: saltimages/salt-3003.0-py3:fedora-33
137-
- name: fedora-32-3003-0-py3
138-
driver:
139-
image: saltimages/salt-3003.0-py3:fedora-32
140128
- name: amazonlinux-2-3003-0-py3
141129
driver:
142130
image: saltimages/salt-3003.0-py3:amazonlinux-2
@@ -171,9 +159,6 @@ platforms:
171159
- name: ubuntu-1804-3002-6-py3
172160
driver:
173161
image: saltimages/salt-3002.6-py3:ubuntu-18.04
174-
- name: ubuntu-1604-3002-6-py3
175-
driver:
176-
image: saltimages/salt-3002.6-py3:ubuntu-16.04
177162
- name: centos-8-3002-6-py3
178163
driver:
179164
image: saltimages/salt-3002.6-py3:centos-8
@@ -186,9 +171,6 @@ platforms:
186171
- name: fedora-33-3002-6-py3
187172
driver:
188173
image: saltimages/salt-3002.6-py3:fedora-33
189-
- name: fedora-32-3002-6-py3
190-
driver:
191-
image: saltimages/salt-3002.6-py3:fedora-32
192174
- name: amazonlinux-2-3002-6-py3
193175
driver:
194176
image: saltimages/salt-3002.6-py3:amazonlinux-2
@@ -243,9 +225,6 @@ platforms:
243225
- name: ubuntu-1804-3001-7-py3
244226
driver:
245227
image: saltimages/salt-3001.7-py3:ubuntu-18.04
246-
- name: ubuntu-1604-3001-7-py3
247-
driver:
248-
image: saltimages/salt-3001.7-py3:ubuntu-16.04
249228
- name: centos-8-3001-7-py3
250229
driver:
251230
image: saltimages/salt-3001.7-py3:centos-8
@@ -258,9 +237,6 @@ platforms:
258237
- name: fedora-33-3001-7-py3
259238
driver:
260239
image: saltimages/salt-3001.7-py3:fedora-33
261-
- name: fedora-32-3001-7-py3
262-
driver:
263-
image: saltimages/salt-3001.7-py3:fedora-32
264240
- name: opensuse-leap-152-3001-7-py3
265241
driver:
266242
image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
@@ -310,9 +286,6 @@ platforms:
310286
- name: ubuntu-1804-3000-9-py3
311287
driver:
312288
image: saltimages/salt-3000.9-py3:ubuntu-18.04
313-
- name: ubuntu-1604-3000-9-py3
314-
driver:
315-
image: saltimages/salt-3000.9-py3:ubuntu-16.04
316289
- name: centos-8-3000-9-py3
317290
driver:
318291
image: saltimages/salt-3000.9-py3:centos-8
@@ -339,9 +312,6 @@ platforms:
339312
- name: ubuntu-1804-3000-9-py2
340313
driver:
341314
image: saltimages/salt-3000.9-py2:ubuntu-18.04
342-
- name: ubuntu-1604-3000-9-py2
343-
driver:
344-
image: saltimages/salt-3000.9-py2:ubuntu-16.04
345315
- name: arch-base-latest-3000-9-py2
346316
driver:
347317
image: saltimages/salt-3000.9-py2:arch-base-latest

0 commit comments

Comments
 (0)