Skip to content

Commit 5adb9c2

Browse files
dafyddjdafyddj
authored
Merge pull request #577 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.10.3
2 parents 4254fa2 + c7ad2d9 commit 5adb9c2

9 files changed

Lines changed: 349 additions & 320 deletions

File tree

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

Lines changed: 2 additions & 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.8.0
2+
_commit: v2.10.3
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []
@@ -19,3 +19,4 @@ supported_oses:
1919
- Oracle Linux
2020
- Rocky Linux
2121
- Ubuntu
22+
test_using_gha: false

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ 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.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3
28+
container: techneg/ci-pre-commit:v2.5.24@sha256:b206cbb9bf1506dec0e1b2a70c7e8d69850af75255a9d5d93d52dae54f636d3a
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 10
3131
steps:
3232
- run: | # Needed because of bug #2031 in `actions/checkout`
3333
git config --global --add safe.directory "$GITHUB_WORKSPACE"
34-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
34+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535
with:
3636
fetch-depth: 0
3737
fetch-tags: true
3838
filter: tree:0
3939
- name: Export `CI_CACHE_ID` from container
4040
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
41-
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
41+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4242
with:
4343
path: ~/.cache/pre-commit
4444
key: "${{ env.CI_CACHE_ID }}|\
@@ -61,13 +61,13 @@ jobs:
6161
issues: write
6262
pull-requests: write
6363
checks: read
64-
container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27
64+
container: techneg/ci-semantic-release:v1.2.22@sha256:091cbee13d24025ba940398995814c807d253933ce20a3b07563cc0d27bba147
6565
runs-on: ubuntu-latest
6666
timeout-minutes: 15
6767
steps:
6868
- run: | # Needed due to bug actions/checkout#2031
6969
git config --global --add safe.directory "$GITHUB_WORKSPACE"
70-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
70+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7171
# yamllint disable-line rule:line-length
7272
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
7373
with:

‎.gitlab-ci.yml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
stage_test: &stage_test 'test'
1616
# `image`
1717
# yamllint disable rule:line-length
18-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.103@sha256:3a2bf514e461769ed7b8880213e9637186bb7e17e0653b4a6ad3f249e4a60d33'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3'
22-
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
23-
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27'
18+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.121@sha256:cc78c38059137aee4b93e6b577391cc9f36d306689279b0fd903c1bbbd331a20'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.91@sha256:d3664d2db1ca266e1f3ded4ffe8afb3fe1b7690f08d28e6cd941ead157cf37a5'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.91@sha256:d3664d2db1ca266e1f3ded4ffe8afb3fe1b7690f08d28e6cd941ead157cf37a5'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.24@sha256:b206cbb9bf1506dec0e1b2a70c7e8d69850af75255a9d5d93d52dae54f636d3a'
22+
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:74850471782195453cdf91f4a5edf62b6fcc3365c124d4d975c7e87a702040d7'
23+
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.22@sha256:091cbee13d24025ba940398995814c807d253933ce20a3b07563cc0d27bba147'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
26-
- 'docker:28.3.3-dind@sha256:a56b3bdde89315ed2cc0e4906e582b5033d93bf20d9cb9510c2cdd4e7f7690b1'
26+
- 'docker:29.1.3-dind@sha256:173f284a4299164772a90f52b373e73e087583c0963f1334c9995f190ef6f3f5'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -135,8 +135,8 @@ rubocop:
135135
policy: 'pull'
136136
before_script: *bundle_install
137137
script:
138-
# Alternative value to consider: `${CI_JOB_NAME}`
139-
- 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
138+
- 'echo "Starting test job: ${CI_JOB_NAME}"'
139+
- 'bin/kitchen verify "${CI_JOB_NAME}"'
140140

