Skip to content

Commit ba09a9e

Browse files
renovate[bot]renovate[bot]
authored
chore(deps): update dependency https://github.com/dafyddj/copier-ssf-ci to v1.2.0
1 parent 4917f26 commit ba09a9e

4 files changed

Lines changed: 96 additions & 84 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v1.1.9
2+
_commit: v1.2.0
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
4+
failure_permitted_pattern: master
45
formula_name: vault
6+
supported_oses:
7+
- Debian

‎.gitlab-ci.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
stage_test: &stage_test 'test'
1515
# `image`
1616
# yamllint disable rule:line-length
17-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.87@sha256:7d88b7ea69f3cd917995d0e7ea5ce7aae97383db95003319d0c43a1d68372402'
18-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
19-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
20-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.21@sha256:620cdfaa9c45b4941090e2b557f5f551fbc1189caf13689e5bbfbd5c76885400'
17+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.88@sha256:80fa0eae4f2736d78a4f3df7699f0bebb7775de6deda3a297dd8d08067bd5e66'
18+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.57@sha256:93cbc1e643c51b086d7c7c7a10e09550027da73c65ec436bb1de2dddf7989a54'
19+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.57@sha256:93cbc1e643c51b086d7c7c7a10e09550027da73c65ec436bb1de2dddf7989a54'
20+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.22@sha256:f125976d867860e46d4a4da3f6fb37567ebca6305fa0751e95530da81ad5de0e'
2121
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
2222
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
2323
# `services`
2424
services_docker_dind: &services_docker_dind
25-
- 'docker:dind@sha256:3a861ec98623bd6014610291123751dc19e0c6d474ac3b38767771791ac0eb5e'
25+
- 'docker:28.1.1-dind@sha256:1e9d444274b295261e49f96635f3d56a615cb3ae2021204160f8ac3cdf8f3b58'
2626
# yamllint enable rule:line-length
2727
# `variables`
2828
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -137,6 +137,7 @@ rubocop:
137137
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
138138
# https://github.com/saltstack/great-module-migration/issues/14
139139
#
140+
<<<<<<< before updating
140141
# debian-12-master-py3: {extends: '.test_instance'}
141142
# debian-11-master-py3: {extends: '.test_instance'}
142143
# ubuntu-2404-master-py3: {extends: '.test_instance'}
@@ -193,6 +194,14 @@ centos-stream9-3006-10-py3: {extends: '.test_instance'}
193194
# almalinux-8-3006-10-py3: {extends: '.test_instance'}
194195
# rockylinux-9-3006-10-py3: {extends: '.test_instance'}
195196
# rockylinux-8-3006-10-py3: {extends: '.test_instance'}
197+
=======
198+
debian-12-master: {extends: '.test_instance_failure_permitted'}
199+
debian-11-master: {extends: '.test_instance_failure_permitted'}
200+
debian-12-3007-2: {extends: '.test_instance'}
201+
debian-11-3007-2: {extends: '.test_instance'}
202+
debian-12-3006-10: {extends: '.test_instance'}
203+
debian-11-3006-10: {extends: '.test_instance'}
204+
>>>>>>> after updating
196205
# yamllint enable rule:line-length
197206

198207
###############################################################################

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
stages: [commit-msg]
2727
additional_dependencies: ['@commitlint/[email protected]']
2828
- repo: https://github.com/rubocop-hq/rubocop
29-
rev: v1.75.5
29+
rev: v1.75.6
3030
hooks:
3131
- id: rubocop
3232
name: Check Ruby files with rubocop
@@ -96,7 +96,7 @@ repos:
9696
)$
9797
additional_dependencies: [pygments==2.16.1]
9898
- repo: https://github.com/renovatebot/pre-commit-hooks
99-
rev: 40.10.4
99+
rev: 40.19.0
100100
hooks:
101101
- id: renovate-config-validator
102102
name: Check Renovate config with renovate-config-validator

‎kitchen.yml‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -24,227 +24,227 @@ transport:
2424

