chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.9.1

.copier-answers.ssf-ci.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v2.7.3
+_commit: v2.9.1
 _src_path: https://github.com/dafyddj/copier-ssf-ci
 failure_permitted_ignored: []
 failure_permitted_patterns: []

.github/workflows/main.yml

@@ -25,32 +25,31 @@ jobs:
     name: Lint / `pre-commit`
     needs: should-run
     if: fromJSON(needs.should-run.outputs.should-run)
-    container: techneg/ci-pre-commit:v2.5.2@sha256:af1cccdd8afe64bbeac5216e3c243e2c3f716f665edf8487a9e920cbfb85c1fb
+    container: techneg/ci-pre-commit:v2.5.17@sha256:1334a7a0ef8b22fdc7933088112bfebfaf6d6733a394a63e236e924f8e8aff54
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - run: | # Needed because of bug #2031 in `actions/checkout`
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
           fetch-tags: true
           filter: tree:0
       - name: Export `CI_CACHE_ID` from container
         run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
-      - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ~/.cache/pre-commit
           key: "${{ env.CI_CACHE_ID }}|\
                 ${{ hashFiles('.pre-commit-config.yaml') }}"
           restore-keys: |
             ${{ env.CI_CACHE_ID }}|
       - name: Build cache
-        shell: bash
         run: |
           pre-commit gc
-          echo "Installing hook environments"
-          time pre-commit install-hooks
+          echo "Installing hook environments..."
+          time -f "Hook installation took %E" pre-commit install-hooks
       - name: Run `pre-commit`
         run: |
           pre-commit run --all-files --color always --verbose
@@ -72,24 +71,24 @@ jobs:
           - ubuntu-2404-master
           - ubuntu-2204-master
           - ubuntu-2004-master
-          - debian-12-3007-6
-          - debian-11-3007-6
-          - ubuntu-2404-3007-6
-          - ubuntu-2204-3007-6
-          - ubuntu-2004-3007-6
-          - debian-12-3006-14
-          - debian-11-3006-14
-          - ubuntu-2404-3006-14
-          - ubuntu-2204-3006-14
-          - ubuntu-2004-3006-14
+          - debian-12-3007
+          - debian-11-3007
+          - ubuntu-2404-3007
+          - ubuntu-2204-3007
+          - ubuntu-2004-3007
+          - debian-12-3006
+          - debian-11-3006
+          - ubuntu-2404-3006
+          - ubuntu-2204-3006
+          - ubuntu-2004-3006
     steps:
       - name: Debug on runner (When re-run with "Enable debug logging" checked)
         if: runner.debug
-        uses: mxschmitt/action-tmate@7b6a61a73bbb9793cb80ad69b8dd8ac19261834c # v3.22
+        uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3.23
         with:
           detached: true
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
         with:
           bundler-cache: true
           ruby-version: '3.1'
@@ -102,13 +101,13 @@ jobs:
       issues: write
       pull-requests: write
       checks: read
-    container: techneg/ci-semantic-release:v1.2.1@sha256:d23338a31ae979a4d15b9b4c68c3dea0795210956d2c43dc6eab1791483b7607
+    container: techneg/ci-semantic-release:v1.2.16@sha256:48234e3cd479efc11f82060702c7f6dc6ef0b4db9cf8189bedb6a86bcdd05e31
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - run: |  # Needed due to bug actions/checkout#2031
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       # yamllint disable-line rule:line-length
       - uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
         with:

.gitlab-ci.yml

@@ -15,15 +15,15 @@
   stage_test: &stage_test 'test'
   # `image`
   # yamllint disable rule:line-length
-  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.100@sha256:cdcfb678d97a38dc1bdb7010935e5e7e6515131812c76c32a78307860bf8193e'
-  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.69@sha256:73b50339c27f37232edd5442ed02578dcca653bbac3c7335f6ccd576b5bbadf3'
-  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.69@sha256:73b50339c27f37232edd5442ed02578dcca653bbac3c7335f6ccd576b5bbadf3'
-  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.2@sha256:af1cccdd8afe64bbeac5216e3c243e2c3f716f665edf8487a9e920cbfb85c1fb'
-  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
-  image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.1@sha256:d23338a31ae979a4d15b9b4c68c3dea0795210956d2c43dc6eab1791483b7607'
+  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.115@sha256:0294e12b860e6467d57868d884df31898f33e3899d739e01e6ed86fc6c1aad62'
+  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.85@sha256:e5dc07cdc39d5903d9da29c64e7e24441de773069f83b2b67e93192d602d9adb'
+  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.85@sha256:e5dc07cdc39d5903d9da29c64e7e24441de773069f83b2b67e93192d602d9adb'
+  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.18@sha256:faf42c5a068a49bf395978a5a8b354051e510b6470c39aef569e6f17750a1ac3'
+  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:74850471782195453cdf91f4a5edf62b6fcc3365c124d4d975c7e87a702040d7'
+  image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.16@sha256:48234e3cd479efc11f82060702c7f6dc6ef0b4db9cf8189bedb6a86bcdd05e31'
   # `services`
   services_docker_dind: &services_docker_dind
-    - 'docker:28.3.3-dind@sha256:c0872aae4791ff427e6eda52769afa04f17b5cf756f8267e0d52774c99d5c9de'
+    - 'docker:29.0.4-dind@sha256:c9699f4fc7365e8daad3eb48ce3b62dc118b2a5267f7be7bcd3c4e4b2f1cfb4c'
   # yamllint enable rule:line-length
   # `variables`
   # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -175,42 +175,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
 ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
 ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
 ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