141141
###############################################################################
142142
# Define `test` template (`allow_failure: true`)
@@ -175,42 +175,42 @@ 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-3007-7: {extends: '.test_instance'}
179-
almalinux-8-3007-7: {extends: '.test_instance'}
180-
amazonlinux-2023-3007-7: {extends: '.test_instance'}
181-
amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'}
182-
centos-stream9-3007-7: {extends: '.test_instance'}
183-
debian-12-3007-7: {extends: '.test_instance'}
184-
debian-11-3007-7: {extends: '.test_instance'}
185-
fedora-41-3007-7: {extends: '.test_instance_failure_permitted'}
186-
fedora-40-3007-7: {extends: '.test_instance'}
187-
opensuse-leap-156-3007-7: {extends: '.test_instance'}
188-
opensuse-tmbl-latest-3007-7: {extends: '.test_instance'}
189-
oraclelinux-9-3007-7: {extends: '.test_instance'}
190-
oraclelinux-8-3007-7: {extends: '.test_instance'}
191-
rockylinux-9-3007-7: {extends: '.test_instance'}
192-
rockylinux-8-3007-7: {extends: '.test_instance'}
193-
ubuntu-2404-3007-7: {extends: '.test_instance'}
194-
ubuntu-2204-3007-7: {extends: '.test_instance'}
195-
ubuntu-2004-3007-7: {extends: '.test_instance'}
196-
almalinux-9-3006-15: {extends: '.test_instance'}
197-
almalinux-8-3006-15: {extends: '.test_instance'}
198-
amazonlinux-2023-3006-15: {extends: '.test_instance'}
199-
amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'}
200-
centos-stream9-3006-15: {extends: '.test_instance'}
201-
debian-12-3006-15: {extends: '.test_instance'}
202-
debian-11-3006-15: {extends: '.test_instance'}
203-
fedora-41-3006-15: {extends: '.test_instance_failure_permitted'}
204-
fedora-40-3006-15: {extends: '.test_instance'}
205-
opensuse-leap-156-3006-15: {extends: '.test_instance'}
206-
opensuse-tmbl-latest-3006-15: {extends: '.test_instance'}
207-
oraclelinux-9-3006-15: {extends: '.test_instance'}
208-
oraclelinux-8-3006-15: {extends: '.test_instance'}
209-
rockylinux-9-3006-15: {extends: '.test_instance'}
210-
rockylinux-8-3006-15: {extends: '.test_instance'}
211-
ubuntu-2404-3006-15: {extends: '.test_instance'}
212-
ubuntu-2204-3006-15: {extends: '.test_instance'}
213-
ubuntu-2004-3006-15: {extends: '.test_instance'}
178+
almalinux-9-3007: {extends: '.test_instance'}
179+
almalinux-8-3007: {extends: '.test_instance'}
180+
amazonlinux-2023-3007: {extends: '.test_instance'}
181+
amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
182+
centos-stream9-3007: {extends: '.test_instance'}
183+
debian-12-3007: {extends: '.test_instance'}
184+
debian-11-3007: {extends: '.test_instance'}
185+
fedora-41-3007: {extends: '.test_instance_failure_permitted'}
186+
fedora-40-3007: {extends: '.test_instance'}
187+
opensuse-leap-156-3007: {extends: '.test_instance'}
188+
opensuse-tmbl-latest-3007: {extends: '.test_instance'}
189+
oraclelinux-9-3007: {extends: '.test_instance'}
190+
oraclelinux-8-3007: {extends: '.test_instance'}
191+
rockylinux-9-3007: {extends: '.test_instance'}
192+
rockylinux-8-3007: {extends: '.test_instance'}
193+
ubuntu-2404-3007: {extends: '.test_instance'}
194+
ubuntu-2204-3007: {extends: '.test_instance'}
195+
ubuntu-2004-3007: {extends: '.test_instance'}
196+
almalinux-9-3006: {extends: '.test_instance'}
197+
almalinux-8-3006: {extends: '.test_instance'}
198+
amazonlinux-2023-3006: {extends: '.test_instance'}
199+
amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
200+
centos-stream9-3006: {extends: '.test_instance'}
201+
debian-12-3006: {extends: '.test_instance'}
202+
debian-11-3006: {extends: '.test_instance'}
203+
fedora-41-3006: {extends: '.test_instance_failure_permitted'}
204+
fedora-40-3006: {extends: '.test_instance'}
205+
opensuse-leap-156-3006: {extends: '.test_instance'}
206+
opensuse-tmbl-latest-3006: {extends: '.test_instance'}
207+
oraclelinux-9-3006: {extends: '.test_instance'}
208+
oraclelinux-8-3006: {extends: '.test_instance'}
209+
rockylinux-9-3006: {extends: '.test_instance'}
210+
rockylinux-8-3006: {extends: '.test_instance'}
211+
ubuntu-2404-3006: {extends: '.test_instance'}
212+
ubuntu-2204-3006: {extends: '.test_instance'}
213+
ubuntu-2004-3006: {extends: '.test_instance'}
214214
# yamllint enable rule:line-length
215215

216216
###############################################################################

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 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.80.1
33+
rev: v1.82.1
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
@@ -100,12 +100,12 @@ repos:
100100
)$
101101
additional_dependencies: [pygments==2.16.1]
102102
- repo: https://github.com/renovatebot/pre-commit-hooks
103-
rev: 41.93.2
103+
rev: 42.71.2
104104
hooks:
105105
- id: renovate-config-validator
106106
name: Check Renovate config with renovate-config-validator
107107
- repo: https://github.com/python-jsonschema/check-jsonschema
108-
rev: 0.33.3
108+
rev: 0.36.0
109109
hooks:
110110
- id: check-github-workflows
111111
name: Check GitHub workflows with check-jsonschema

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
1212
# improvement: avoid package installations which are already covered by the
1313
# `salt-image-builder` (i.e. the pre-salted images that we're using)
1414
# rubocop:disable Layout/LineLength
15-
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
15+
gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
1616
# rubocop:enable Layout/LineLength
1717

1818
gem 'kitchen-inspec', '3.0.0'
@@ -21,4 +21,4 @@ gem 'kitchen-salt', '0.7.2'
2121
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
2222
gem 'net-ssh', '>= 7.0.0'
2323

24-
gem 'test-kitchen', '3.7.0'
24+
gem 'test-kitchen', '3.9.0'

0 commit comments

Comments
 (0)