2525
platforms:
2626
## SALT `master`
27-
- name: debian-12-master-py3
27+
- name: debian-12-master
2828
driver:
2929
image: saltimages/salt-master-py3:debian-12
3030
run_command: /lib/systemd/systemd
31-
- name: debian-11-master-py3
31+
- name: debian-11-master
3232
driver:
3333
image: saltimages/salt-master-py3:debian-11
3434
run_command: /lib/systemd/systemd
35-
- name: ubuntu-2404-master-py3
35+
- name: ubuntu-2404-master
3636
driver:
3737
image: saltimages/salt-master-py3:ubuntu-24.04
3838
run_command: /lib/systemd/systemd
39-
- name: ubuntu-2204-master-py3
39+
- name: ubuntu-2204-master
4040
driver:
4141
image: saltimages/salt-master-py3:ubuntu-22.04
4242
run_command: /lib/systemd/systemd
43-
- name: ubuntu-2004-master-py3
43+
- name: ubuntu-2004-master
4444
driver:
4545
image: saltimages/salt-master-py3:ubuntu-20.04
4646
run_command: /lib/systemd/systemd
47-
- name: centos-stream9-master-py3
47+
- name: centos-stream9-master
4848
driver:
4949
image: saltimages/salt-master-py3:centos-stream9
50-
- name: opensuse-leap-156-master-py3
50+
- name: opensuse-leap-156-master
5151
driver:
5252
image: saltimages/salt-master-py3:opensuse-leap-15.6
5353
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
5454
# => SCP did not finish successfully (255): (Net::SCP::Error)
5555
transport:
5656
max_ssh_sessions: 1
57-
- name: opensuse-leap-155-master-py3
57+
- name: opensuse-leap-155-master
5858
driver:
5959
image: saltimages/salt-master-py3:opensuse-leap-15.5
6060
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
6161
# => SCP did not finish successfully (255): (Net::SCP::Error)
6262
transport:
6363
max_ssh_sessions: 1
64-
- name: opensuse-tmbl-latest-master-py3
64+
- name: opensuse-tmbl-latest-master
6565
driver:
6666
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
6767
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
6868
# => SCP did not finish successfully (255): (Net::SCP::Error)
6969
transport:
7070
max_ssh_sessions: 1
71-
- name: fedora-41-master-py3
71+
- name: fedora-41-master
7272
driver:
7373
image: saltimages/salt-master-py3:fedora-41
74-
- name: fedora-40-master-py3
74+
- name: fedora-40-master
7575
driver:
7676
image: saltimages/salt-master-py3:fedora-40
77-
- name: amazonlinux-2023-master-py3
77+
- name: amazonlinux-2023-master
7878
driver:
7979
image: saltimages/salt-master-py3:amazonlinux-2023
80-
- name: oraclelinux-9-master-py3
80+
- name: oraclelinux-9-master
8181
driver:
8282
image: saltimages/salt-master-py3:oraclelinux-9
83-
- name: oraclelinux-8-master-py3
83+
- name: oraclelinux-8-master
8484
driver:
8585
image: saltimages/salt-master-py3:oraclelinux-8
86-
- name: almalinux-9-master-py3
86+
- name: almalinux-9-master
8787
driver:
8888
image: saltimages/salt-master-py3:almalinux-9
89-
- name: almalinux-8-master-py3
89+
- name: almalinux-8-master
9090
driver:
9191
image: saltimages/salt-master-py3:almalinux-8
92-
- name: rockylinux-9-master-py3
92+
- name: rockylinux-9-master
9393
driver:
9494
image: saltimages/salt-master-py3:rockylinux-9
95-
- name: rockylinux-8-master-py3
95+
- name: rockylinux-8-master
9696
driver:
9797
image: saltimages/salt-master-py3:rockylinux-8
9898

