Skip to content

Commit 84da8dc

Browse files
dafyddjdafyddj
authored
Merge pull request #40 from saltstack-formulas/renovate/https-github.com-dafyddj-copier-ssf-ci-2.x
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.11.0
2 parents ab3e3fa + 13d203a commit 84da8dc

5 files changed

Lines changed: 172 additions & 85 deletions

File tree

‎.copier-answers.ssf-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v2.10.8
2+
_commit: v2.11.0
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
name: Lint / `pre-commit`
2626
needs: should-run
2727
if: fromJSON(needs.should-run.outputs.should-run)
28-
container: techneg/ci-pre-commit:v2.5.44@sha256:e651cd9efda211fc44bece0073579ed129389fdfaadfe9c70374ef83e224e913
28+
container: techneg/ci-pre-commit:v2.5.45@sha256:bef8c61363feadbe5c5b66abc87d7504e71bc72f50baaf5b2b36dc6b3a5ed073
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 10
3131
steps:
@@ -61,7 +61,7 @@ jobs:
6161
issues: write
6262
pull-requests: write
6363
checks: read
64-
container: techneg/ci-semantic-release:v1.2.42@sha256:0f29918b74e53c974bea28eef546f35fdadfcdb40ea69a3ef19777f21c1d5c96
64+
container: techneg/ci-semantic-release:v1.2.43@sha256:7d28707c511e7291cf098cf8f04f1da0f7fffeae897d32910cceaf57acd786bb
6565
runs-on: ubuntu-latest
6666
timeout-minutes: 15
6767
steps:

‎.gitlab-ci.yml‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
stage_test: &stage_test 'test'
1616
# `image`
1717
# yamllint disable rule:line-length
18-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.141@sha256:864581ca5de1a3847ed73bd3e1d575b8b8869453743153911bbf7ac534f180c5'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.111@sha256:5efa97c12cf97dfb516402c49a463f6a9adfbdc96fa82eed3fb4e86a17d418c9'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.111@sha256:5efa97c12cf97dfb516402c49a463f6a9adfbdc96fa82eed3fb4e86a17d418c9'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.44@sha256:e651cd9efda211fc44bece0073579ed129389fdfaadfe9c70374ef83e224e913'
22-
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:a604eaacb2f133777754e37a22b8895fd8d4ee2a4763ba960a057a5daff443a2'
23-
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.42@sha256:0f29918b74e53c974bea28eef546f35fdadfcdb40ea69a3ef19777f21c1d5c96'
18+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.142@sha256:c374e40bca234b54db9a3e922239ddeef4581b6481ef4e6679024a453c15b856'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.112@sha256:fce4a39620b9de05356bcab1a4ab56e036462c00065d505c0548867448dc58b1'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.112@sha256:fce4a39620b9de05356bcab1a4ab56e036462c00065d505c0548867448dc58b1'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.45@sha256:bef8c61363feadbe5c5b66abc87d7504e71bc72f50baaf5b2b36dc6b3a5ed073'
22+
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:a2abed57112d1931b77b30138d8f6a211303f10f2d03d42513cfbe7de1e25963'
23+
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.43@sha256:7d28707c511e7291cf098cf8f04f1da0f7fffeae897d32910cceaf57acd786bb'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
2626
- 'docker:29.5.2-dind@sha256:6b9cd914eb9c6b342c040a49a27a5eb3804453bae6ecc90f7ff96133595a95e8'
@@ -175,6 +175,24 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
175175
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
176176
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
177177
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
178+
almalinux-9-3008: {extends: '.test_instance'}
179+
almalinux-8-3008: {extends: '.test_instance'}
180+
amazonlinux-2023-3008: {extends: '.test_instance'}
181+
amazonlinux-2-3008: {extends: '.test_instance_failure_permitted'}
182+
centos-stream9-3008: {extends: '.test_instance'}
183+
debian-12-3008: {extends: '.test_instance'}
184+
debian-11-3008: {extends: '.test_instance'}
185+
fedora-41-3008: {extends: '.test_instance_failure_permitted'}
186+
fedora-40-3008: {extends: '.test_instance'}
187+
opensuse-leap-156-3008: {extends: '.test_instance'}
188+
opensuse-tmbl-latest-3008: {extends: '.test_instance'}
189+
oraclelinux-9-3008: {extends: '.test_instance'}
190+
oraclelinux-8-3008: {extends: '.test_instance'}
191+
rockylinux-9-3008: {extends: '.test_instance'}
192+
rockylinux-8-3008: {extends: '.test_instance'}
193+
ubuntu-2404-3008: {extends: '.test_instance'}
194+
ubuntu-2204-3008: {extends: '.test_instance'}
195+
ubuntu-2004-3008: {extends: '.test_instance'}
178196
almalinux-9-3007: {extends: '.test_instance'}
179197
almalinux-8-3007: {extends: '.test_instance'}
180198
amazonlinux-2023-3007: {extends: '.test_instance'}

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
- id: commitlint
3131
- id: commitlint-ci
3232
- repo: https://github.com/rubocop-hq/rubocop
33-
rev: v1.86.2
33+
rev: v1.87.0
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
@@ -100,7 +100,7 @@ repos:
100100
)$
101101
additional_dependencies: [pygments==2.16.1]
102102
- repo: https://github.com/renovatebot/pre-commit-hooks
103-
rev: 43.150.0
103+
rev: 43.207.4
104104
hooks:
105105
- id: renovate-config-validator
106106
name: Check Renovate config with renovate-config-validator

