Skip to content

Commit 4fc33ad

Browse files
myiimyii
committed
ci(kitchen+ci): update with latest 3003.2 pre-salted images [skip ci]
* Automated using myii/ssf-formula#360
1 parent 258cbf5 commit 4fc33ad

File tree

3 files changed

+91
-61
lines changed

3 files changed

+91
-61
lines changed

‎.github/workflows/kitchen.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,25 @@ jobs:
129129
# - repo-rockylinux-8-master-py3
130130
# - clean-rockylinux-8-master-py3
131131
- rockylinux-8-master-py3
132-
# - archive-debian-11-3003-1-py3
133-
# - archive-debian-10-3003-1-py3
134-
# - archive-debian-9-3003-1-py3
135-
# - archive-ubuntu-2004-3003-1-py3
136-
# - archive-ubuntu-1804-3003-1-py3
137-
# - archive-centos-8-3003-1-py3
138-
# - archive-centos-7-3003-1-py3
139-
# - archive-fedora-34-3003-1-py3
140-
# - archive-fedora-33-3003-1-py3
141-
# - archive-opensuse-leap-153-3003-1-py3
142-
# - archive-opensuse-leap-152-3003-1-py3
143-
# - archive-opensuse-tmbl-latest-3003-1-py3
144-
# - archive-amazonlinux-2-3003-1-py3
145-
# - archive-oraclelinux-8-3003-1-py3
146-
# - archive-oraclelinux-7-3003-1-py3
132+
# - archive-debian-11-3003-2-py3
133+
# - archive-debian-10-3003-2-py3
134+
# - archive-debian-9-3003-2-py3
135+
# - archive-ubuntu-2004-3003-2-py3
136+
# - archive-ubuntu-1804-3003-2-py3
137+
# - archive-centos-8-3003-2-py3
138+
# - archive-centos-7-3003-2-py3
139+
# - archive-fedora-34-3003-2-py3
140+
# - archive-fedora-33-3003-2-py3
141+
# - archive-opensuse-leap-153-3003-2-py3
142+
# - archive-opensuse-leap-152-3003-2-py3
143+
# - archive-opensuse-tmbl-latest-3003-2-py3
144+
# - archive-amazonlinux-2-3003-2-py3
145+
# - archive-oraclelinux-8-3003-2-py3
146+
# - archive-oraclelinux-7-3003-2-py3
147+
# - archive-arch-base-latest-3003-2-py3
148+
# - archive-gentoo-stage3-latest-3003-2-py3
149+
# - archive-gentoo-stage3-systemd-3003-2-py3
150+
# - archive-almalinux-8-3003-2-py3
147151
# - archive-arch-base-latest-3003-1-py3
148152
# - archive-gentoo-stage3-latest-3003-1-py3
149153
# - archive-gentoo-stage3-systemd-3003-1-py3

