Skip to content

Commit d1b6009

Browse files
dafyddjdafyddj
authored
Merge pull request #346 from dafyddj/ci/salt-3007-3006
ci: update images for v3006.14 & v3007.6
2 parents 8fd1a66 + 10aecef commit d1b6009

File tree

3 files changed

+120
-120
lines changed

3 files changed

+120
-120
lines changed

‎.github/workflows/main.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ jobs:
7272
- ubuntu-2404-master
7373
- ubuntu-2204-master
7474
- ubuntu-2004-master
75-
- debian-12-3007-5
76-
- debian-11-3007-5
77-
- ubuntu-2404-3007-5
78-
- ubuntu-2204-3007-5
79-
- ubuntu-2004-3007-5
80-
- debian-12-3006-13
81-
- debian-11-3006-13
82-
- ubuntu-2404-3006-13
83-
- ubuntu-2204-3006-13
84-
- ubuntu-2004-3006-13
75+
- debian-12-3007-6
76+
- debian-11-3007-6
77+
- ubuntu-2404-3007-6
78+
- ubuntu-2204-3007-6
79+
- ubuntu-2004-3007-6
80+
- debian-12-3006-14
81+
- debian-11-3006-14
82+
- ubuntu-2404-3006-14
83+
- ubuntu-2204-3006-14
84+
- ubuntu-2004-3006-14
8585
steps:
8686
- name: Debug on runner (When re-run with "Enable debug logging" checked)
8787
if: runner.debug

‎.gitlab-ci.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -231,42 +231,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
231231
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
232232
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
233233
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
234-
almalinux-9-3007-5: {extends: '.test_instance'}
235-
almalinux-8-3007-5: {extends: '.test_instance'}
236-
amazonlinux-2023-3007-5: {extends: '.test_instance'}
237-
amazonlinux-2-3007-5: {extends: '.test_instance_failure_permitted'}
238-
centos-stream9-3007-5: {extends: '.test_instance'}
239-
debian-12-3007-5: {extends: '.test_instance'}
240-
debian-11-3007-5: {extends: '.test_instance'}
241-
fedora-41-3007-5: {extends: '.test_instance_failure_permitted'}
242-
fedora-40-3007-5: {extends: '.test_instance'}
243-
opensuse-leap-156-3007-5: {extends: '.test_instance'}
244-
opensuse-tmbl-latest-3007-5: {extends: '.test_instance'}
245-
oraclelinux-9-3007-5: {extends: '.test_instance'}
246-
oraclelinux-8-3007-5: {extends: '.test_instance'}
247-
rockylinux-9-3007-5: {extends: '.test_instance'}
248-
rockylinux-8-3007-5: {extends: '.test_instance'}
249-
ubuntu-2404-3007-5: {extends: '.test_instance'}
250-
ubuntu-2204-3007-5: {extends: '.test_instance'}
251-
ubuntu-2004-3007-5: {extends: '.test_instance'}
252-
almalinux-9-3006-13: {extends: '.test_instance'}
253-
almalinux-8-3006-13: {extends: '.test_instance'}
254-
amazonlinux-2023-3006-13: {extends: '.test_instance'}
255-
amazonlinux-2-3006-13: {extends: '.test_instance_failure_permitted'}
256-
centos-stream9-3006-13: {extends: '.test_instance'}
257-
debian-12-3006-13: {extends: '.test_instance'}
258-
debian-11-3006-13: {extends: '.test_instance'}
259-
fedora-41-3006-13: {extends: '.test_instance_failure_permitted'}
260-
fedora-40-3006-13: {extends: '.test_instance'}
261-
opensuse-leap-156-3006-13: {extends: '.test_instance'}
262-
opensuse-tmbl-latest-3006-13: {extends: '.test_instance'}
263-
oraclelinux-9-3006-13: {extends: '.test_instance'}
264-
oraclelinux-8-3006-13: {extends: '.test_instance'}
265-
rockylinux-9-3006-13: {extends: '.test_instance'}
266-
rockylinux-8-3006-13: {extends: '.test_instance'}
267-
ubuntu-2404-3006-13: {extends: '.test_instance'}
268-
ubuntu-2204-3006-13: {extends: '.test_instance'}
269-
ubuntu-2004-3006-13: {extends: '.test_instance'}
234+
almalinux-9-3007-6: {extends: '.test_instance'}
235+
almalinux-8-3007-6: {extends: '.test_instance'}
236+
amazonlinux-2023-3007-6: {extends: '.test_instance'}
237+
amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
238+
centos-stream9-3007-6: {extends: '.test_instance'}
239+
debian-12-3007-6: {extends: '.test_instance'}
240+
debian-11-3007-6: {extends: '.test_instance'}
241+
fedora-41-3007-6: {extends: '.test_instance_failure_permitted'}
242+
fedora-40-3007-6: {extends: '.test_instance'}
243+
opensuse-leap-156-3007-6: {extends: '.test_instance'}
244+
opensuse-tmbl-latest-3007-6: {extends: '.test_instance'}
245+
oraclelinux-9-3007-6: {extends: '.test_instance'}
246+
oraclelinux-8-3007-6: {extends: '.test_instance'}
247+
rockylinux-9-3007-6: {extends: '.test_instance'}
248+
rockylinux-8-3007-6: {extends: '.test_instance'}
249+
ubuntu-2404-3007-6: {extends: '.test_instance'}
250+
ubuntu-2204-3007-6: {extends: '.test_instance'}
251+
ubuntu-2004-3007-6: {extends: '.test_instance'}
252+
almalinux-9-3006-14: {extends: '.test_instance'}
253+
almalinux-8-3006-14: {extends: '.test_instance'}
254+
amazonlinux-2023-3006-14: {extends: '.test_instance'}
255+
amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
256+
centos-stream9-3006-14: {extends: '.test_instance'}
257+
debian-12-3006-14: {extends: '.test_instance'}
258+
debian-11-3006-14: {extends: '.test_instance'}
259+
fedora-41-3006-14: {extends: '.test_instance_failure_permitted'}
260+
fedora-40-3006-14: {extends: '.test_instance'}
261+
opensuse-leap-156-3006-14: {extends: '.test_instance'}
262+
opensuse-tmbl-latest-3006-14: {extends: '.test_instance'}
263+
oraclelinux-9-3006-14: {extends: '.test_instance'}
264+
oraclelinux-8-3006-14: {extends: '.test_instance'}
265+
rockylinux-9-3006-14: {extends: '.test_instance'}
266+
rockylinux-8-3006-14: {extends: '.test_instance'}
267+
ubuntu-2404-3006-14: {extends: '.test_instance'}
268+
ubuntu-2204-3006-14: {extends: '.test_instance'}
269+
ubuntu-2004-3006-14: {extends: '.test_instance'}
270270
# yamllint enable rule:line-length
271271

