chore: apply template copier-ssf-ciat v1.1.9

.copier-answers.ssf-ci.yml

@@ -0,0 +1,4 @@
+# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
+_commit: v1.1.9
+_src_path: https://github.com/dafyddj/copier-ssf-ci
+formula_name: postfix

.github/renovate.json5

@@ -0,0 +1,29 @@
+{
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+  enabledManagers: [
+    'copier',
+    'git-submodules',
+  ],
+  extends: [
+    'config:recommended',
+    'github>saltstack-formulas/.github',
+  ],
+  automergeStrategy: 'merge-commit',
+  'git-submodules': {
+    'enabled': true
+  },
+  packageRules: [
+    {
+      matchFileNames: [
+        'template/**'
+      ],
+      semanticCommitType: 'fix',
+    },
+    {
+      automerge: true,
+      matchManagers: [
+        'git-submodules'
+      ],
+    },
+  ],
+}

.github/settings.yml

@@ -0,0 +1,8 @@
+---
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+repository:
+  # See https://docs.github.com/en/rest/reference/repos#update-a-repository
+  # for all available settings
+
+  allow_squash_merge: false

.gitlab-ci.yml

@@ -13,15 +13,17 @@
   stage_release: &stage_release 'release'
   stage_test: &stage_test 'test'
   # `image`
-  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.76'
-  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.45'
-  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.45'
-  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.10'
-  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
-  image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
+  # yamllint disable rule:line-length
+  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.87@sha256:7d88b7ea69f3cd917995d0e7ea5ce7aae97383db95003319d0c43a1d68372402'
+  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
+  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
+  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.21@sha256:620cdfaa9c45b4941090e2b557f5f551fbc1189caf13689e5bbfbd5c76885400'
+  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
+  image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
   # `services`
   services_docker_dind: &services_docker_dind
-    - 'docker:dind'
+    - 'docker:dind@sha256:3a861ec98623bd6014610291123751dc19e0c6d474ac3b38767771791ac0eb5e'
+  # yamllint enable rule:line-length
   # `variables`
   # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
   # https://bundler.io/v1.16/bundle_config.html
@@ -130,27 +132,42 @@ rubocop:
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
 # yamllint disable rule:line-length
+# Fedora 41+ will permit failure until this PR is merged into kitchen-docker
+# https://github.com/test-kitchen/kitchen-docker/pull/427 is merged
+# OpenSUSE master branch will fail until zypperpkg module is back in salt core
+# https://github.com/saltstack/great-module-migration/issues/14
 #
 # The alias states were removed in the great module migration, causing the tests to fail with Salt master branch
 # See https://github.com/saltstack-formulas/postfix-formula/issues/134
-default-debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
-default-debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
-default-ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
-default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
-default-opensuse-leap-155-master-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-40-master-py3: {extends: '.test_instance_failure_permitted'}
-default-debian-12-3007-1-py3: {extends: '.test_instance'}
-default-debian-11-3007-1-py3: {extends: '.test_instance'}
-default-ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
-default-ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
-default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
-default-fedora-40-3007-1-py3: {extends: '.test_instance'}
-default-debian-12-3006-10-py3: {extends: '.test_instance'}
-default-debian-11-3006-10-py3: {extends: '.test_instance'}
-default-ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
-default-ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
-default-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
-default-fedora-40-3006-10-py3: {extends: '.test_instance'}
+debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
+debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
+ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
+ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
+ubuntu-2004-master-py3: {extends: '.test_instance_failure_permitted'}
+centos-stream9-master-py3: {extends: '.test_instance_failure_permitted'}
+opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
+opensuse-leap-155-master-py3: {extends: '.test_instance_failure_permitted'}
+fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
+fedora-40-master-py3: {extends: '.test_instance_failure_permitted'}
+debian-12-3007-1-py3: {extends: '.test_instance'}
+debian-11-3007-1-py3: {extends: '.test_instance'}
+ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
+ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
+ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
+centos-stream9-3007-1-py3: {extends: '.test_instance'}
+opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
+opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
+fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
+fedora-40-3007-1-py3: {extends: '.test_instance'}
+debian-12-3006-10-py3: {extends: '.test_instance'}
+debian-11-3006-10-py3: {extends: '.test_instance'}
+ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
+ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
+ubuntu-2004-3006-10-py3: {extends: '.test_instance'}
+opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
+opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
+fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
+fedora-40-3006-10-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ ci:
   autoupdate_schedule: quarterly
   skip: []
   submodules: false
-default_stages: [commit]
+default_stages: [pre-commit]
 repos:
   - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
     rev: v2.3.0
@@ -26,7 +26,7 @@ repos:
         stages: [commit-msg]
         additional_dependencies: ['@commitlint/[email protected]']
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.57.0
+    rev: v1.75.5
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
@@ -39,7 +39,7 @@ repos:
         files: ^.*\.(sh|bash|ksh)$
         types: []
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.32.0
+    rev: v1.37.1
     hooks:
       - id: yamllint
         name: Check YAML syntax with yamllint
@@ -53,6 +53,7 @@ repos:
         # 1. SLS files under directory `test/` which are state files
         # 2. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
         # 3. YAML files heavily reliant on Jinja
+        # 4. `.copier-answers.yml` and its variants which are auto-generated
         files: |
           (?x)^(
                 .*\.yaml|
@@ -64,6 +65,7 @@ repos:
           )$
         exclude: |
           (?x)^(
+                \.copier-answers(\..+)?\.ya?ml|
                 kitchen.vagrant.yml|
                 test/.*/states/.*\.sls
           )$
@@ -73,15 +75,15 @@ repos:
       - id: salt-lint
         name: Check Salt files using salt-lint
         files: ^.*\.(sls|jinja|j2|tmpl|tst)$
-  - repo: https://github.com/myint/rstcheck
-    rev: v6.2.0
+  - repo: https://github.com/rstcheck/rstcheck
+    rev: v6.2.4
     hooks:
       - id: rstcheck
         name: Check reST files using rstcheck
         exclude: 'docs/CHANGELOG.rst'
         additional_dependencies: [sphinx==7.2.6]
   - repo: https://github.com/saltstack-formulas/mirrors-rst-lint
-    rev: v1.3.2
+    rev: v1.4.0
     hooks:
       - id: rst-lint
         name: Check reST files using rst-lint
@@ -93,3 +95,14 @@ repos:
                 docs/index.rst|
             )$
         additional_dependencies: [pygments==2.16.1]
+  - repo: https://github.com/renovatebot/pre-commit-hooks
+    rev: 40.10.4
+    hooks:
+      - id: renovate-config-validator
+        name: Check Renovate config with renovate-config-validator
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.33.0
+    hooks:
+      - id: check-gitlab-ci
+        name: Check GitLab CI config with check-jsonschema
+        args: ["--verbose"]

Gemfile

@@ -15,8 +15,10 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
 gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
 # rubocop:enable Layout/LineLength
 
-gem 'kitchen-inspec', '>= 2.5.0'
-gem 'kitchen-salt', '>= 0.7.2'
+gem 'kitchen-inspec', '2.6.2'
+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.6.0'