Skip to content

Commit 87b51a5

Browse files
dafyddjdafyddj
authored
Merge pull request #392 from dafyddj/feat/salt-3006-16-3007-8
ci: update images for v3006.17 & v3007.9
2 parents 682bc44 + 167ceff commit 87b51a5

File tree

3 files changed

+87
-87
lines changed

3 files changed

+87
-87
lines changed

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
1212
# improvement: avoid package installations which are already covered by the
1313
# `salt-image-builder` (i.e. the pre-salted images that we're using)
1414
# rubocop:disable Layout/LineLength
15-
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
15+
gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
1616
# rubocop:enable Layout/LineLength
1717

1818
gem 'kitchen-inspec', '3.0.0'

‎Gemfile.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: https://github.com/test-kitchen/kitchen-docker
3+
revision: 511e4ad36856b9e2eccceb56603586e6cebd296a
4+
ref: 511e4ad36856b9e2eccceb56603586e6cebd296a
5+
specs:
6+
kitchen-docker (3.0.0)
7+
test-kitchen (>= 1.0.0, < 4.0)
8+
19
GIT
210
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
311
revision: a0c6295303f7d7a4d2a6164b5e77868560b04945
@@ -40,14 +48,6 @@ GIT
4048
tty-prompt (~> 0.17)
4149
tty-table (~> 0.10)
4250

43-
GIT
44-
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
45-
revision: 104079a1d2fe34f5b076f4d316f6f837fa76e412
46-
branch: ssf
47-
specs:
48-
kitchen-docker (2.13.0)
49-
test-kitchen (>= 1.0.0)
50-
5151
GEM
5252
remote: https://rubygems.org/
5353
specs:
@@ -322,11 +322,11 @@ GEM
322322
ms_rest_azure (~> 0.12.0)
323323
azure_mgmt_storage (0.23.0)
324324
ms_rest_azure (~> 0.12.0)
325-
base64 (0.2.0)
325+
base64 (0.3.0)
326326
bcrypt_pbkdf (1.1.1)
327327
bcrypt_pbkdf (1.1.1-x64-mingw-ucrt)
328328
benchmark (0.4.0)
329-
bigdecimal (3.1.9)
329+
bigdecimal (3.3.1)
330330
bson (4.15.0)
331331
builder (3.3.0)
332332
chef-config (18.7.6)
@@ -513,7 +513,7 @@ GEM
513513
faraday (>= 0.9, < 2.0.0)
514514
faraday-cookie_jar (~> 0.0.6)
515515
ms_rest (~> 0.7.6)
516-
multi_json (1.15.0)
516+
multi_json (1.17.0)
517517
multipart-post (2.4.1)
518518
mutex_m (0.3.0)
519519
net-scp (4.1.0)
@@ -556,7 +556,7 @@ GEM
556556
trailblazer-option (>= 0.1.1, < 0.2.0)
557557
uber (< 0.2.0)
558558
retriable (3.1.2)
559-
rexml (3.4.2)
559+
rexml (3.4.4)
560560
roo (2.9.0)
561561
nokogiri (~> 1)
562562
rubyzip (>= 1.3.0, < 3.0.0)

‎kitchen.yml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -91,143 +91,143 @@ platforms:
9191
driver:
9292
image: saltimages/salt-master-py3:rockylinux-8
9393