‎.travis.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,25 @@ jobs:
203203
# - env: INSTANCE=repo-rockylinux-8-master-py3
204204
# - env: INSTANCE=clean-rockylinux-8-master-py3
205205
- env: INSTANCE=rockylinux-8-master-py3
206-
# - env: INSTANCE=archive-debian-11-3003-1-py3
207-
# - env: INSTANCE=archive-debian-10-3003-1-py3
208-
# - env: INSTANCE=archive-debian-9-3003-1-py3
209-
# - env: INSTANCE=archive-ubuntu-2004-3003-1-py3
210-
# - env: INSTANCE=archive-ubuntu-1804-3003-1-py3
211-
# - env: INSTANCE=archive-centos-8-3003-1-py3
212-
# - env: INSTANCE=archive-centos-7-3003-1-py3
213-
# - env: INSTANCE=archive-fedora-34-3003-1-py3
214-
# - env: INSTANCE=archive-fedora-33-3003-1-py3
215-
# - env: INSTANCE=archive-opensuse-leap-153-3003-1-py3
216-
# - env: INSTANCE=archive-opensuse-leap-152-3003-1-py3
217-
# - env: INSTANCE=archive-opensuse-tmbl-latest-3003-1-py3
218-
# - env: INSTANCE=archive-amazonlinux-2-3003-1-py3
219-
# - env: INSTANCE=archive-oraclelinux-8-3003-1-py3
220-
# - env: INSTANCE=archive-oraclelinux-7-3003-1-py3
206+
# - env: INSTANCE=archive-debian-11-3003-2-py3
207+
# - env: INSTANCE=archive-debian-10-3003-2-py3
208+
# - env: INSTANCE=archive-debian-9-3003-2-py3
209+
# - env: INSTANCE=archive-ubuntu-2004-3003-2-py3
210+
# - env: INSTANCE=archive-ubuntu-1804-3003-2-py3
211+
# - env: INSTANCE=archive-centos-8-3003-2-py3
212+
# - env: INSTANCE=archive-centos-7-3003-2-py3
213+
# - env: INSTANCE=archive-fedora-34-3003-2-py3
214+
# - env: INSTANCE=archive-fedora-33-3003-2-py3
215+
# - env: INSTANCE=archive-opensuse-leap-153-3003-2-py3
216+
# - env: INSTANCE=archive-opensuse-leap-152-3003-2-py3
217+
# - env: INSTANCE=archive-opensuse-tmbl-latest-3003-2-py3
218+
# - env: INSTANCE=archive-amazonlinux-2-3003-2-py3
219+
# - env: INSTANCE=archive-oraclelinux-8-3003-2-py3
220+
# - env: INSTANCE=archive-oraclelinux-7-3003-2-py3
221+
# - env: INSTANCE=archive-arch-base-latest-3003-2-py3
222+
# - env: INSTANCE=archive-gentoo-stage3-latest-3003-2-py3
223+
# - env: INSTANCE=archive-gentoo-stage3-systemd-3003-2-py3
224+
# - env: INSTANCE=archive-almalinux-8-3003-2-py3
221225
# - env: INSTANCE=archive-arch-base-latest-3003-1-py3
222226
# - env: INSTANCE=archive-gentoo-stage3-latest-3003-1-py3
223227
# - env: INSTANCE=archive-gentoo-stage3-systemd-3003-1-py3

‎kitchen.yml‎

Lines changed: 53 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -209,104 +209,126 @@ platforms:
209209
driver:
210210
image: saltimages/salt-master-py3:rockylinux-8
211211