99-
## SALT `3007.1`
100-
- name: debian-12-3007-1-py3
99+
## SALT `3007.2`
100+
- name: debian-12-3007-2
101101
driver:
102-
image: saltimages/salt-3007.1-py3:debian-12
102+
image: saltimages/salt-3007.2-py3:debian-12
103103
run_command: /lib/systemd/systemd
104-
- name: debian-11-3007-1-py3
104+
- name: debian-11-3007-2
105105
driver:
106-
image: saltimages/salt-3007.1-py3:debian-11
106+
image: saltimages/salt-3007.2-py3:debian-11
107107
run_command: /lib/systemd/systemd
108-
- name: ubuntu-2404-3007-1-py3
108+
- name: ubuntu-2404-3007-2
109109
driver:
110-
image: saltimages/salt-3007.1-py3:ubuntu-24.04
110+
image: saltimages/salt-3007.2-py3:ubuntu-24.04
111111
run_command: /lib/systemd/systemd
112-
- name: ubuntu-2204-3007-1-py3
112+
- name: ubuntu-2204-3007-2
113113
driver:
114-
image: saltimages/salt-3007.1-py3:ubuntu-22.04
114+
image: saltimages/salt-3007.2-py3:ubuntu-22.04
115115
run_command: /lib/systemd/systemd
116-
- name: ubuntu-2004-3007-1-py3
116+
- name: ubuntu-2004-3007-2
117117
driver:
118-
image: saltimages/salt-3007.1-py3:ubuntu-20.04
118+
image: saltimages/salt-3007.2-py3:ubuntu-20.04
119119
run_command: /lib/systemd/systemd
120-
- name: centos-stream9-3007-1-py3
120+
- name: centos-stream9-3007-2
121121
driver:
122-
image: saltimages/salt-3007.1-py3:centos-stream9
123-
- name: opensuse-leap-155-3007-1-py3
122+
image: saltimages/salt-3007.2-py3:centos-stream9
123+
- name: opensuse-leap-155-3007-2
124124
driver:
125-
image: saltimages/salt-3007.1-py3:opensuse-leap-15.5
125+
image: saltimages/salt-3007.2-py3:opensuse-leap-15.5
126126
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
127127
# => SCP did not finish successfully (255): (Net::SCP::Error)
128128
transport:
129129
max_ssh_sessions: 1
130-
- name: opensuse-leap-156-3007-1-py3
130+
- name: opensuse-leap-156-3007-2
131131
driver:
132-
image: saltimages/salt-3007.1-py3:opensuse-leap-15.6
132+
image: saltimages/salt-3007.2-py3:opensuse-leap-15.6
133133
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
134134
# => SCP did not finish successfully (255): (Net::SCP::Error)
135135
transport:
136136
max_ssh_sessions: 1
137-
- name: opensuse-tmbl-latest-3007-1-py3
137+
- name: opensuse-tmbl-latest-3007-2
138138
driver:
139-
image: saltimages/salt-3007.1-py3:opensuse-tumbleweed-latest
139+
image: saltimages/salt-3007.2-py3:opensuse-tumbleweed-latest
140140
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
141141
# => SCP did not finish successfully (255): (Net::SCP::Error)
142142
transport:
143143
max_ssh_sessions: 1
144-
- name: fedora-41-3007-1-py3
144+
- name: fedora-41-3007-2
145145
driver:
146-
image: saltimages/salt-3007.1-py3:fedora-41
147-
- name: fedora-40-3007-1-py3
146+
image: saltimages/salt-3007.2-py3:fedora-41
147+
- name: fedora-40-3007-2
148148
driver:
149-
image: saltimages/salt-3007.1-py3:fedora-40
150-
- name: amazonlinux-2023-3007-1-py3
149+
image: saltimages/salt-3007.2-py3:fedora-40
150+
- name: amazonlinux-2023-3007-2
151151
driver:
152-
image: saltimages/salt-3007.1-py3:amazonlinux-2023
153-
- name: amazonlinux-2-3007-1-py3
152+
image: saltimages/salt-3007.2-py3:amazonlinux-2023
153+
- name: amazonlinux-2-3007-2
154154
driver:
155-
image: saltimages/salt-3007.1-py3:amazonlinux-2
156-
- name: oraclelinux-9-3007-1-py3
155+
image: saltimages/salt-3007.2-py3:amazonlinux-2
156+
- name: oraclelinux-9-3007-2
157157
driver:
158-
image: saltimages/salt-3007.1-py3:oraclelinux-9
159-
- name: oraclelinux-8-3007-1-py3
158+
image: saltimages/salt-3007.2-py3:oraclelinux-9
159+
- name: oraclelinux-8-3007-2
160160
driver:
161-
image: saltimages/salt-3007.1-py3:oraclelinux-8
162-
- name: almalinux-9-3007-1-py3
161+
image: saltimages/salt-3007.2-py3:oraclelinux-8
162+
- name: almalinux-9-3007-2
163163
driver:
164-
image: saltimages/salt-3007.1-py3:almalinux-9
165-
- name: almalinux-8-3007-1-py3
164+
image: saltimages/salt-3007.2-py3:almalinux-9
165+
- name: almalinux-8-3007-2
166166
driver:
167-
image: saltimages/salt-3007.1-py3:almalinux-8
168-
- name: rockylinux-9-3007-1-py3
167+
image: saltimages/salt-3007.2-py3:almalinux-8
168+
- name: rockylinux-9-3007-2
169169
driver:
170-
image: saltimages/salt-3007.1-py3:rockylinux-9
171-
- name: rockylinux-8-3007-1-py3
170+
image: saltimages/salt-3007.2-py3:rockylinux-9
171+
- name: rockylinux-8-3007-2
172172
driver:
173-
image: saltimages/salt-3007.1-py3:rockylinux-8
173+
image: saltimages/salt-3007.2-py3:rockylinux-8
174174