94-
## SALT `3007.7`
95-
- name: debian-12-3007-7
94+
## SALT `3007.9`
95+
- name: debian-12-3007-9
9696
driver:
97-
image: saltimages/salt-3007.7-py3:debian-12
97+
image: saltimages/salt-3007.9-py3:debian-12
9898
run_command: /lib/systemd/systemd
99-
- name: debian-11-3007-7
99+
- name: debian-11-3007-9
100100
driver:
101-
image: saltimages/salt-3007.7-py3:debian-11
101+
image: saltimages/salt-3007.9-py3:debian-11
102102
run_command: /lib/systemd/systemd
103-
- name: ubuntu-2404-3007-7
103+
- name: ubuntu-2404-3007-9
104104
driver:
105-
image: saltimages/salt-3007.7-py3:ubuntu-24.04
105+
image: saltimages/salt-3007.9-py3:ubuntu-24.04
106106
run_command: /lib/systemd/systemd
107-
- name: ubuntu-2204-3007-7
107+
- name: ubuntu-2204-3007-9
108108
driver:
109-
image: saltimages/salt-3007.7-py3:ubuntu-22.04
109+
image: saltimages/salt-3007.9-py3:ubuntu-22.04
110110
run_command: /lib/systemd/systemd
111-
- name: ubuntu-2004-3007-7
111+
- name: ubuntu-2004-3007-9
112112
driver:
113-
image: saltimages/salt-3007.7-py3:ubuntu-20.04
113+
image: saltimages/salt-3007.9-py3:ubuntu-20.04
114114
run_command: /lib/systemd/systemd
115-
- name: centos-stream9-3007-7
115+
- name: centos-stream9-3007-9
116116
driver:
117-
image: saltimages/salt-3007.7-py3:centos-stream9
118-
- name: opensuse-leap-156-3007-7
117+
image: saltimages/salt-3007.9-py3:centos-stream9
118+
- name: opensuse-leap-156-3007-9
119119
driver:
120-
image: saltimages/salt-3007.7-py3:opensuse-leap-15.6
120+
image: saltimages/salt-3007.9-py3:opensuse-leap-15.6
121121
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
122122
# => SCP did not finish successfully (255): (Net::SCP::Error)
123123
transport:
124124
max_ssh_sessions: 1
125-
- name: opensuse-tmbl-latest-3007-7
125+
- name: opensuse-tmbl-latest-3007-9
126126
driver:
127-
image: saltimages/salt-3007.7-py3:opensuse-tumbleweed-latest
127+
image: saltimages/salt-3007.9-py3:opensuse-tumbleweed-latest
128128
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
129129
# => SCP did not finish successfully (255): (Net::SCP::Error)
130130
transport:
131131
max_ssh_sessions: 1
132-
- name: fedora-41-3007-7
132+
- name: fedora-41-3007-9
133133
driver:
134-
image: saltimages/salt-3007.7-py3:fedora-41
135-
- name: fedora-40-3007-7
134+
image: saltimages/salt-3007.9-py3:fedora-41
135+
- name: fedora-40-3007-9
136136
driver:
137-
image: saltimages/salt-3007.7-py3:fedora-40
138-
- name: amazonlinux-2023-3007-7
137+
image: saltimages/salt-3007.9-py3:fedora-40
138+
- name: amazonlinux-2023-3007-9
139139
driver:
140-
image: saltimages/salt-3007.7-py3:amazonlinux-2023
141-
- name: amazonlinux-2-3007-7
140+
image: saltimages/salt-3007.9-py3:amazonlinux-2023
141+
- name: amazonlinux-2-3007-9
142142
driver:
143-
image: saltimages/salt-3007.7-py3:amazonlinux-2
144-
- name: oraclelinux-9-3007-7
143+
image: saltimages/salt-3007.9-py3:amazonlinux-2
144+
- name: oraclelinux-9-3007-9
145145
driver:
146-
image: saltimages/salt-3007.7-py3:oraclelinux-9
147-
- name: oraclelinux-8-3007-7
146+
image: saltimages/salt-3007.9-py3:oraclelinux-9
147+
- name: oraclelinux-8-3007-9
148148
driver:
149-
image: saltimages/salt-3007.7-py3:oraclelinux-8
150-
- name: almalinux-9-3007-7
149+
image: saltimages/salt-3007.9-py3:oraclelinux-8
150+
- name: almalinux-9-3007-9
151151
driver:
152-
image: saltimages/salt-3007.7-py3:almalinux-9
153-
- name: almalinux-8-3007-7
152+
image: saltimages/salt-3007.9-py3:almalinux-9
153+
- name: almalinux-8-3007-9
154154
driver:
155-
image: saltimages/salt-3007.7-py3:almalinux-8
156-
- name: rockylinux-9-3007-7
155+
image: saltimages/salt-3007.9-py3:almalinux-8
156+
- name: rockylinux-9-3007-9
157157
driver:
158-
image: saltimages/salt-3007.7-py3:rockylinux-9
159-
- name: rockylinux-8-3007-7
158+
image: saltimages/salt-3007.9-py3:rockylinux-9
159+
- name: rockylinux-8-3007-9
160160
driver:
161-
image: saltimages/salt-3007.7-py3:rockylinux-8
161+
image: saltimages/salt-3007.9-py3:rockylinux-8
162162