272272
###############################################################################

‎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.5`
95-
- name: debian-12-3007-5
94+
## SALT `3007.6`
95+
- name: debian-12-3007-6
9696
driver:
97-
image: saltimages/salt-3007.5-py3:debian-12
97+
image: saltimages/salt-3007.6-py3:debian-12
9898
run_command: /lib/systemd/systemd
99-
- name: debian-11-3007-5
99+
- name: debian-11-3007-6
100100
driver:
101-
image: saltimages/salt-3007.5-py3:debian-11
101+
image: saltimages/salt-3007.6-py3:debian-11
102102
run_command: /lib/systemd/systemd
103-
- name: ubuntu-2404-3007-5
103+
- name: ubuntu-2404-3007-6
104104
driver:
105-
image: saltimages/salt-3007.5-py3:ubuntu-24.04
105+
image: saltimages/salt-3007.6-py3:ubuntu-24.04
106106
run_command: /lib/systemd/systemd
107-
- name: ubuntu-2204-3007-5
107+
- name: ubuntu-2204-3007-6
108108
driver:
109-
image: saltimages/salt-3007.5-py3:ubuntu-22.04
109+
image: saltimages/salt-3007.6-py3:ubuntu-22.04
110110
run_command: /lib/systemd/systemd
111-
- name: ubuntu-2004-3007-5
111+
- name: ubuntu-2004-3007-6
112112
driver:
113-
image: saltimages/salt-3007.5-py3:ubuntu-20.04
113+
image: saltimages/salt-3007.6-py3:ubuntu-20.04
114114
run_command: /lib/systemd/systemd
115-
- name: centos-stream9-3007-5
115+
- name: centos-stream9-3007-6
116116
driver:
117-
image: saltimages/salt-3007.5-py3:centos-stream9
118-
- name: opensuse-leap-156-3007-5
117+
image: saltimages/salt-3007.6-py3:centos-stream9
118+
- name: opensuse-leap-156-3007-6
119119
driver:
120-
image: saltimages/salt-3007.5-py3:opensuse-leap-15.6
120+
image: saltimages/salt-3007.6-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-5
125+
- name: opensuse-tmbl-latest-3007-6
126126
driver:
127-
image: saltimages/salt-3007.5-py3:opensuse-tumbleweed-latest
127+
image: saltimages/salt-3007.6-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-5
132+
- name: fedora-41-3007-6
133133
driver:
134-
image: saltimages/salt-3007.5-py3:fedora-41
135-
- name: fedora-40-3007-5
134+
image: saltimages/salt-3007.6-py3:fedora-41
135+
- name: fedora-40-3007-6
136136
driver:
137-
image: saltimages/salt-3007.5-py3:fedora-40
138-
- name: amazonlinux-2023-3007-5
137+
image: saltimages/salt-3007.6-py3:fedora-40
138+
- name: amazonlinux-2023-3007-6
139139
driver:
140-
image: saltimages/salt-3007.5-py3:amazonlinux-2023
141-
- name: amazonlinux-2-3007-5
140+
image: saltimages/salt-3007.6-py3:amazonlinux-2023
141+
- name: amazonlinux-2-3007-6
142142
driver:
143-
image: saltimages/salt-3007.5-py3:amazonlinux-2
144-
- name: oraclelinux-9-3007-5
143+
image: saltimages/salt-3007.6-py3:amazonlinux-2
144+
- name: oraclelinux-9-3007-6
145145
driver:
146-
image: saltimages/salt-3007.5-py3:oraclelinux-9
147-
- name: oraclelinux-8-3007-5
146+
image: saltimages/salt-3007.6-py3:oraclelinux-9
147+
- name: oraclelinux-8-3007-6
148148
driver:
149-
image: saltimages/salt-3007.5-py3:oraclelinux-8
150-
- name: almalinux-9-3007-5
149+
image: saltimages/salt-3007.6-py3:oraclelinux-8
150+
- name: almalinux-9-3007-6
151151
driver:
152-
image: saltimages/salt-3007.5-py3:almalinux-9
153-
- name: almalinux-8-3007-5
152+
image: saltimages/salt-3007.6-py3:almalinux-9
153+
- name: almalinux-8-3007-6
154154
driver:
155-
image: saltimages/salt-3007.5-py3:almalinux-8
156-
- name: rockylinux-9-3007-5
155+
image: saltimages/salt-3007.6-py3:almalinux-8
156+
- name: rockylinux-9-3007-6
157157
driver:
158-
image: saltimages/salt-3007.5-py3:rockylinux-9
159-
- name: rockylinux-8-3007-5
158+
image: saltimages/salt-3007.6-py3:rockylinux-9
159+
- name: rockylinux-8-3007-6
160160
driver:
161-
image: saltimages/salt-3007.5-py3:rockylinux-8
161+
image: saltimages/salt-3007.6-py3:rockylinux-8
162162

163-
## SALT `3006.13`
164-
- name: debian-12-3006-13
163+
## SALT `3006.14`
164+
- name: debian-12-3006-14
165165
driver:
166-
image: saltimages/salt-3006.13-py3:debian-12
166+
image: saltimages/salt-3006.14-py3:debian-12
167167
run_command: /lib/systemd/systemd
168-
- name: debian-11-3006-13
168+
- name: debian-11-3006-14
169169
driver:
170-
image: saltimages/salt-3006.13-py3:debian-11
170+
image: saltimages/salt-3006.14-py3:debian-11
171171
run_command: /lib/systemd/systemd
172-
- name: ubuntu-2404-3006-13
172+
- name: ubuntu-2404-3006-14
173173
driver:
174-
image: saltimages/salt-3006.13-py3:ubuntu-24.04
174+
image: saltimages/salt-3006.14-py3:ubuntu-24.04
175175
run_command: /lib/systemd/systemd
176-
- name: ubuntu-2204-3006-13
176+
- name: ubuntu-2204-3006-14
177177
driver:
178-
image: saltimages/salt-3006.13-py3:ubuntu-22.04
178+
image: saltimages/salt-3006.14-py3:ubuntu-22.04
179179
run_command: /lib/systemd/systemd
180-
- name: ubuntu-2004-3006-13
180+
- name: ubuntu-2004-3006-14
181181
driver:
182-
image: saltimages/salt-3006.13-py3:ubuntu-20.04
182+
image: saltimages/salt-3006.14-py3:ubuntu-20.04
183183
run_command: /lib/systemd/systemd
184-
- name: centos-stream9-3006-13
184+
- name: centos-stream9-3006-14
185185
driver:
186-
image: saltimages/salt-3006.13-py3:centos-stream9
187-
- name: opensuse-tmbl-latest-3006-13
186+
image: saltimages/salt-3006.14-py3:centos-stream9
187+
- name: opensuse-tmbl-latest-3006-14
188188
driver:
189-
image: saltimages/salt-3006.13-py3:opensuse-tumbleweed-latest
189+
image: saltimages/salt-3006.14-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-13
194+
- name: opensuse-leap-156-3006-14
195195
driver:
196-
image: saltimages/salt-3006.13-py3:opensuse-leap-15.6
196+
image: saltimages/salt-3006.14-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-13
201+
- name: fedora-41-3006-14
202202
driver:
203-
image: saltimages/salt-3006.13-py3:fedora-41
204-
- name: fedora-40-3006-13
203+
image: saltimages/salt-3006.14-py3:fedora-41
204+
- name: fedora-40-3006-14
205205
driver:
206-
image: saltimages/salt-3006.13-py3:fedora-40
207-
- name: amazonlinux-2023-3006-13
206+
image: saltimages/salt-3006.14-py3:fedora-40
207+
- name: amazonlinux-2023-3006-14
208208
driver:
209-
image: saltimages/salt-3006.13-py3:amazonlinux-2023
210-
- name: amazonlinux-2-3006-13
209+
image: saltimages/salt-3006.14-py3:amazonlinux-2023
210+
- name: amazonlinux-2-3006-14
211211
driver:
212-
image: saltimages/salt-3006.13-py3:amazonlinux-2
213-
- name: oraclelinux-9-3006-13
212+
image: saltimages/salt-3006.14-py3:amazonlinux-2
213+
- name: oraclelinux-9-3006-14
214214
driver:
215-
image: saltimages/salt-3006.13-py3:oraclelinux-9
216-
- name: oraclelinux-8-3006-13
215+
image: saltimages/salt-3006.14-py3:oraclelinux-9
216+
- name: oraclelinux-8-3006-14
217217
driver:
218-
image: saltimages/salt-3006.13-py3:oraclelinux-8
219-
- name: almalinux-9-3006-13
218+
image: saltimages/salt-3006.14-py3:oraclelinux-8
219+
- name: almalinux-9-3006-14
220220
driver:
221-
image: saltimages/salt-3006.13-py3:almalinux-9
222-
- name: almalinux-8-3006-13
221+
image: saltimages/salt-3006.14-py3:almalinux-9
222+
- name: almalinux-8-3006-14
223223
driver:
224-
image: saltimages/salt-3006.13-py3:almalinux-8
225-
- name: rockylinux-9-3006-13
224+
image: saltimages/salt-3006.14-py3:almalinux-8
225+
- name: rockylinux-9-3006-14
226226
driver:
227-
image: saltimages/salt-3006.13-py3:rockylinux-9
228-
- name: rockylinux-8-3006-13
227+
image: saltimages/salt-3006.14-py3:rockylinux-9
228+
- name: rockylinux-8-3006-14
229229
driver:
230-
image: saltimages/salt-3006.13-py3:rockylinux-8
230+
image: saltimages/salt-3006.14-py3:rockylinux-8
231231

232232

233233
verifier:

0 commit comments

Comments
 (0)