Skip to content

Commit 7ae5980

Browse files
renovate[bot]renovate[bot]
authored
chore(deps): update dependency https://github.com/dafyddj/copier-ssf-ci to v1.3.4
1 parent 7667173 commit 7ae5980

File tree

5 files changed

+111
-84
lines changed

5 files changed

+111
-84
lines changed

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

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

‎.github/renovate.json5‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
<<<<<<< before updating
23
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
34
enabledManagers: [
45
'copier',
@@ -26,4 +27,15 @@
2627
],
2728
},
2829
],
30+
=======
31+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
32+
extends: [
33+
"github>saltstack-formulas/.github",
34+
"github>saltstack-formulas/.github:copier"
35+
],
36+
/**********************************************************
37+
* This file is managed as part of a Copier template. *
38+
* Please make your own changes below this comment. *
39+
*********************************************************/
40+
>>>>>>> after updating
2941
}

‎.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.89@sha256:6d51c9542819b94f0596e3568794d17e3dc742949ae438ea56c95091766d39be'
18+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
19+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
20+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.23@sha256:53d89d685532acbc29b7be6a56143ec5e11a8a19d5a76969dc4f8c0a35a53425'
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:eceba5b0fc2fcf83a74c298391c2ed9e1adbdaf04ee173611bd6282ec973e7ba'
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
# The alias states were removed in the great module migration, causing the tests to fail with Salt master branch
141142
# See https://github.com/saltstack-formulas/postfix-formula/issues/134
142143
debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
@@ -168,6 +169,14 @@ opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
168169
opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
169170
fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
170171
fedora-40-3006-10-py3: {extends: '.test_instance'}
172+
=======
173+
debian-12-master: {extends: '.test_instance_failure_permitted'}
174+
debian-11-master: {extends: '.test_instance_failure_permitted'}
175+
debian-12-3007-2: {extends: '.test_instance'}
176+
debian-11-3007-2: {extends: '.test_instance'}
177+
debian-12-3006-10: {extends: '.test_instance'}
178+
debian-11-3006-10: {extends: '.test_instance'}
179+
>>>>>>> after updating
171180
# yamllint enable rule:line-length
172181

173182
###############################################################################

‎.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.7
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.32.7
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
@@ -26,227 +26,227 @@ transport:
2626