163-
## SALT `3006.15`
164-
- name: debian-12-3006-15
163+
## SALT `3006.17`
164+
- name: debian-12-3006-17
165165
driver:
166-
image: saltimages/salt-3006.15-py3:debian-12
166+
image: saltimages/salt-3006.17-py3:debian-12
167167
run_command: /lib/systemd/systemd
168-
- name: debian-11-3006-15
168+
- name: debian-11-3006-17
169169
driver:
170-
image: saltimages/salt-3006.15-py3:debian-11
170+
image: saltimages/salt-3006.17-py3:debian-11
171171
run_command: /lib/systemd/systemd
172-
- name: ubuntu-2404-3006-15
172+
- name: ubuntu-2404-3006-17
173173
driver:
174-
image: saltimages/salt-3006.15-py3:ubuntu-24.04
174+
image: saltimages/salt-3006.17-py3:ubuntu-24.04
175175
run_command: /lib/systemd/systemd
176-
- name: ubuntu-2204-3006-15
176+
- name: ubuntu-2204-3006-17
177177
driver:
178-
image: saltimages/salt-3006.15-py3:ubuntu-22.04
178+
image: saltimages/salt-3006.17-py3:ubuntu-22.04
179179
run_command: /lib/systemd/systemd
180-
- name: ubuntu-2004-3006-15
180+
- name: ubuntu-2004-3006-17
181181
driver:
182-
image: saltimages/salt-3006.15-py3:ubuntu-20.04
182+
image: saltimages/salt-3006.17-py3:ubuntu-20.04
183183
run_command: /lib/systemd/systemd
184-
- name: centos-stream9-3006-15
184+
- name: centos-stream9-3006-17
185185
driver:
186-
image: saltimages/salt-3006.15-py3:centos-stream9
187-
- name: opensuse-tmbl-latest-3006-15
186+
image: saltimages/salt-3006.17-py3:centos-stream9
187+
- name: opensuse-tmbl-latest-3006-17
188188
driver:
189-
image: saltimages/salt-3006.15-py3:opensuse-tumbleweed-latest
189+
image: saltimages/salt-3006.17-py3:opensuse-tumbleweed-latest
190190
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
191191
# => SCP did not finish successfully (255): (Net::SCP::Error)
192192
transport:
193193
max_ssh_sessions: 1
194-
- name: opensuse-leap-156-3006-15
194+
- name: opensuse-leap-156-3006-17
195195
driver:
196-
image: saltimages/salt-3006.15-py3:opensuse-leap-15.6
196+
image: saltimages/salt-3006.17-py3:opensuse-leap-15.6
197197
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
198198
# => SCP did not finish successfully (255): (Net::SCP::Error)
199199
transport:
200200
max_ssh_sessions: 1
201-
- name: fedora-41-3006-15
201+
- name: fedora-41-3006-17
202202
driver:
203-
image: saltimages/salt-3006.15-py3:fedora-41
204-
- name: fedora-40-3006-15
203+
image: saltimages/salt-3006.17-py3:fedora-41
204+
- name: fedora-40-3006-17
205205
driver:
206-
image: saltimages/salt-3006.15-py3:fedora-40
207-
- name: amazonlinux-2023-3006-15
206+
image: saltimages/salt-3006.17-py3:fedora-40
207+
- name: amazonlinux-2023-3006-17
208208
driver:
209-
image: saltimages/salt-3006.15-py3:amazonlinux-2023
210-
- name: amazonlinux-2-3006-15
209+
image: saltimages/salt-3006.17-py3:amazonlinux-2023
210+
- name: amazonlinux-2-3006-17
211211
driver:
212-
image: saltimages/salt-3006.15-py3:amazonlinux-2
213-
- name: oraclelinux-9-3006-15
212+
image: saltimages/salt-3006.17-py3:amazonlinux-2
213+
- name: oraclelinux-9-3006-17
214214
driver:
215-
image: saltimages/salt-3006.15-py3:oraclelinux-9
216-
- name: oraclelinux-8-3006-15
215+
image: saltimages/salt-3006.17-py3:oraclelinux-9
216+
- name: oraclelinux-8-3006-17
217217
driver:
218-
image: saltimages/salt-3006.15-py3:oraclelinux-8
219-
- name: almalinux-9-3006-15
218+
image: saltimages/salt-3006.17-py3:oraclelinux-8
219+
- name: almalinux-9-3006-17
220220
driver:
221-
image: saltimages/salt-3006.15-py3:almalinux-9
222-
- name: almalinux-8-3006-15
221+
image: saltimages/salt-3006.17-py3:almalinux-9
222+
- name: almalinux-8-3006-17
223223
driver:
224-
image: saltimages/salt-3006.15-py3:almalinux-8
225-
- name: rockylinux-9-3006-15
224+
image: saltimages/salt-3006.17-py3:almalinux-8
225+
- name: rockylinux-9-3006-17
226226
driver:
227-
image: saltimages/salt-3006.15-py3:rockylinux-9
228-
- name: rockylinux-8-3006-15
227+
image: saltimages/salt-3006.17-py3:rockylinux-9
228+
- name: rockylinux-8-3006-17
229229
driver:
230-
image: saltimages/salt-3006.15-py3:rockylinux-8
230+
image: saltimages/salt-3006.17-py3:rockylinux-8
231231

232232

233233
verifier:

0 commit comments

Comments
 (0)