Skip to content

Commit 1b8604d

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 b4b0385 commit 1b8604d

File tree

3 files changed

+88
-61
lines changed

3 files changed

+88
-61
lines changed

‎.gitlab-ci.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -199,21 +199,25 @@ gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
199199
gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
200200
default-almalinux-8-master-py3: {extends: '.test_instance'}
201201
default-rockylinux-8-master-py3: {extends: '.test_instance'}
202-
# default-debian-11-3003-1-py3: {extends: '.test_instance'}
203-
# default-debian-10-3003-1-py3: {extends: '.test_instance'}
204-
# default-debian-9-3003-1-py3: {extends: '.test_instance'}
205-
# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
206-
# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
207-
# default-centos-8-3003-1-py3: {extends: '.test_instance'}
208-
# default-centos-7-3003-1-py3: {extends: '.test_instance'}
209-
# default-fedora-34-3003-1-py3: {extends: '.test_instance'}
210-
# default-fedora-33-3003-1-py3: {extends: '.test_instance'}
211-
# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
212-
# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
213-
# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
214-
# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
215-
# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
216-
# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
202+
# default-debian-11-3003-2-py3: {extends: '.test_instance'}
203+
# default-debian-10-3003-2-py3: {extends: '.test_instance'}
204+
# default-debian-9-3003-2-py3: {extends: '.test_instance'}
205+
# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
206+
# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
207+
# default-centos-8-3003-2-py3: {extends: '.test_instance'}
208+
# default-centos-7-3003-2-py3: {extends: '.test_instance'}
209+
# default-fedora-34-3003-2-py3: {extends: '.test_instance'}
210+
# default-fedora-33-3003-2-py3: {extends: '.test_instance'}
211+
# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
212+
# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
213+
# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
214+
# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
215+
# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
216+
# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
217+
# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
218+
# gentoo-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
219+
# gentoo-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
220+
# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
217221
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
218222
# gentoo-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
219223
# gentoo-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}

‎.travis.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,25 @@ jobs:
126126
- env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
127127
- env: INSTANCE=default-almalinux-8-master-py3
128128
- env: INSTANCE=default-rockylinux-8-master-py3
129-
# - env: INSTANCE=default-debian-11-3003-1-py3
130-
# - env: INSTANCE=default-debian-10-3003-1-py3
131-
# - env: INSTANCE=default-debian-9-3003-1-py3
132-
# - env: INSTANCE=default-ubuntu-2004-3003-1-py3
133-
# - env: INSTANCE=default-ubuntu-1804-3003-1-py3
134-
# - env: INSTANCE=default-centos-8-3003-1-py3
135-
# - env: INSTANCE=default-centos-7-3003-1-py3
136-
# - env: INSTANCE=default-fedora-34-3003-1-py3
137-
# - env: INSTANCE=default-fedora-33-3003-1-py3
138-
# - env: INSTANCE=default-opensuse-leap-153-3003-1-py3
139-
# - env: INSTANCE=default-opensuse-leap-152-3003-1-py3
140-
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3
141-
# - env: INSTANCE=default-amazonlinux-2-3003-1-py3
142-
# - env: INSTANCE=default-oraclelinux-8-3003-1-py3
143-
# - env: INSTANCE=default-oraclelinux-7-3003-1-py3
129+
# - env: INSTANCE=default-debian-11-3003-2-py3
130+
# - env: INSTANCE=default-debian-10-3003-2-py3
131+
# - env: INSTANCE=default-debian-9-3003-2-py3
132+
# - env: INSTANCE=default-ubuntu-2004-3003-2-py3
133+
# - env: INSTANCE=default-ubuntu-1804-3003-2-py3
134+
# - env: INSTANCE=default-centos-8-3003-2-py3
135+
# - env: INSTANCE=default-centos-7-3003-2-py3
136+
# - env: INSTANCE=default-fedora-34-3003-2-py3
137+
# - env: INSTANCE=default-fedora-33-3003-2-py3
138+
# - env: INSTANCE=default-opensuse-leap-153-3003-2-py3
139+
# - env: INSTANCE=default-opensuse-leap-152-3003-2-py3
140+
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3
141+
# - env: INSTANCE=default-amazonlinux-2-3003-2-py3
142+
# - env: INSTANCE=default-oraclelinux-8-3003-2-py3
143+
# - env: INSTANCE=default-oraclelinux-7-3003-2-py3
144+
# - env: INSTANCE=default-arch-base-latest-3003-2-py3
145+
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3003-2-py3
146+
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3003-2-py3
147+
# - env: INSTANCE=default-almalinux-8-3003-2-py3
144148
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
145149
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3003-1-py3
146150
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3003-1-py3

‎kitchen.yml‎

Lines changed: 50 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -142,69 +142,84 @@ platforms:
142142
driver:
143143
image: saltimages/salt-master-py3:rockylinux-8
144144

