Skip to content

Commit f8e4ba0

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 6b2ee60 commit f8e4ba0

File tree

3 files changed

+94
-76
lines changed

3 files changed

+94
-76
lines changed

‎.gitlab-ci.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -152,21 +152,22 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
152152
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
153153
redhat-almalinux-8-master-py3: {extends: '.test_instance'}
154154
redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
155-
# debian-debian-11-3003-1-py3: {extends: '.test_instance'}
156-
# debian-debian-10-3003-1-py3: {extends: '.test_instance'}
157-
# debian-debian-9-3003-1-py3: {extends: '.test_instance'}
158-
# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
159-
# ubuntu-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
160-
# redhat-centos-8-3003-1-py3: {extends: '.test_instance'}
161-
# redhat-centos-7-3003-1-py3: {extends: '.test_instance'}
162-
# redhat-fedora-34-3003-1-py3: {extends: '.test_instance'}
163-
# redhat-fedora-33-3003-1-py3: {extends: '.test_instance'}
164-
# suse-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
165-
# suse-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
166-
# suse-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
167-
# redhat-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
168-
# redhat-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
169-
# redhat-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
155+
# debian-debian-11-3003-2-py3: {extends: '.test_instance'}
156+
# debian-debian-10-3003-2-py3: {extends: '.test_instance'}
157+
# debian-debian-9-3003-2-py3: {extends: '.test_instance'}
158+
# ubuntu-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
159+
# ubuntu-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
160+
# redhat-centos-8-3003-2-py3: {extends: '.test_instance'}
161+
# redhat-centos-7-3003-2-py3: {extends: '.test_instance'}
162+
# redhat-fedora-34-3003-2-py3: {extends: '.test_instance'}
163+
# redhat-fedora-33-3003-2-py3: {extends: '.test_instance'}
164+
# suse-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
165+
# suse-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
166+
# suse-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
167+
# redhat-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
168+
# redhat-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
169+
# redhat-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
170+
# redhat-almalinux-8-3003-2-py3: {extends: '.test_instance'}
170171
# debian-debian-11-3002-6-py3: {extends: '.test_instance'}
171172
# debian-debian-10-3002-6-py3: {extends: '.test_instance'}
172173
# debian-debian-9-3002-6-py3: {extends: '.test_instance'}

‎.travis.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,22 @@ jobs:
112112
- env: INSTANCE=redhat-oraclelinux-7-master-py3
113113
- env: INSTANCE=redhat-almalinux-8-master-py3
114114
- env: INSTANCE=redhat-rockylinux-8-master-py3
115-
# - env: INSTANCE=debian-debian-11-3003-1-py3
116-
# - env: INSTANCE=debian-debian-10-3003-1-py3
117-
# - env: INSTANCE=debian-debian-9-3003-1-py3
118-
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
119-
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-1-py3
120-
# - env: INSTANCE=redhat-centos-8-3003-1-py3
121-
# - env: INSTANCE=redhat-centos-7-3003-1-py3
122-
# - env: INSTANCE=redhat-fedora-34-3003-1-py3
123-
# - env: INSTANCE=redhat-fedora-33-3003-1-py3
124-
# - env: INSTANCE=suse-opensuse-leap-153-3003-1-py3
125-
# - env: INSTANCE=suse-opensuse-leap-152-3003-1-py3
126-
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-1-py3
127-
# - env: INSTANCE=redhat-amazonlinux-2-3003-1-py3
128-
# - env: INSTANCE=redhat-oraclelinux-8-3003-1-py3
129-
# - env: INSTANCE=redhat-oraclelinux-7-3003-1-py3
115+
# - env: INSTANCE=debian-debian-11-3003-2-py3
116+
# - env: INSTANCE=debian-debian-10-3003-2-py3
117+
# - env: INSTANCE=debian-debian-9-3003-2-py3
118+
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-2-py3
119+
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-2-py3
120+
# - env: INSTANCE=redhat-centos-8-3003-2-py3
121+
# - env: INSTANCE=redhat-centos-7-3003-2-py3
122+
# - env: INSTANCE=redhat-fedora-34-3003-2-py3
123+
# - env: INSTANCE=redhat-fedora-33-3003-2-py3
124+
# - env: INSTANCE=suse-opensuse-leap-153-3003-2-py3
125+
# - env: INSTANCE=suse-opensuse-leap-152-3003-2-py3
126+
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-2-py3
127+
# - env: INSTANCE=redhat-amazonlinux-2-3003-2-py3
128+
# - env: INSTANCE=redhat-oraclelinux-8-3003-2-py3
129+
# - env: INSTANCE=redhat-oraclelinux-7-3003-2-py3
130+
# - env: INSTANCE=redhat-almalinux-8-3003-2-py3
130131
# - env: INSTANCE=debian-debian-11-3002-6-py3
131132
# - env: INSTANCE=debian-debian-10-3002-6-py3
132133
# - env: INSTANCE=debian-debian-9-3002-6-py3