175175
## SALT `3006.10`
176-
- name: debian-12-3006-10-py3
176+
- name: debian-12-3006-10
177177
driver:
178178
image: saltimages/salt-3006.10-py3:debian-12
179179
run_command: /lib/systemd/systemd
180-
- name: debian-11-3006-10-py3
180+
- name: debian-11-3006-10
181181
driver:
182182
image: saltimages/salt-3006.10-py3:debian-11
183183
run_command: /lib/systemd/systemd
184-
- name: ubuntu-2404-3006-10-py3
184+
- name: ubuntu-2404-3006-10
185185
driver:
186186
image: saltimages/salt-3006.10-py3:ubuntu-24.04
187187
run_command: /lib/systemd/systemd
188-
- name: ubuntu-2204-3006-10-py3
188+
- name: ubuntu-2204-3006-10
189189
driver:
190190
image: saltimages/salt-3006.10-py3:ubuntu-22.04
191191
run_command: /lib/systemd/systemd
192-
- name: ubuntu-2004-3006-10-py3
192+
- name: ubuntu-2004-3006-10
193193
driver:
194194
image: saltimages/salt-3006.10-py3:ubuntu-20.04
195195
run_command: /lib/systemd/systemd
196-
- name: centos-stream9-3006-10-py3
196+
- name: centos-stream9-3006-10
197197
driver:
198198
image: saltimages/salt-3006.10-py3:centos-stream9
199-
- name: opensuse-tmbl-latest-3006-10-py3
199+
- name: opensuse-tmbl-latest-3006-10
200200
driver:
201201
image: saltimages/salt-3006.10-py3:opensuse-tumbleweed-latest
202202
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
203203
# => SCP did not finish successfully (255): (Net::SCP::Error)
204204
transport:
205205
max_ssh_sessions: 1
206-
- name: opensuse-leap-156-3006-10-py3
206+
- name: opensuse-leap-156-3006-10
207207
driver:
208208
image: saltimages/salt-3006.10-py3:opensuse-leap-15.6
209209
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
210210
# => SCP did not finish successfully (255): (Net::SCP::Error)
211211
transport:
212212
max_ssh_sessions: 1
213-
- name: opensuse-leap-155-3006-10-py3
213+
- name: opensuse-leap-155-3006-10
214214
driver:
215215
image: saltimages/salt-3006.10-py3:opensuse-leap-15.5
216216
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
217217
# => SCP did not finish successfully (255): (Net::SCP::Error)
218218
transport:
219219
max_ssh_sessions: 1
220-
- name: fedora-41-3006-10-py3
220+
- name: fedora-41-3006-10
221221
driver:
222222
image: saltimages/salt-3006.10-py3:fedora-41
223-
- name: fedora-40-3006-10-py3
223+
- name: fedora-40-3006-10
224224
driver:
225225
image: saltimages/salt-3006.10-py3:fedora-40
226-
- name: amazonlinux-2023-3006-10-py3
226+
- name: amazonlinux-2023-3006-10
227227
driver:
228228
image: saltimages/salt-3006.10-py3:amazonlinux-2023
229-
- name: amazonlinux-2-3006-10-py3
229+
- name: amazonlinux-2-3006-10
230230
driver:
231231
image: saltimages/salt-3006.10-py3:amazonlinux-2
232-
- name: oraclelinux-9-3006-10-py3
232+
- name: oraclelinux-9-3006-10
233233
driver:
234234
image: saltimages/salt-3006.10-py3:oraclelinux-9
235-
- name: oraclelinux-8-3006-10-py3
235+
- name: oraclelinux-8-3006-10
236236
driver:
237237
image: saltimages/salt-3006.10-py3:oraclelinux-8
238-
- name: almalinux-9-3006-10-py3
238+
- name: almalinux-9-3006-10
239239
driver:
240240
image: saltimages/salt-3006.10-py3:almalinux-9
241-
- name: almalinux-8-3006-10-py3
241+
- name: almalinux-8-3006-10
242242
driver:
243243
image: saltimages/salt-3006.10-py3:almalinux-8
244-
- name: rockylinux-9-3006-10-py3
244+
- name: rockylinux-9-3006-10
245245
driver:
246246
image: saltimages/salt-3006.10-py3:rockylinux-9
247-
- name: rockylinux-8-3006-10-py3
247+
- name: rockylinux-8-3006-10
248248
driver:
249249
image: saltimages/salt-3006.10-py3:rockylinux-8
250250

0 commit comments

Comments
 (0)