Skip to content

Commit b71ff75

Browse files
committed
ci: use latest test images
1 parent a1bdd12 commit b71ff75

3 files changed

Lines changed: 55 additions & 11 deletions

File tree

.gitlab-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ default-ubuntu-2404-master-py3: {extends: '.test_instance'}
181181
default-ubuntu-2204-master-py3: {extends: '.test_instance'}
182182
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
183183
default-centos-stream9-master-py3: {extends: '.test_instance'}
184-
default-opensuse-leap-156-master-py3: {extends: '.test_instance'}
184+
default-opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
185185
default-opensuse-leap-155-master-py3: {extends: '.test_instance'}
186186
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
187187
default-amazonlinux-2023-master-py3: {extends: '.test_instance'}
188-
default-fedora-41-master-1-py3: {extends: '.test_instance'}
189-
default-fedora-40-master-1-py3: {extends: '.test_instance'}
188+
default-fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
189+
default-fedora-40-master-py3: {extends: '.test_instance'}
190190
default-oraclelinux-9-master-py3: {extends: '.test_instance'}
191191
default-oraclelinux-8-master-py3: {extends: '.test_instance'}
192192
default-almalinux-9-master-py3: {extends: '.test_instance'}
@@ -202,7 +202,7 @@ default-centos-stream9-3007-1-py3: {extends: '.test_instance'}
202202
default-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
203203
default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
204204
default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
205-
default-fedora-41-3007-1-py3: {extends: '.test_instance'}
205+
default-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
206206
default-fedora-40-3007-1-py3: {extends: '.test_instance'}
207207
default-amazonlinux-2-3007-1-py3: {extends: '.test_instance'}
208208
default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
@@ -221,7 +221,7 @@ default-centos-stream9-3006-9-py3: {extends: '.test_instance'}
221221
default-opensuse-leap-156-3006-9-py3: {extends: '.test_instance'}
222222
default-opensuse-leap-155-3006-9-py3: {extends: '.test_instance'}
223223
default-opensuse-tmbl-latest-3006-9-py3: {extends: '.test_instance'}
224-
default-fedora-41-3006-9-py3: {extends: '.test_instance'}
224+
default-fedora-41-3006-9-py3: {extends: '.test_instance_failure_permitted'}
225225
default-fedora-40-3006-9-py3: {extends: '.test_instance'}
226226
default-amazonlinux-2-3006-9-py3: {extends: '.test_instance'}
227227
default-amazonlinux-2023-3006-9-py3: {extends: '.test_instance'}

kitchen.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,21 +120,21 @@ platforms:
120120
image: saltimages/salt-3007.1-py3:centos-stream9
121121
- name: opensuse-leap-155-3007-1-py3
122122
driver:
123-
image: saltimages/salt-master-py3:opensuse-leap-15.5
123+
image: saltimages/salt-3007.1-py3:opensuse-leap-15.5
124124
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
125125
# => SCP did not finish successfully (255): (Net::SCP::Error)
126126
transport:
127127
max_ssh_sessions: 1
128128
- name: opensuse-leap-156-3007-1-py3
129129
driver:
130-
image: saltimages/salt-master-py3:opensuse-leap-15.6
130+
image: saltimages/salt-3007.1-py3:opensuse-leap-15.6
131131
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
132132
# => SCP did not finish successfully (255): (Net::SCP::Error)
133133
transport:
134134
max_ssh_sessions: 1
135135
- name: opensuse-tmbl-latest-3007-1-py3
136136
driver:
137-
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
137+
image: saltimages/salt-3007.1-py3:opensuse-tumbleweed-latest
138138
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
139139
# => SCP did not finish successfully (255): (Net::SCP::Error)
140140
transport:
@@ -196,21 +196,21 @@ platforms:
196196
image: saltimages/salt-3006.9-py3:centos-stream9
197197
- name: opensuse-tmbl-latest-3006-9-py3
198198
driver:
199-
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
199+
image: saltimages/salt-3006.9-py3:opensuse-tumbleweed-latest
200200
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
201201
# => SCP did not finish successfully (255): (Net::SCP::Error)
202202
transport:
203203
max_ssh_sessions: 1
204204
- name: opensuse-leap-156-3006-9-py3
205205
driver:
206-
image: saltimages/salt-master-py3:opensuse-leap-15.6
206+
image: saltimages/salt-3006.9-py3:opensuse-leap-15.6
207207
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
208208
# => SCP did not finish successfully (255): (Net::SCP::Error)
209209
transport:
210210
max_ssh_sessions: 1
211211
- name: opensuse-leap-155-3006-9-py3
212212
driver:
213-
image: saltimages/salt-master-py3:opensuse-leap-15.5
213+
image: saltimages/salt-3006.9-py3:opensuse-leap-15.5
214214
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
215215
# => SCP did not finish successfully (255): (Net::SCP::Error)
216216
transport:
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# yamllint disable rule:indentation rule:line-length
2+
# CentOS Linux-9
3+
---
4+
values:
5+
added_in_defaults: defaults_value
6+
added_in_lookup: lookup_value
7+
added_in_pillar: pillar_value
8+
arch: amd64
9+
config: /etc/template-formula.conf
10+
lookup:
11+
added_in_lookup: lookup_value
12+
master: template-master
13+
winner: lookup
14+
map_jinja:
15+
sources:
16+
- Y:G@osarch
17+
- Y:G@os_family
18+
- Y:G@os
19+
- Y:G@osfinger
20+
- C@TEMPLATE:lookup
21+
- C@TEMPLATE
22+
- Y:G@id
23+
master: template-master
24+
pkg:
25+
name: bash
26+
rootgroup: root
27+
service:
28+
name: systemd-journald
29+
subcomponent:
30+
config: /etc/TEMPLATE-subcomponent-formula.conf
31+
tofs:
32+
files_switch:
33+
- any/path/can/be/used/here
34+
- id
35+
- roles
36+
- osfinger
37+
- os
38+
- os_family
39+
source_files:
40+
TEMPLATE-config-file-file-managed:
41+
- example.tmpl.jinja
42+
TEMPLATE-subcomponent-config-file-file-managed:
43+
- subcomponent-example.tmpl.jinja
44+
winner: pillar

0 commit comments

Comments
 (0)