Skip to content

Commit 209b43f

Browse files
dafyddjdafyddj
authored
Merge pull request #293 from dafyddj/ci/images
ci: update images for v3007.2
2 parents d108bef + 0741129 commit 209b43f

File tree

2 files changed

+58
-58
lines changed

2 files changed

+58
-58
lines changed

‎.gitlab-ci.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -200,25 +200,25 @@ almalinux-9-master-py3: {extends: '.test_instance'}
200200
almalinux-8-master-py3: {extends: '.test_instance'}
201201
rockylinux-9-master-py3: {extends: '.test_instance'}
202202
rockylinux-8-master-py3: {extends: '.test_instance'}
203-
debian-12-3007-1-py3: {extends: '.test_instance'}
204-
debian-11-3007-1-py3: {extends: '.test_instance'}
205-
ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
206-
ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
207-
ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
208-
centos-stream9-3007-1-py3: {extends: '.test_instance'}
209-
opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
210-
opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
211-
opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
212-
fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
213-
fedora-40-3007-1-py3: {extends: '.test_instance'}
214-
amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'}
215-
amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
216-
oraclelinux-9-3007-1-py3: {extends: '.test_instance'}
217-
oraclelinux-8-3007-1-py3: {extends: '.test_instance'}
218-
almalinux-9-3007-1-py3: {extends: '.test_instance'}
219-
almalinux-8-3007-1-py3: {extends: '.test_instance'}
220-
rockylinux-9-3007-1-py3: {extends: '.test_instance'}
221-
rockylinux-8-3007-1-py3: {extends: '.test_instance'}
203+
debian-12-3007-2-py3: {extends: '.test_instance'}
204+
debian-11-3007-2-py3: {extends: '.test_instance'}
205+
ubuntu-2404-3007-2-py3: {extends: '.test_instance'}
206+
ubuntu-2204-3007-2-py3: {extends: '.test_instance'}
207+
ubuntu-2004-3007-2-py3: {extends: '.test_instance'}
208+
centos-stream9-3007-2-py3: {extends: '.test_instance'}
209+
opensuse-leap-156-3007-2-py3: {extends: '.test_instance'}
210+
opensuse-leap-155-3007-2-py3: {extends: '.test_instance'}
211+
opensuse-tmbl-latest-3007-2-py3: {extends: '.test_instance'}
212+
fedora-41-3007-2-py3: {extends: '.test_instance_failure_permitted'}
213+
fedora-40-3007-2-py3: {extends: '.test_instance'}
214+
amazonlinux-2-3007-2-py3: {extends: '.test_instance_failure_permitted'}
215+
amazonlinux-2023-3007-2-py3: {extends: '.test_instance'}
216+
oraclelinux-9-3007-2-py3: {extends: '.test_instance'}
217+
oraclelinux-8-3007-2-py3: {extends: '.test_instance'}
218+
almalinux-9-3007-2-py3: {extends: '.test_instance'}
219+
almalinux-8-3007-2-py3: {extends: '.test_instance'}
220+
rockylinux-9-3007-2-py3: {extends: '.test_instance'}
221+
rockylinux-8-3007-2-py3: {extends: '.test_instance'}
222222
debian-12-3006-10-py3: {extends: '.test_instance'}
223223
debian-11-3006-10-py3: {extends: '.test_instance'}
224224
ubuntu-2404-3006-10-py3: {extends: '.test_instance'}

‎kitchen.yml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -98,81 +98,81 @@ platforms:
9898
driver:
9999
image: saltimages/salt-master-py3:rockylinux-8
100100