‎kitchen.yml‎

Lines changed: 62 additions & 46 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
@@ -436,9 +451,9 @@ suites:
436451
- debian-11-master-py3
437452
- debian-10-master-py3
438453
- debian-9-master-py3
439-
- debian-11-3003-1-py3
440-
- debian-10-3003-1-py3
441-
- debian-9-3003-1-py3
454+
- debian-11-3003-2-py3
455+
- debian-10-3003-2-py3
456+
- debian-9-3003-2-py3
442457
- debian-11-3002-6-py3
443458
- debian-10-3002-6-py3
444459
- debian-9-3002-6-py3
@@ -473,8 +488,8 @@ suites:
473488
- ubuntu-1804-tiamat-py3
474489
- ubuntu-2004-master-py3
475490
- ubuntu-1804-master-py3
476-
- ubuntu-2004-3003-1-py3
477-
- ubuntu-1804-3003-1-py3
491+
- ubuntu-2004-3003-2-py3
492+
- ubuntu-1804-3003-2-py3
478493
- ubuntu-2004-3002-6-py3
479494
- ubuntu-1804-3002-6-py3
480495
- ubuntu-2004-3001-7-py3
@@ -522,13 +537,14 @@ suites:
522537
- oraclelinux-7-master-py3
523538
- almalinux-8-master-py3
524539
- rockylinux-8-master-py3
525-
- centos-8-3003-1-py3
526-
- centos-7-3003-1-py3
527-
- fedora-34-3003-1-py3
528-
- fedora-33-3003-1-py3
529-
- amazonlinux-2-3003-1-py3
530-
- oraclelinux-8-3003-1-py3
531-
- oraclelinux-7-3003-1-py3
540+
- centos-8-3003-2-py3
541+
- centos-7-3003-2-py3
542+
- fedora-34-3003-2-py3
543+
- fedora-33-3003-2-py3
544+
- amazonlinux-2-3003-2-py3
545+
- oraclelinux-8-3003-2-py3
546+
- oraclelinux-7-3003-2-py3
547+
- almalinux-8-3003-2-py3
532548
- centos-8-3002-6-py3
533549
- centos-7-3002-6-py3
534550
- fedora-34-3002-6-py3
@@ -569,9 +585,9 @@ suites:
569585
- opensuse-leap-153-master-py3
570586
- opensuse-leap-152-master-py3
571587
- opensuse-tmbl-latest-master-py3
572-
- opensuse-leap-153-3003-1-py3
573-
- opensuse-leap-152-3003-1-py3
574-
- opensuse-tmbl-latest-3003-1-py3
588+
- opensuse-leap-153-3003-2-py3
589+
- opensuse-leap-152-3003-2-py3
590+
- opensuse-tmbl-latest-3003-2-py3
575591
- opensuse-leap-153-3002-2-py3
576592
- opensuse-leap-152-3002-2-py3
577593
- opensuse-tmbl-latest-3002-2-py3

0 commit comments

Comments
 (0)