‎kitchen.yml‎

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

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

163-
## SALT `3006.17`
164-
- name: debian-12-3006-17
163+
## SALT `3007.14`
164+
- name: debian-12-3007-14
165165
driver:
166-
image: saltimages/salt-3006.17-py3:debian-12
166+
image: saltimages/salt-3007.14-py3:debian-12
167167
run_command: /lib/systemd/systemd
168-
- name: debian-11-3006-17
168+
- name: debian-11-3007-14
169169
driver:
170-
image: saltimages/salt-3006.17-py3:debian-11
170+
image: saltimages/salt-3007.14-py3:debian-11
171171
run_command: /lib/systemd/systemd
172-
- name: ubuntu-2404-3006-17
172+
- name: ubuntu-2404-3007-14
173173
driver:
174-
image: saltimages/salt-3006.17-py3:ubuntu-24.04
174+
image: saltimages/salt-3007.14-py3:ubuntu-24.04
175175
run_command: /lib/systemd/systemd
176-
- name: ubuntu-2204-3006-17
176+
- name: ubuntu-2204-3007-14
177177
driver:
178-
image: saltimages/salt-3006.17-py3:ubuntu-22.04
178+
image: saltimages/salt-3007.14-py3:ubuntu-22.04
179179
run_command: /lib/systemd/systemd
180-
- name: ubuntu-2004-3006-17
180+
- name: ubuntu-2004-3007-14
181181
driver:
182-
image: saltimages/salt-3006.17-py3:ubuntu-20.04
182+
image: saltimages/salt-3007.14-py3:ubuntu-20.04
183183
run_command: /lib/systemd/systemd
184-
- name: centos-stream9-3006-17
184+
- name: centos-stream9-3007-14
185185
driver:
186-
image: saltimages/salt-3006.17-py3:centos-stream9
187-
- name: opensuse-tmbl-latest-3006-17
186+
image: saltimages/salt-3007.14-py3:centos-stream9
187+
- name: opensuse-leap-156-3007-14
188188
driver:
189-
image: saltimages/salt-3006.17-py3:opensuse-tumbleweed-latest
189+
image: saltimages/salt-3007.14-py3:opensuse-leap-15.6
190+
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
191+
# => SCP did not finish successfully (255): (Net::SCP::Error)
192+
transport:
193+
max_ssh_sessions: 1
194+
- name: opensuse-tmbl-latest-3007-14
195+
driver:
196+
image: saltimages/salt-3007.14-py3:opensuse-tumbleweed-latest
197+
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
198+
# => SCP did not finish successfully (255): (Net::SCP::Error)
199+
transport:
200+
max_ssh_sessions: 1
201+
- name: fedora-41-3007-14
202+
driver:
203+
image: saltimages/salt-3007.14-py3:fedora-41
204+
- name: fedora-40-3007-14
205+
driver:
206+
image: saltimages/salt-3007.14-py3:fedora-40
207+
- name: amazonlinux-2023-3007-14
208+
driver:
209+
image: saltimages/salt-3007.14-py3:amazonlinux-2023
210+
- name: amazonlinux-2-3007-14
211+
driver:
212+
image: saltimages/salt-3007.14-py3:amazonlinux-2
213+
- name: oraclelinux-9-3007-14
214+
driver:
215+
image: saltimages/salt-3007.14-py3:oraclelinux-9
216+
- name: oraclelinux-8-3007-14
217+
driver:
218+
image: saltimages/salt-3007.14-py3:oraclelinux-8
219+
- name: almalinux-9-3007-14
220+
driver:
221+
image: saltimages/salt-3007.14-py3:almalinux-9
222+
- name: almalinux-8-3007-14
223+
driver:
224+
image: saltimages/salt-3007.14-py3:almalinux-8
225+
- name: rockylinux-9-3007-14
226+
driver:
227+
image: saltimages/salt-3007.14-py3:rockylinux-9
228+
- name: rockylinux-8-3007-14
229+
driver:
230+
image: saltimages/salt-3007.14-py3:rockylinux-8
231+
232+
## SALT `3006.25`
233+
- name: debian-12-3006-25
234+
driver:
235+
image: saltimages/salt-3006.25-py3:debian-12
236+
run_command: /lib/systemd/systemd
237+
- name: debian-11-3006-25
238+
driver:
239+
image: saltimages/salt-3006.25-py3:debian-11
240+
run_command: /lib/systemd/systemd
241+
- name: ubuntu-2404-3006-25
242+
driver:
243+
image: saltimages/salt-3006.25-py3:ubuntu-24.04
244+
run_command: /lib/systemd/systemd
245+
- name: ubuntu-2204-3006-25
246+
driver:
247+
image: saltimages/salt-3006.25-py3:ubuntu-22.04
248+
run_command: /lib/systemd/systemd
249+
- name: ubuntu-2004-3006-25
250+
driver:
251+
image: saltimages/salt-3006.25-py3:ubuntu-20.04
252+
run_command: /lib/systemd/systemd
253+
- name: centos-stream9-3006-25
254+
driver:
255+
image: saltimages/salt-3006.25-py3:centos-stream9
256+
- name: opensuse-tmbl-latest-3006-25
257+
driver:
258+
image: saltimages/salt-3006.25-py3:opensuse-tumbleweed-latest
190259
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
191260
# => SCP did not finish successfully (255): (Net::SCP::Error)
192261
transport:
193262
max_ssh_sessions: 1
194-
- name: opensuse-leap-156-3006-17
263+
- name: opensuse-leap-156-3006-25
195264
driver:
196-
image: saltimages/salt-3006.17-py3:opensuse-leap-15.6
265+
image: saltimages/salt-3006.25-py3:opensuse-leap-15.6
197266
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
198267
# => SCP did not finish successfully (255): (Net::SCP::Error)
199268
transport:
200269
max_ssh_sessions: 1
201-
- name: fedora-41-3006-17
270+
- name: fedora-41-3006-25
202271
driver:
203-
image: saltimages/salt-3006.17-py3:fedora-41
204-
- name: fedora-40-3006-17
272+
image: saltimages/salt-3006.25-py3:fedora-41
273+
- name: fedora-40-3006-25
205274
driver:
206-
image: saltimages/salt-3006.17-py3:fedora-40
207-
- name: amazonlinux-2023-3006-17
275+
image: saltimages/salt-3006.25-py3:fedora-40
276+
- name: amazonlinux-2023-3006-25
208277
driver:
209-
image: saltimages/salt-3006.17-py3:amazonlinux-2023
210-
- name: amazonlinux-2-3006-17
278+
image: saltimages/salt-3006.25-py3:amazonlinux-2023
279+
- name: amazonlinux-2-3006-25
211280
driver:
212-
image: saltimages/salt-3006.17-py3:amazonlinux-2
213-
- name: oraclelinux-9-3006-17
281+
image: saltimages/salt-3006.25-py3:amazonlinux-2
282+
- name: oraclelinux-9-3006-25
214283
driver:
215-
image: saltimages/salt-3006.17-py3:oraclelinux-9
216-
- name: oraclelinux-8-3006-17
284+
image: saltimages/salt-3006.25-py3:oraclelinux-9
285+
- name: oraclelinux-8-3006-25
217286
driver:
218-
image: saltimages/salt-3006.17-py3:oraclelinux-8
219-
- name: almalinux-9-3006-17
287+
image: saltimages/salt-3006.25-py3:oraclelinux-8
288+
- name: almalinux-9-3006-25
220289
driver:
221-
image: saltimages/salt-3006.17-py3:almalinux-9
222-
- name: almalinux-8-3006-17
290+
image: saltimages/salt-3006.25-py3:almalinux-9
291+
- name: almalinux-8-3006-25
223292
driver:
224-
image: saltimages/salt-3006.17-py3:almalinux-8
225-
- name: rockylinux-9-3006-17
293+
image: saltimages/salt-3006.25-py3:almalinux-8
294+
- name: rockylinux-9-3006-25
226295
driver:
227-
image: saltimages/salt-3006.17-py3:rockylinux-9
228-
- name: rockylinux-8-3006-17
296+
image: saltimages/salt-3006.25-py3:rockylinux-9
297+
- name: rockylinux-8-3006-25
229298
driver:
230-
image: saltimages/salt-3006.17-py3:rockylinux-8
299+
image: saltimages/salt-3006.25-py3:rockylinux-8
231300

232301
##########################################################
233302
# This file is managed as part of a Copier template. #

0 commit comments

Comments
 (0)