101-
## SALT `3007.1`
102-
- name: debian-12-3007-1-py3
101+
## SALT `3007.2`
102+
- name: debian-12-3007-2-py3
103103
driver:
104-
image: saltimages/salt-3007.1-py3:debian-12
104+
image: saltimages/salt-3007.2-py3:debian-12
105105
run_command: /lib/systemd/systemd
106-
- name: debian-11-3007-1-py3
106+
- name: debian-11-3007-2-py3
107107
driver:
108-
image: saltimages/salt-3007.1-py3:debian-11
108+
image: saltimages/salt-3007.2-py3:debian-11
109109
run_command: /lib/systemd/systemd
110-
- name: ubuntu-2404-3007-1-py3
110+
- name: ubuntu-2404-3007-2-py3
111111
driver:
112-
image: saltimages/salt-3007.1-py3:ubuntu-24.04
112+
image: saltimages/salt-3007.2-py3:ubuntu-24.04
113113
run_command: /lib/systemd/systemd
114-
- name: ubuntu-2204-3007-1-py3
114+
- name: ubuntu-2204-3007-2-py3
115115
driver:
116-
image: saltimages/salt-3007.1-py3:ubuntu-22.04
116+
image: saltimages/salt-3007.2-py3:ubuntu-22.04
117117
run_command: /lib/systemd/systemd
118-
- name: ubuntu-2004-3007-1-py3
118+
- name: ubuntu-2004-3007-2-py3
119119
driver:
120-
image: saltimages/salt-3007.1-py3:ubuntu-20.04
120+
image: saltimages/salt-3007.2-py3:ubuntu-20.04
121121
run_command: /lib/systemd/systemd
122-
- name: centos-stream9-3007-1-py3
122+
- name: centos-stream9-3007-2-py3
123123
driver:
124-
image: saltimages/salt-3007.1-py3:centos-stream9
125-
- name: opensuse-leap-155-3007-1-py3
124+
image: saltimages/salt-3007.2-py3:centos-stream9
125+
- name: opensuse-leap-155-3007-2-py3
126126
driver:
127-
image: saltimages/salt-3007.1-py3:opensuse-leap-15.5
127+
image: saltimages/salt-3007.2-py3:opensuse-leap-15.5
128128
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
129129
# => SCP did not finish successfully (255): (Net::SCP::Error)
130130
transport:
131131
max_ssh_sessions: 1
132-
- name: opensuse-leap-156-3007-1-py3
132+
- name: opensuse-leap-156-3007-2-py3
133133
driver:
134-
image: saltimages/salt-3007.1-py3:opensuse-leap-15.6
134+
image: saltimages/salt-3007.2-py3:opensuse-leap-15.6
135135
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
136136
# => SCP did not finish successfully (255): (Net::SCP::Error)
137137
transport:
138138
max_ssh_sessions: 1
139-
- name: opensuse-tmbl-latest-3007-1-py3
139+
- name: opensuse-tmbl-latest-3007-2-py3
140140
driver:
141-
image: saltimages/salt-3007.1-py3:opensuse-tumbleweed-latest
141+
image: saltimages/salt-3007.2-py3:opensuse-tumbleweed-latest
142142
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
143143
# => SCP did not finish successfully (255): (Net::SCP::Error)
144144
transport:
145145
max_ssh_sessions: 1
146-
- name: fedora-41-3007-1-py3
146+
- name: fedora-41-3007-2-py3
147147
driver:
148-
image: saltimages/salt-3007.1-py3:fedora-41
149-
- name: fedora-40-3007-1-py3
148+
image: saltimages/salt-3007.2-py3:fedora-41
149+
- name: fedora-40-3007-2-py3
150150
driver:
151-
image: saltimages/salt-3007.1-py3:fedora-40
152-
- name: amazonlinux-2023-3007-1-py3
151+
image: saltimages/salt-3007.2-py3:fedora-40
152+
- name: amazonlinux-2023-3007-2-py3
153153
driver:
154-
image: saltimages/salt-3007.1-py3:amazonlinux-2023
155-
- name: amazonlinux-2-3007-1-py3
154+
image: saltimages/salt-3007.2-py3:amazonlinux-2023
155+
- name: amazonlinux-2-3007-2-py3
156156
driver:
157-
image: saltimages/salt-3007.1-py3:amazonlinux-2
158-
- name: oraclelinux-9-3007-1-py3
157+
image: saltimages/salt-3007.2-py3:amazonlinux-2
158+
- name: oraclelinux-9-3007-2-py3
159159
driver:
160-
image: saltimages/salt-3007.1-py3:oraclelinux-9
161-
- name: oraclelinux-8-3007-1-py3
160+
image: saltimages/salt-3007.2-py3:oraclelinux-9
161+
- name: oraclelinux-8-3007-2-py3
162162
driver:
163-
image: saltimages/salt-3007.1-py3:oraclelinux-8
164-
- name: almalinux-9-3007-1-py3
163+
image: saltimages/salt-3007.2-py3:oraclelinux-8
164+
- name: almalinux-9-3007-2-py3
165165
driver:
166-
image: saltimages/salt-3007.1-py3:almalinux-9
167-
- name: almalinux-8-3007-1-py3
166+
image: saltimages/salt-3007.2-py3:almalinux-9
167+
- name: almalinux-8-3007-2-py3
168168
driver:
169-
image: saltimages/salt-3007.1-py3:almalinux-8
170-
- name: rockylinux-9-3007-1-py3
169+
image: saltimages/salt-3007.2-py3:almalinux-8
170+
- name: rockylinux-9-3007-2-py3
171171
driver:
172-
image: saltimages/salt-3007.1-py3:rockylinux-9
173-
- name: rockylinux-8-3007-1-py3
172+
image: saltimages/salt-3007.2-py3:rockylinux-9
173+
- name: rockylinux-8-3007-2-py3
174174
driver:
175-
image: saltimages/salt-3007.1-py3:rockylinux-8
175+
image: saltimages/salt-3007.2-py3:rockylinux-8
176176

177177
## SALT `3006.10`
178178
- name: debian-12-3006-10-py3

0 commit comments

Comments
 (0)