145-
## SALT `3003.1`
146-
- name: debian-11-3003-1-py3
145+
## SALT `3003.2`
146+
- name: debian-11-3003-2-py3
147147
driver:
148-
image: saltimages/salt-3003.1-py3:debian-11
148+
image: saltimages/salt-3003.2-py3:debian-11
149149
run_command: /lib/systemd/systemd
150-
- name: debian-10-3003-1-py3
150+
- name: debian-10-3003-2-py3
151151
driver:
152-
image: saltimages/salt-3003.1-py3:debian-10
152+
image: saltimages/salt-3003.2-py3:debian-10
153153
run_command: /lib/systemd/systemd
154-
- name: debian-9-3003-1-py3
154+
- name: debian-9-3003-2-py3
155155
driver:
156-
image: saltimages/salt-3003.1-py3:debian-9
156+
image: saltimages/salt-3003.2-py3:debian-9
157157
run_command: /lib/systemd/systemd
158-
- name: ubuntu-2004-3003-1-py3
158+
- name: ubuntu-2004-3003-2-py3
159159
driver:
160-
image: saltimages/salt-3003.1-py3:ubuntu-20.04
160+
image: saltimages/salt-3003.2-py3:ubuntu-20.04
161161
run_command: /lib/systemd/systemd
162-
- name: ubuntu-1804-3003-1-py3
162+
- name: ubuntu-1804-3003-2-py3
163163
driver:
164-
image: saltimages/salt-3003.1-py3:ubuntu-18.04
164+
image: saltimages/salt-3003.2-py3:ubuntu-18.04
165165
run_command: /lib/systemd/systemd
166-
- name: centos-8-3003-1-py3
166+
- name: centos-8-3003-2-py3
167167
driver:
168-
image: saltimages/salt-3003.1-py3:centos-8
169-
- name: centos-7-3003-1-py3
168+
image: saltimages/salt-3003.2-py3:centos-8
169+
- name: centos-7-3003-2-py3
170170
driver:
171-
image: saltimages/salt-3003.1-py3:centos-7
172-
- name: fedora-34-3003-1-py3
171+
image: saltimages/salt-3003.2-py3:centos-7
172+
- name: fedora-34-3003-2-py3
173173
driver:
174-
image: saltimages/salt-3003.1-py3:fedora-34
175-
- name: fedora-33-3003-1-py3
174+
image: saltimages/salt-3003.2-py3:fedora-34
175+
- name: fedora-33-3003-2-py3
176176
driver:
177-
image: saltimages/salt-3003.1-py3:fedora-33
178-
- name: opensuse-leap-153-3003-1-py3
177+
image: saltimages/salt-3003.2-py3:fedora-33
178+
- name: opensuse-leap-153-3003-2-py3
179179
driver:
180-
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
180+
image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
181181
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
182182
# => SCP did not finish successfully (255): (Net::SCP::Error)
183183
transport:
184184
max_ssh_sessions: 1
185-
- name: opensuse-leap-152-3003-1-py3
185+
- name: opensuse-leap-152-3003-2-py3
186186
driver:
187-
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
187+
image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
188188
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
189189
# => SCP did not finish successfully (255): (Net::SCP::Error)
190190
transport:
191191
max_ssh_sessions: 1
192-
- name: opensuse-tmbl-latest-3003-1-py3
192+
- name: opensuse-tmbl-latest-3003-2-py3
193193
driver:
194-
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
194+
image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
195195
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
196196
# => SCP did not finish successfully (255): (Net::SCP::Error)
197197
transport:
198198
max_ssh_sessions: 1
199-
- name: amazonlinux-2-3003-1-py3
199+
- name: amazonlinux-2-3003-2-py3
200+
driver:
201+
image: saltimages/salt-3003.2-py3:amazonlinux-2
202+
- name: oraclelinux-8-3003-2-py3
203+
driver:
204+
image: saltimages/salt-3003.2-py3:oraclelinux-8
205+
- name: oraclelinux-7-3003-2-py3
206+
driver:
207+
image: saltimages/salt-3003.2-py3:oraclelinux-7
208+
- name: arch-base-latest-3003-2-py3
200209
driver:
201-
image: saltimages/salt-3003.1-py3:amazonlinux-2
202-
- name: oraclelinux-8-3003-1-py3
210+
image: saltimages/salt-3003.2-py3:arch-base-latest
211+
- name: gentoo-stage3-latest-3003-2-py3
203212
driver:
204-
image: saltimages/salt-3003.1-py3:oraclelinux-8
205-
- name: oraclelinux-7-3003-1-py3
213+
image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
214+
run_command: /sbin/init
215+
- name: gentoo-stage3-systemd-3003-2-py3
216+
driver:
217+
image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
218+
- name: almalinux-8-3003-2-py3
206219
driver:
207-
image: saltimages/salt-3003.1-py3:oraclelinux-7
220+
image: saltimages/salt-3003.2-py3:almalinux-8
221+
222+
## SALT `3003.1`
208223
- name: arch-base-latest-3003-1-py3
209224
driver:
210225
image: saltimages/salt-3003.1-py3:arch-base-latest
@@ -432,6 +447,8 @@ suites:
432447
excludes:
433448
- gentoo-stage3-latest-master-py3
434449
- gentoo-stage3-systemd-master-py3
450+
- gentoo-stage3-latest-3003-2-py3
451+
- gentoo-stage3-systemd-3003-2-py3
435452
- gentoo-stage3-latest-3003-1-py3
436453
- gentoo-stage3-systemd-3003-1-py3
437454
- gentoo-stage3-latest-3002-6-py3
@@ -462,6 +479,8 @@ suites:
462479
includes:
463480
- gentoo-stage3-latest-master-py3
464481
- gentoo-stage3-systemd-master-py3
482+
- gentoo-stage3-latest-3003-2-py3
483+
- gentoo-stage3-systemd-3003-2-py3
465484
- gentoo-stage3-latest-3003-1-py3
466485
- gentoo-stage3-systemd-3003-1-py3
467486
- gentoo-stage3-latest-3002-6-py3

0 commit comments

Comments
 (0)