212-
## SALT `3003.1`
213-
- name: debian-11-3003-1-py3
212+
## SALT `3003.2`
213+
- name: debian-11-3003-2-py3
214214
driver:
215-
image: saltimages/salt-3003.1-py3:debian-11
215+
image: saltimages/salt-3003.2-py3:debian-11
216216
provision_command:
217217
- apt-get update
218218
- apt-get -qq -y install conntrack
219219
run_command: /lib/systemd/systemd
220-
- name: debian-10-3003-1-py3
220+
- name: debian-10-3003-2-py3
221221
driver:
222-
image: saltimages/salt-3003.1-py3:debian-10
222+
image: saltimages/salt-3003.2-py3:debian-10
223223
provision_command:
224224
- apt-get update
225225
- apt-get -qq -y install conntrack
226226
run_command: /lib/systemd/systemd
227-
- name: debian-9-3003-1-py3
227+
- name: debian-9-3003-2-py3
228228
driver:
229-
image: saltimages/salt-3003.1-py3:debian-9
229+
image: saltimages/salt-3003.2-py3:debian-9
230230
provision_command:
231231
- apt-get update
232232
- apt-get -qq -y install conntrack
233233
run_command: /lib/systemd/systemd
234-
- name: ubuntu-2004-3003-1-py3
234+
- name: ubuntu-2004-3003-2-py3
235235
driver:
236-
image: saltimages/salt-3003.1-py3:ubuntu-20.04
236+
image: saltimages/salt-3003.2-py3:ubuntu-20.04
237237
provision_command:
238238
- apt-get update
239239
- apt-get -qq -y install conntrack
240240
run_command: /lib/systemd/systemd
241-
- name: ubuntu-1804-3003-1-py3
241+
- name: ubuntu-1804-3003-2-py3
242242
driver:
243-
image: saltimages/salt-3003.1-py3:ubuntu-18.04
243+
image: saltimages/salt-3003.2-py3:ubuntu-18.04
244244
provision_command:
245245
- apt-get update
246246
- apt-get -qq -y install conntrack
247247
run_command: /lib/systemd/systemd
248-
- name: centos-8-3003-1-py3
248+
- name: centos-8-3003-2-py3
249249
driver:
250-
image: saltimages/salt-3003.1-py3:centos-8
250+
image: saltimages/salt-3003.2-py3:centos-8
251251
provision_command:
252252
- yum install conntrack-tools -y
253-
- name: centos-7-3003-1-py3
253+
- name: centos-7-3003-2-py3
254254
driver:
255-
image: saltimages/salt-3003.1-py3:centos-7
255+
image: saltimages/salt-3003.2-py3:centos-7
256256
provision_command:
257257
- yum install conntrack-tools -y
258-
- name: fedora-34-3003-1-py3
258+
- name: fedora-34-3003-2-py3
259259
driver:
260-
image: saltimages/salt-3003.1-py3:fedora-34
260+
image: saltimages/salt-3003.2-py3:fedora-34
261261
provision_command:
262262
- dnf install conntrack-tools -y
263-
- name: fedora-33-3003-1-py3
263+
- name: fedora-33-3003-2-py3
264264
driver:
265-
image: saltimages/salt-3003.1-py3:fedora-33
265+
image: saltimages/salt-3003.2-py3:fedora-33
266266
provision_command:
267267
- dnf install conntrack-tools -y
268-
- name: opensuse-leap-153-3003-1-py3
268+
- name: opensuse-leap-153-3003-2-py3
269269
driver:
270-
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
270+
image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
271271
provision_command:
272272
- zypper --non-interactive install conntrack-tools
273273
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
274274
# => SCP did not finish successfully (255): (Net::SCP::Error)
275275
transport:
276276
max_ssh_sessions: 1
277-
- name: opensuse-leap-152-3003-1-py3
277+
- name: opensuse-leap-152-3003-2-py3
278278
driver:
279-
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
279+
image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
280280
provision_command:
281281
- zypper --non-interactive install conntrack-tools
282282
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
283283
# => SCP did not finish successfully (255): (Net::SCP::Error)
284284
transport:
285285
max_ssh_sessions: 1
286-
- name: opensuse-tmbl-latest-3003-1-py3
286+
- name: opensuse-tmbl-latest-3003-2-py3
287287
driver:
288-
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
288+
image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
289289
provision_command:
290290
- zypper --non-interactive install conntrack-tools
291291
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
292292
# => SCP did not finish successfully (255): (Net::SCP::Error)
293293
transport:
294294
max_ssh_sessions: 1
295-
- name: amazonlinux-2-3003-1-py3
295+
- name: amazonlinux-2-3003-2-py3
296296
driver:
297-
image: saltimages/salt-3003.1-py3:amazonlinux-2
297+
image: saltimages/salt-3003.2-py3:amazonlinux-2
298298
provision_command:
299299
- yum install conntrack-tools -y
300-
- name: oraclelinux-8-3003-1-py3
300+
- name: oraclelinux-8-3003-2-py3
301301
driver:
302-
image: saltimages/salt-3003.1-py3:oraclelinux-8
302+
image: saltimages/salt-3003.2-py3:oraclelinux-8
303303
provision_command:
304304
- yum install conntrack-tools -y
305-
- name: oraclelinux-7-3003-1-py3
305+
- name: oraclelinux-7-3003-2-py3
306306
driver:
307-
image: saltimages/salt-3003.1-py3:oraclelinux-7
307+
image: saltimages/salt-3003.2-py3:oraclelinux-7
308308
provision_command:
309309
- yum install conntrack-tools -y
310+
- name: arch-base-latest-3003-2-py3
311+
driver:
312+
image: saltimages/salt-3003.2-py3:arch-base-latest
313+
provision_command:
314+
- (test -x /usr/bin/pacman-mirrors && /usr/bin/pacman-mirrors -g) || true
315+
- pacman -S --noconfirm conntrack-tools tar
316+
- name: gentoo-stage3-latest-3003-2-py3
317+
driver:
318+
image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
319+
provision_command:
320+
emerge --noreplace --quiet --with-bdeps-auto=n net-firewall/conntrack-tools
321+
run_command: /sbin/init
322+
- name: gentoo-stage3-systemd-3003-2-py3
323+
driver:
324+
image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
325+
provision_command:
326+
emerge --noreplace --quiet --with-bdeps-auto=n net-firewall/conntrack-tools
327+
- name: almalinux-8-3003-2-py3
328+
driver:
329+
image: saltimages/salt-3003.2-py3:almalinux-8
330+
331+
## SALT `3003.1`
310332
- name: arch-base-latest-3003-1-py3
311333
driver:
312334
image: saltimages/salt-3003.1-py3:arch-base-latest

0 commit comments

Comments
 (0)