Skip to content

Commit 33bfe13

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

File tree

3 files changed

+0
-50
lines changed

3 files changed

+0
-50
lines changed

‎.gitlab-ci.yml

-10
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'}
@@ -137,12 +136,10 @@ default-debian-10-master-py3: {extends: '.test_instance'}
137136
default-debian-9-master-py3: {extends: '.test_instance'}
138137
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
139138
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
140-
default-ubuntu-1604-master-py3: {extends: '.test_instance'}
141139
default-centos-8-master-py3: {extends: '.test_instance'}
142140
default-centos-7-master-py3: {extends: '.test_instance'}
143141
default-fedora-34-master-py3: {extends: '.test_instance'}
144142
default-fedora-33-master-py3: {extends: '.test_instance'}
145-
default-fedora-32-master-py3: {extends: '.test_instance'}
146143
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
147144
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
148145
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -159,7 +156,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
159156
# default-centos-7-3003-0-py3: {extends: '.test_instance'}
160157
# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
161158
# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
162-
# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
163159
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
164160
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
165161
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
@@ -170,12 +166,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
170166
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
171167
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
172168
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
173-
# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
174169
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
175170
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
176171
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
177172
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
178-
# default-fedora-32-3002-6-py3: {extends: '.test_instance'}
179173
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
180174
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
181175
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
@@ -188,12 +182,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
188182
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
189183
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
190184
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
191-
# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
192185
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
193186
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
194187
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
195188
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
196-
# default-fedora-32-3001-7-py3: {extends: '.test_instance'}
197189
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
198190
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
199191
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
@@ -205,15 +197,13 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
205197
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
206198
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
207199
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
208-
# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
209200
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
210201
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
211202
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
212203
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
213204
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
214205
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
215206
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
216-
# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
217207
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
218208
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
219209
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}

‎.travis.yml

-10
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
@@ -97,12 +96,10 @@ jobs:
9796
- env: INSTANCE=default-debian-9-master-py3
9897
- env: INSTANCE=default-ubuntu-2004-master-py3
9998
- env: INSTANCE=default-ubuntu-1804-master-py3
100-
- env: INSTANCE=default-ubuntu-1604-master-py3
10199
- env: INSTANCE=default-centos-8-master-py3
102100
- env: INSTANCE=default-centos-7-master-py3
103101
- env: INSTANCE=default-fedora-34-master-py3
104102
- env: INSTANCE=default-fedora-33-master-py3
105-
- env: INSTANCE=default-fedora-32-master-py3
106103
- env: INSTANCE=default-opensuse-leap-152-master-py3
107104
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
108105
- env: INSTANCE=default-amazonlinux-2-master-py3
@@ -119,7 +116,6 @@ jobs:
119116
# - env: INSTANCE=default-centos-7-3003-0-py3
120117
# - env: INSTANCE=default-fedora-34-3003-0-py3
121118
# - env: INSTANCE=default-fedora-33-3003-0-py3
122-
# - env: INSTANCE=default-fedora-32-3003-0-py3
123119
# - env: INSTANCE=default-amazonlinux-2-3003-0-py3
124120
# - env: INSTANCE=default-oraclelinux-8-3003-0-py3
125121
# - env: INSTANCE=default-oraclelinux-7-3003-0-py3
@@ -130,12 +126,10 @@ jobs:
130126
# - env: INSTANCE=default-debian-9-3002-6-py3
131127
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3
132128
# - env: INSTANCE=default-ubuntu-1804-3002-6-py3
133-
# - env: INSTANCE=default-ubuntu-1604-3002-6-py3
134129
# - env: INSTANCE=default-centos-8-3002-6-py3
135130
# - env: INSTANCE=default-centos-7-3002-6-py3
136131
# - env: INSTANCE=default-fedora-34-3002-6-py3
137132
# - env: INSTANCE=default-fedora-33-3002-6-py3
138-
# - env: INSTANCE=default-fedora-32-3002-6-py3
139133
# - env: INSTANCE=default-amazonlinux-2-3002-6-py3
140134
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3
141135
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3
@@ -148,12 +142,10 @@ jobs:
148142
# - env: INSTANCE=default-debian-9-3001-7-py3
149143
# - env: INSTANCE=default-ubuntu-2004-3001-7-py3
150144
# - env: INSTANCE=default-ubuntu-1804-3001-7-py3
151-
# - env: INSTANCE=default-ubuntu-1604-3001-7-py3
152145
# - env: INSTANCE=default-centos-8-3001-7-py3
153146
# - env: INSTANCE=default-centos-7-3001-7-py3
154147
# - env: INSTANCE=default-fedora-34-3001-7-py3
155148
# - env: INSTANCE=default-fedora-33-3001-7-py3
156-
# - env: INSTANCE=default-fedora-32-3001-7-py3
157149
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
158150
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
159151
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3
@@ -165,15 +157,13 @@ jobs:
165157
# - env: INSTANCE=default-debian-10-3000-9-py3
166158
# - env: INSTANCE=default-debian-9-3000-9-py3
167159
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3
168-
# - env: INSTANCE=default-ubuntu-1604-3000-9-py3
169160
# - env: INSTANCE=default-centos-8-3000-9-py3
170161
# - env: INSTANCE=default-centos-7-3000-9-py3
171162
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
172163
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3
173164
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3
174165
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3
175166
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2
176-
# - env: INSTANCE=default-ubuntu-1604-3000-9-py2
177167
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
178168
# - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
179169
# - 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)