Skip to content

Commit 69f215f

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 72fa83f commit 69f215f

File tree

3 files changed

+86
-61
lines changed

3 files changed

+86
-61
lines changed

‎.gitlab-ci.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,25 @@ default-amazonlinux-2-master-py3: {extends: '.test_instance'}
155155
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
156156
# default-almalinux-8-master-py3: {extends: '.test_instance'}
157157
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
158-
# default-debian-11-3003-1-py3: {extends: '.test_instance'}
159-
# default-debian-10-3003-1-py3: {extends: '.test_instance'}
160-
# default-debian-9-3003-1-py3: {extends: '.test_instance'}
161-
# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
162-
# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
163-
# default-centos-8-3003-1-py3: {extends: '.test_instance'}
164-
# default-centos-7-3003-1-py3: {extends: '.test_instance'}
165-
# default-fedora-34-3003-1-py3: {extends: '.test_instance'}
166-
# default-fedora-33-3003-1-py3: {extends: '.test_instance'}
167-
# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
168-
# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
169-
# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
170-
# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
171-
# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
172-
# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
158+
# default-debian-11-3003-2-py3: {extends: '.test_instance'}
159+
# default-debian-10-3003-2-py3: {extends: '.test_instance'}
160+
# default-debian-9-3003-2-py3: {extends: '.test_instance'}
161+
# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
162+
# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
163+
# default-centos-8-3003-2-py3: {extends: '.test_instance'}
164+
# default-centos-7-3003-2-py3: {extends: '.test_instance'}
165+
# default-fedora-34-3003-2-py3: {extends: '.test_instance'}
166+
# default-fedora-33-3003-2-py3: {extends: '.test_instance'}
167+
# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
168+
# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
169+
# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
170+
# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
171+
# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
172+
# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
173+
# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
174+
# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
175+
# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
176+
# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
173177
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
174178
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
175179
# default-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
@@ -115,21 +115,25 @@ jobs:
115115
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
116116
# - env: INSTANCE=default-almalinux-8-master-py3
117117
# - env: INSTANCE=default-rockylinux-8-master-py3
118-
# - env: INSTANCE=default-debian-11-3003-1-py3
119-
# - env: INSTANCE=default-debian-10-3003-1-py3
120-
# - env: INSTANCE=default-debian-9-3003-1-py3
121-
# - env: INSTANCE=default-ubuntu-2004-3003-1-py3
122-
# - env: INSTANCE=default-ubuntu-1804-3003-1-py3
123-
# - env: INSTANCE=default-centos-8-3003-1-py3
124-
# - env: INSTANCE=default-centos-7-3003-1-py3
125-
# - env: INSTANCE=default-fedora-34-3003-1-py3
126-
# - env: INSTANCE=default-fedora-33-3003-1-py3
127-
# - env: INSTANCE=default-opensuse-leap-153-3003-1-py3
128-
# - env: INSTANCE=default-opensuse-leap-152-3003-1-py3
129-
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3
130-
# - env: INSTANCE=default-amazonlinux-2-3003-1-py3
131-
# - env: INSTANCE=default-oraclelinux-8-3003-1-py3
132-
# - env: INSTANCE=default-oraclelinux-7-3003-1-py3
118+
# - env: INSTANCE=default-debian-11-3003-2-py3
119+
# - env: INSTANCE=default-debian-10-3003-2-py3
120+
# - env: INSTANCE=default-debian-9-3003-2-py3
121+
# - env: INSTANCE=default-ubuntu-2004-3003-2-py3
122+
# - env: INSTANCE=default-ubuntu-1804-3003-2-py3
123+
# - env: INSTANCE=default-centos-8-3003-2-py3
124+
# - env: INSTANCE=default-centos-7-3003-2-py3
125+
# - env: INSTANCE=default-fedora-34-3003-2-py3
126+
# - env: INSTANCE=default-fedora-33-3003-2-py3
127+
# - env: INSTANCE=default-opensuse-leap-153-3003-2-py3
128+
# - env: INSTANCE=default-opensuse-leap-152-3003-2-py3
129+
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3
130+
# - env: INSTANCE=default-amazonlinux-2-3003-2-py3
131+
# - env: INSTANCE=default-oraclelinux-8-3003-2-py3
132+
# - env: INSTANCE=default-oraclelinux-7-3003-2-py3
133+
# - env: INSTANCE=default-arch-base-latest-3003-2-py3
134+
# - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3
135+
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3
136+
# - env: INSTANCE=default-almalinux-8-3003-2-py3
133137
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
134138
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
135139
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3

‎kitchen.yml

Lines changed: 48 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -150,75 +150,92 @@ platforms:
150150
driver:
151151
image: saltimages/salt-master-py3:rockylinux-8
152152