-almalinux-9-3007-6: {extends: '.test_instance'}
-almalinux-8-3007-6: {extends: '.test_instance'}
-amazonlinux-2023-3007-6: {extends: '.test_instance'}
-amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
-centos-stream9-3007-6: {extends: '.test_instance'}
-debian-12-3007-6: {extends: '.test_instance'}
-debian-11-3007-6: {extends: '.test_instance'}
-fedora-41-3007-6: {extends: '.test_instance_failure_permitted'}
-fedora-40-3007-6: {extends: '.test_instance'}
-opensuse-leap-156-3007-6: {extends: '.test_instance'}
-opensuse-tmbl-latest-3007-6: {extends: '.test_instance'}
-oraclelinux-9-3007-6: {extends: '.test_instance'}
-oraclelinux-8-3007-6: {extends: '.test_instance'}
-rockylinux-9-3007-6: {extends: '.test_instance'}
-rockylinux-8-3007-6: {extends: '.test_instance'}
-ubuntu-2404-3007-6: {extends: '.test_instance'}
-ubuntu-2204-3007-6: {extends: '.test_instance'}
-ubuntu-2004-3007-6: {extends: '.test_instance'}
-almalinux-9-3006-14: {extends: '.test_instance'}
-almalinux-8-3006-14: {extends: '.test_instance'}
-amazonlinux-2023-3006-14: {extends: '.test_instance'}
-amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
-centos-stream9-3006-14: {extends: '.test_instance'}
-debian-12-3006-14: {extends: '.test_instance'}
-debian-11-3006-14: {extends: '.test_instance'}
-fedora-41-3006-14: {extends: '.test_instance_failure_permitted'}
-fedora-40-3006-14: {extends: '.test_instance'}
-opensuse-leap-156-3006-14: {extends: '.test_instance'}
-opensuse-tmbl-latest-3006-14: {extends: '.test_instance'}
-oraclelinux-9-3006-14: {extends: '.test_instance'}
-oraclelinux-8-3006-14: {extends: '.test_instance'}
-rockylinux-9-3006-14: {extends: '.test_instance'}
-rockylinux-8-3006-14: {extends: '.test_instance'}
-ubuntu-2404-3006-14: {extends: '.test_instance'}
-ubuntu-2204-3006-14: {extends: '.test_instance'}
-ubuntu-2004-3006-14: {extends: '.test_instance'}
+almalinux-9-3007: {extends: '.test_instance'}
+almalinux-8-3007: {extends: '.test_instance'}
+amazonlinux-2023-3007: {extends: '.test_instance'}
+amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
+centos-stream9-3007: {extends: '.test_instance'}
+debian-12-3007: {extends: '.test_instance'}
+debian-11-3007: {extends: '.test_instance'}
+fedora-41-3007: {extends: '.test_instance_failure_permitted'}
+fedora-40-3007: {extends: '.test_instance'}
+opensuse-leap-156-3007: {extends: '.test_instance'}
+opensuse-tmbl-latest-3007: {extends: '.test_instance'}
+oraclelinux-9-3007: {extends: '.test_instance'}
+oraclelinux-8-3007: {extends: '.test_instance'}
+rockylinux-9-3007: {extends: '.test_instance'}
+rockylinux-8-3007: {extends: '.test_instance'}
+ubuntu-2404-3007: {extends: '.test_instance'}
+ubuntu-2204-3007: {extends: '.test_instance'}
+ubuntu-2004-3007: {extends: '.test_instance'}
+almalinux-9-3006: {extends: '.test_instance'}
+almalinux-8-3006: {extends: '.test_instance'}
+amazonlinux-2023-3006: {extends: '.test_instance'}
+amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
+centos-stream9-3006: {extends: '.test_instance'}
+debian-12-3006: {extends: '.test_instance'}
+debian-11-3006: {extends: '.test_instance'}
+fedora-41-3006: {extends: '.test_instance_failure_permitted'}
+fedora-40-3006: {extends: '.test_instance'}
+opensuse-leap-156-3006: {extends: '.test_instance'}
+opensuse-tmbl-latest-3006: {extends: '.test_instance'}
+oraclelinux-9-3006: {extends: '.test_instance'}
+oraclelinux-8-3006: {extends: '.test_instance'}
+rockylinux-9-3006: {extends: '.test_instance'}
+rockylinux-8-3006: {extends: '.test_instance'}
+ubuntu-2404-3006: {extends: '.test_instance'}
+ubuntu-2204-3006: {extends: '.test_instance'}
+ubuntu-2004-3006: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
       - id: commitlint
       - id: commitlint-ci
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.79.2
+    rev: v1.81.7
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
@@ -100,12 +100,12 @@ repos:
             )$
         additional_dependencies: [pygments==2.16.1]
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 41.63.0
+    rev: 42.19.8
     hooks:
       - id: renovate-config-validator
         name: Check Renovate config with renovate-config-validator
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.2
+    rev: 0.35.0
     hooks:
       - id: check-github-workflows
         name: Check GitHub workflows with check-jsonschema

Gemfile

@@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
 # improvement: avoid package installations which are already covered by the
 # `salt-image-builder` (i.e. the pre-salted images that we're using)
 # rubocop:disable Layout/LineLength
-gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
+gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
 # rubocop:enable Layout/LineLength
 
 gem 'kitchen-inspec', '3.0.0'
@@ -21,4 +21,4 @@ gem 'kitchen-salt', '0.7.2'
 # Avoid the error 'pkeys are immutable on OpenSSL 3.0'
 gem 'net-ssh', '>= 7.0.0'
 
-gem 'test-kitchen', '3.7.0'
+gem 'test-kitchen', '3.9.0'