Skip to content

Commit 57e9873

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

File tree

3 files changed

+1
-60
lines changed

3 files changed

+1
-60
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
name: 'myii/ssf-pre-commit:2.9.2'
2020
entrypoint: ['/bin/bash', '-c']
2121
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
22-
# yamllint disable-line rule:line-length
23-
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release-pandoc:15.14'
22+
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
2423
# `services`
2524
services_docker_dind: &services_docker_dind
2625
- 'docker:dind'
@@ -128,7 +127,6 @@ rubocop:
128127
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
129128
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
130129
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
131-
# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
132130
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
133131
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
134132
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -146,9 +144,6 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
146144
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
147145
# modules-ubuntu-1804-master-py3: {extends: '.test_instance'}
148146
ubuntu-1804-master-py3: {extends: '.test_instance'}
149-
# default-ubuntu-1604-master-py3: {extends: '.test_instance'}
150-
# modules-ubuntu-1604-master-py3: {extends: '.test_instance'}
151-
ubuntu-1604-master-py3: {extends: '.test_instance'}
152147
# default-centos-8-master-py3: {extends: '.test_instance'}
153148
# modules-centos-8-master-py3: {extends: '.test_instance'}
154149
centos-8-master-py3: {extends: '.test_instance'}
@@ -161,9 +156,6 @@ fedora-34-master-py3: {extends: '.test_instance'}
161156
# default-fedora-33-master-py3: {extends: '.test_instance'}
162157
# modules-fedora-33-master-py3: {extends: '.test_instance'}
163158
fedora-33-master-py3: {extends: '.test_instance'}
164-
# default-fedora-32-master-py3: {extends: '.test_instance'}
165-
# modules-fedora-32-master-py3: {extends: '.test_instance'}
166-
fedora-32-master-py3: {extends: '.test_instance'}
167159
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
168160
# modules-opensuse-leap-152-master-py3: {extends: '.test_instance'}
169161
opensuse-leap-152-master-py3: {extends: '.test_instance'}
@@ -197,7 +189,6 @@ modules-arch-base-latest-master-py3: {extends: '.test_instance'}
197189
# default-centos-7-3003-0-py3: {extends: '.test_instance'}
198190
# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
199191
# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
200-
# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
201192
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
202193
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
203194
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
@@ -208,12 +199,10 @@ modules-arch-base-latest-master-py3: {extends: '.test_instance'}
208199
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
209200
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
210201
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
211-
# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
212202
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
213203
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
214204
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
215205
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
216-
# default-fedora-32-3002-6-py3: {extends: '.test_instance'}
217206
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
218207
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
219208
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
@@ -226,12 +215,10 @@ modules-arch-base-latest-master-py3: {extends: '.test_instance'}
226215
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
227216
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
228217
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
229-
# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
230218
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
231219
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
232220
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
233221
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
234-
# default-fedora-32-3001-7-py3: {extends: '.test_instance'}
235222
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
236223
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
237224
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
@@ -243,15 +230,13 @@ modules-arch-base-latest-master-py3: {extends: '.test_instance'}
243230
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
244231
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
245232
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
246-
# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
247233
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
248234
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
249235
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
250236
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
251237
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
252238
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
253239
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
254-
# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
255240
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
256241
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
257242
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}

‎.travis.yml‎

Lines changed: 0 additions & 14 deletions
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,9 +104,6 @@ jobs:
105104
# - env: INSTANCE=default-ubuntu-1804-master-py3
106105
# - env: INSTANCE=modules-ubuntu-1804-master-py3
107106
- env: INSTANCE=ubuntu-1804-master-py3
108-
# - env: INSTANCE=default-ubuntu-1604-master-py3
109-
# - env: INSTANCE=modules-ubuntu-1604-master-py3
110-
- env: INSTANCE=ubuntu-1604-master-py3
111107
# - env: INSTANCE=default-centos-8-master-py3
112108
# - env: INSTANCE=modules-centos-8-master-py3
113109
- env: INSTANCE=centos-8-master-py3
@@ -120,9 +116,6 @@ jobs:
120116
# - env: INSTANCE=default-fedora-33-master-py3
121117
# - env: INSTANCE=modules-fedora-33-master-py3
122118
- env: INSTANCE=fedora-33-master-py3
123-
# - env: INSTANCE=default-fedora-32-master-py3
124-
# - env: INSTANCE=modules-fedora-32-master-py3
125-
- env: INSTANCE=fedora-32-master-py3
126119
# - env: INSTANCE=default-opensuse-leap-152-master-py3
127120
# - env: INSTANCE=modules-opensuse-leap-152-master-py3
128121
- env: INSTANCE=opensuse-leap-152-master-py3
@@ -156,7 +149,6 @@ jobs:
156149
# - env: INSTANCE=default-centos-7-3003-0-py3
157150
# - env: INSTANCE=default-fedora-34-3003-0-py3
158151
# - env: INSTANCE=default-fedora-33-3003-0-py3
159-
# - env: INSTANCE=default-fedora-32-3003-0-py3
160152
# - env: INSTANCE=default-amazonlinux-2-3003-0-py3
161153
# - env: INSTANCE=default-oraclelinux-8-3003-0-py3
162154
# - env: INSTANCE=default-oraclelinux-7-3003-0-py3
@@ -167,12 +159,10 @@ jobs:
167159
# - env: INSTANCE=default-debian-9-3002-6-py3
168160
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
169161
# - env: INSTANCE=default-ubuntu-1804-3002-6-py3
170-
# - env: INSTANCE=default-ubuntu-1604-3002-6-py3
171162
# - env: INSTANCE=default-centos-8-3002-6-py3
172163
# - env: INSTANCE=default-centos-7-3002-6-py3
173164
# - env: INSTANCE=default-fedora-34-3002-6-py3
174165
# - env: INSTANCE=default-fedora-33-3002-6-py3
175-
# - env: INSTANCE=default-fedora-32-3002-6-py3
176166
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
177167
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
178168
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
@@ -185,12 +175,10 @@ jobs:
185175
# - env: INSTANCE=default-debian-9-3001-7-py3
186176
# - env: INSTANCE=default-ubuntu-2004-3001-7-py3
187177
# - env: INSTANCE=default-ubuntu-1804-3001-7-py3
188-
# - env: INSTANCE=default-ubuntu-1604-3001-7-py3
189178
# - env: INSTANCE=default-centos-8-3001-7-py3
190179
# - env: INSTANCE=default-centos-7-3001-7-py3
191180
# - env: INSTANCE=default-fedora-34-3001-7-py3
192181
# - env: INSTANCE=default-fedora-33-3001-7-py3
193-
# - env: INSTANCE=default-fedora-32-3001-7-py3
194182
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
195183
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
196184
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
@@ -202,15 +190,13 @@ jobs:
202190
# - env: INSTANCE=default-debian-10-3000-9-py3
203191
# - env: INSTANCE=default-debian-9-3000-9-py3
204192
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
205-
# - env: INSTANCE=default-ubuntu-1604-3000-9-py3
206193
# - env: INSTANCE=default-centos-8-3000-9-py3
207194
# - env: INSTANCE=default-centos-7-3000-9-py3
208195
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
209196
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
210197
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
211198
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
212199
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
213-
# - env: INSTANCE=default-ubuntu-1604-3000-9-py2
214200
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
215201
# - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
216202
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3

‎kitchen.yml‎

Lines changed: 0 additions & 30 deletions
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)