153-
## SALT `3003.1`
154-
- name: debian-11-3003-1-py3
153+
## SALT `3003.2`
154+
- name: debian-11-3003-2-py3
155155
driver:
156-
image: saltimages/salt-3003.1-py3:debian-11
156+
image: saltimages/salt-3003.2-py3:debian-11
157157
run_command: /lib/systemd/systemd
158-
- name: debian-10-3003-1-py3
158+
- name: debian-10-3003-2-py3
159159
driver:
160-
image: saltimages/salt-3003.1-py3:debian-10
160+
image: saltimages/salt-3003.2-py3:debian-10
161161
run_command: /lib/systemd/systemd
162-
- name: debian-9-3003-1-py3
162+
- name: debian-9-3003-2-py3
163163
driver:
164-
image: saltimages/salt-3003.1-py3:debian-9
164+
image: saltimages/salt-3003.2-py3:debian-9
165165
run_command: /lib/systemd/systemd
166-
- name: ubuntu-2004-3003-1-py3
166+
- name: ubuntu-2004-3003-2-py3
167167
driver:
168-
image: saltimages/salt-3003.1-py3:ubuntu-20.04
168+
image: saltimages/salt-3003.2-py3:ubuntu-20.04
169169
run_command: /lib/systemd/systemd
170-
- name: ubuntu-1804-3003-1-py3
170+
- name: ubuntu-1804-3003-2-py3
171171
driver:
172-
image: saltimages/salt-3003.1-py3:ubuntu-18.04
172+
image: saltimages/salt-3003.2-py3:ubuntu-18.04
173173
run_command: /lib/systemd/systemd
174-
- name: centos-8-3003-1-py3
174+
- name: centos-8-3003-2-py3
175175
driver:
176-
image: saltimages/salt-3003.1-py3:centos-8
177-
- name: centos-7-3003-1-py3
176+
image: saltimages/salt-3003.2-py3:centos-8
177+
- name: centos-7-3003-2-py3
178178
driver:
179-
image: saltimages/salt-3003.1-py3:centos-7
180-
- name: fedora-34-3003-1-py3
179+
image: saltimages/salt-3003.2-py3:centos-7
180+
- name: fedora-34-3003-2-py3
181181
driver:
182-
image: saltimages/salt-3003.1-py3:fedora-34
182+
image: saltimages/salt-3003.2-py3:fedora-34
183183
provision_command:
184184
- dnf -y update
185185
- dnf -y reinstall udev
186-
- name: fedora-33-3003-1-py3
186+
- name: fedora-33-3003-2-py3
187187
driver:
188-
image: saltimages/salt-3003.1-py3:fedora-33
188+
image: saltimages/salt-3003.2-py3:fedora-33
189189
provision_command:
190190
- dnf -y update
191191
- dnf -y reinstall udev
192-
- name: opensuse-leap-153-3003-1-py3
192+
- name: opensuse-leap-153-3003-2-py3
193193
driver:
194-
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
194+
image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
195195
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
196196
# => SCP did not finish successfully (255): (Net::SCP::Error)
197197
transport:
198198
max_ssh_sessions: 1
199-
- name: opensuse-leap-152-3003-1-py3
199+
- name: opensuse-leap-152-3003-2-py3
200200
driver:
201-
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
201+
image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
202202
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
203203
# => SCP did not finish successfully (255): (Net::SCP::Error)
204204
transport:
205205
max_ssh_sessions: 1
206-
- name: opensuse-tmbl-latest-3003-1-py3
206+
- name: opensuse-tmbl-latest-3003-2-py3
207207
driver:
208-
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
208+
image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
209209
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
210210
# => SCP did not finish successfully (255): (Net::SCP::Error)
211211
transport:
212212
max_ssh_sessions: 1
213-
- name: amazonlinux-2-3003-1-py3
213+
- name: amazonlinux-2-3003-2-py3
214+
driver:
215+
image: saltimages/salt-3003.2-py3:amazonlinux-2
216+
- name: oraclelinux-8-3003-2-py3
217+
driver:
218+
image: saltimages/salt-3003.2-py3:oraclelinux-8
219+
- name: oraclelinux-7-3003-2-py3
220+
driver:
221+
image: saltimages/salt-3003.2-py3:oraclelinux-7
222+
- name: arch-base-latest-3003-2-py3
223+
driver:
224+
image: saltimages/salt-3003.2-py3:arch-base-latest
225+
provision_command:
226+
- pacman --noconfirm -Syu systemd
227+
- name: gentoo-stage3-latest-3003-2-py3
214228
driver:
215-
image: saltimages/salt-3003.1-py3:amazonlinux-2
216-
- name: oraclelinux-8-3003-1-py3
229+
image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
230+
run_command: /sbin/init
231+
- name: gentoo-stage3-systemd-3003-2-py3
217232
driver:
218-
image: saltimages/salt-3003.1-py3:oraclelinux-8
219-
- name: oraclelinux-7-3003-1-py3
233+
image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
234+
- name: almalinux-8-3003-2-py3
220235
driver:
221-
image: saltimages/salt-3003.1-py3:oraclelinux-7
236+
image: saltimages/salt-3003.2-py3:almalinux-8
237+
238+
## SALT `3003.1`
222239
- name: arch-base-latest-3003-1-py3
223240
driver:
224241
image: saltimages/salt-3003.1-py3:arch-base-latest

0 commit comments

Comments
 (0)