2727
platforms:
2828
## SALT `master`
29-
- name: debian-12-master-py3
29+
- name: debian-12-master
3030
driver:
3131
image: saltimages/salt-master-py3:debian-12
3232
run_command: /lib/systemd/systemd
33-
- name: debian-11-master-py3
33+
- name: debian-11-master
3434
driver:
3535
image: saltimages/salt-master-py3:debian-11
3636
run_command: /lib/systemd/systemd
37-
- name: ubuntu-2404-master-py3
37+
- name: ubuntu-2404-master
3838
driver:
3939
image: saltimages/salt-master-py3:ubuntu-24.04
4040
run_command: /lib/systemd/systemd
41-
- name: ubuntu-2204-master-py3
41+
- name: ubuntu-2204-master
4242
driver:
4343
image: saltimages/salt-master-py3:ubuntu-22.04
4444
run_command: /lib/systemd/systemd
45-
- name: ubuntu-2004-master-py3
45+
- name: ubuntu-2004-master
4646
driver:
4747
image: saltimages/salt-master-py3:ubuntu-20.04
4848
run_command: /lib/systemd/systemd
49-
- name: centos-stream9-master-py3
49+
- name: centos-stream9-master
5050
driver:
5151
image: saltimages/salt-master-py3:centos-stream9
52-
- name: opensuse-leap-156-master-py3
52+
- name: opensuse-leap-156-master
5353
driver:
5454
image: saltimages/salt-master-py3:opensuse-leap-15.6
5555
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
5656
# => SCP did not finish successfully (255): (Net::SCP::Error)
5757
transport:
5858
max_ssh_sessions: 1
59-
- name: opensuse-leap-155-master-py3
59+
- name: opensuse-leap-155-master
6060
driver:
6161
image: saltimages/salt-master-py3:opensuse-leap-15.5
6262
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
6363
# => SCP did not finish successfully (255): (Net::SCP::Error)
6464
transport:
6565
max_ssh_sessions: 1
66-
- name: opensuse-tmbl-latest-master-py3
66+
- name: opensuse-tmbl-latest-master
6767
driver:
6868
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
6969
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
7070
# => SCP did not finish successfully (255): (Net::SCP::Error)
7171
transport:
7272
max_ssh_sessions: 1
73-
- name: fedora-41-master-py3
73+
- name: fedora-41-master
7474
driver:
7575
image: saltimages/salt-master-py3:fedora-41
76-
- name: fedora-40-master-py3
76+
- name: fedora-40-master
7777
driver:
7878
image: saltimages/salt-master-py3:fedora-40
79-
- name: amazonlinux-2023-master-py3
79+
- name: amazonlinux-2023-master
8080
driver:
8181
image: saltimages/salt-master-py3:amazonlinux-2023
82-
- name: oraclelinux-9-master-py3
82+
- name: oraclelinux-9-master
8383
driver:
8484
image: saltimages/salt-master-py3:oraclelinux-9
85-
- name: oraclelinux-8-master-py3
85+
- name: oraclelinux-8-master
8686
driver:
8787
image: saltimages/salt-master-py3:oraclelinux-8
88-
- name: almalinux-9-master-py3
88+
- name: almalinux-9-master
8989
driver:
9090
image: saltimages/salt-master-py3:almalinux-9
91-
- name: almalinux-8-master-py3
91+
- name: almalinux-8-master
9292
driver:
9393
image: saltimages/salt-master-py3:almalinux-8
94-
- name: rockylinux-9-master-py3
94+
- name: rockylinux-9-master
9595
driver:
9696
image: saltimages/salt-master-py3:rockylinux-9
97-
- name: rockylinux-8-master-py3
97+
- name: rockylinux-8-master
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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`
178-
- name: debian-12-3006-10-py3
178+
- name: debian-12-3006-10
179179
driver:
180180
image: saltimages/salt-3006.10-py3:debian-12
181181
run_command: /lib/systemd/systemd
182-
- name: debian-11-3006-10-py3
182+
- name: debian-11-3006-10
183183
driver:
184184
image: saltimages/salt-3006.10-py3:debian-11
185185
run_command: /lib/systemd/systemd
186-
- name: ubuntu-2404-3006-10-py3
186+
- name: ubuntu-2404-3006-10
187187
driver:
188188
image: saltimages/salt-3006.10-py3:ubuntu-24.04
189189
run_command: /lib/systemd/systemd
190-
- name: ubuntu-2204-3006-10-py3
190+
- name: ubuntu-2204-3006-10
191191
driver:
192192
image: saltimages/salt-3006.10-py3:ubuntu-22.04
193193
run_command: /lib/systemd/systemd
194-
- name: ubuntu-2004-3006-10-py3
194+
- name: ubuntu-2004-3006-10
195195
driver:
196196
image: saltimages/salt-3006.10-py3:ubuntu-20.04
197197
run_command: /lib/systemd/systemd
198-
- name: centos-stream9-3006-10-py3
198+
- name: centos-stream9-3006-10
199199
driver:
200200
image: saltimages/salt-3006.10-py3:centos-stream9
201-
- name: opensuse-tmbl-latest-3006-10-py3
201+
- name: opensuse-tmbl-latest-3006-10
202202
driver:
203203
image: saltimages/salt-3006.10-py3:opensuse-tumbleweed-latest
204204
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
205205
# => SCP did not finish successfully (255): (Net::SCP::Error)
206206
transport:
207207
max_ssh_sessions: 1
208-
- name: opensuse-leap-156-3006-10-py3
208+
- name: opensuse-leap-156-3006-10
209209
driver:
210210
image: saltimages/salt-3006.10-py3:opensuse-leap-15.6
211211
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
212212
# => SCP did not finish successfully (255): (Net::SCP::Error)
213213
transport:
214214
max_ssh_sessions: 1
215-
- name: opensuse-leap-155-3006-10-py3
215+
- name: opensuse-leap-155-3006-10
216216
driver:
217217
image: saltimages/salt-3006.10-py3:opensuse-leap-15.5
218218
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
219219
# => SCP did not finish successfully (255): (Net::SCP::Error)
220220
transport:
221221
max_ssh_sessions: 1
222-
- name: fedora-41-3006-10-py3
222+
- name: fedora-41-3006-10
223223
driver:
224224
image: saltimages/salt-3006.10-py3:fedora-41
225-
- name: fedora-40-3006-10-py3
225+
- name: fedora-40-3006-10
226226
driver:
227227
image: saltimages/salt-3006.10-py3:fedora-40
228-
- name: amazonlinux-2023-3006-10-py3
228+
- name: amazonlinux-2023-3006-10
229229
driver:
230230
image: saltimages/salt-3006.10-py3:amazonlinux-2023
231-
- name: amazonlinux-2-3006-10-py3
231+
- name: amazonlinux-2-3006-10
232232
driver:
233233
image: saltimages/salt-3006.10-py3:amazonlinux-2
234-
- name: oraclelinux-9-3006-10-py3
234+
- name: oraclelinux-9-3006-10
235235
driver:
236236
image: saltimages/salt-3006.10-py3:oraclelinux-9
237-
- name: oraclelinux-8-3006-10-py3
237+
- name: oraclelinux-8-3006-10
238238
driver:
239239
image: saltimages/salt-3006.10-py3:oraclelinux-8
240-
- name: almalinux-9-3006-10-py3
240+
- name: almalinux-9-3006-10
241241
driver:
242242
image: saltimages/salt-3006.10-py3:almalinux-9
243-
- name: almalinux-8-3006-10-py3
243+
- name: almalinux-8-3006-10
244244
driver:
245245
image: saltimages/salt-3006.10-py3:almalinux-8
246-
- name: rockylinux-9-3006-10-py3
246+
- name: rockylinux-9-3006-10
247247
driver:
248248
image: saltimages/salt-3006.10-py3:rockylinux-9
249-
- name: rockylinux-8-3006-10-py3
249+
- name: rockylinux-8-3006-10
250250
driver:
251251
image: saltimages/salt-3006.10-py3:rockylinux-8
252252

0 commit comments

Comments
 (0)