Merge pull request #74 from sylvainfaivre/ci

ci: use latest test images
2025-04-23 23:09:41 -04:00 · 2025-04-10 15:19:48 +01:00 · 2025-04-10 15:19:48 +01:00 · 490e80b5a5
commit 490e80b5a5
parent b2ad10667a 9dbdcb6282
6 changed files with 199 additions and 264 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -13,10 +13,10 @@
  stage_release: &stage_release 'release'
  stage_test: &stage_test 'test'
  # `image`
-  image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
-  image_dindruby: &image_dindruby 'dafyddj/ci-dind-python-ruby:2.0.2'
-  image_dindrubybionic: &image_dindrubybionic 'dafyddj/ci-dind-python-ruby:2.0.2'
-  image_precommit: &image_precommit 'dafyddj/ci-pre-commit:2.1.0'
+  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'
  # `services`
@ -130,69 +130,21 @@ rubocop:
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
 # yamllint disable rule:line-length
-# default-debian-11-tiamat-py3: {extends: '.test_instance'}
-# default-debian-10-tiamat-py3: {extends: '.test_instance'}
-# default-debian-9-tiamat-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
-# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-tiamat-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
-# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
-# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
+default-debian-12-master-py3: {extends: '.test_instance'}
 default-debian-11-master-py3: {extends: '.test_instance'}
-# default-debian-10-master-py3: {extends: '.test_instance'}
-# default-debian-9-master-py3: {extends: '.test_instance'}
-default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
-default-ubuntu-2004-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-master-py3: {extends: '.test_instance'}
-default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-35-master-py3: {extends: '.test_instance'}
-default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-default-amazonlinux-2-master-py3: {extends: '.test_instance_failure_permitted'}
-default-oraclelinux-8-master-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
-default-arch-base-latest-master-py3: {extends: '.test_instance'}
-default-gentoo-stage3-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance_failure_permitted'}
-default-almalinux-8-master-py3: {extends: '.test_instance'}
-default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-11-3004-1-py3: {extends: '.test_instance'}
-# default-debian-10-3004-1-py3: {extends: '.test_instance'}
-# default-debian-9-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
-# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# default-debian-10-3003-4-py3: {extends: '.test_instance'}
-# default-debian-9-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3003-4-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
+default-ubuntu-2404-master-py3: {extends: '.test_instance'}
+default-ubuntu-2204-master-py3: {extends: '.test_instance'}
+default-fedora-40-master-py3: {extends: '.test_instance'}
+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-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-fedora-40-3006-10-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length

 ###############################################################################
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -31,8 +31,6 @@ repos:
      - id: rubocop
        name: Check Ruby files with rubocop
        args: [--debug]
-        always_run: true
-        pass_filenames: false
  - repo: https://github.com/shellcheck-py/shellcheck-py
    rev: v0.9.0.6
    hooks:
@ -45,9 +43,30 @@ repos:
    hooks:
      - id: yamllint
        name: Check YAML syntax with yamllint
-        args: [--strict, '.']
-        always_run: true
-        pass_filenames: false
+        args: [--strict]
+        types: [file]
+        # Files to include
+        # 1. Obvious YAML files
+        # 2. `pillar.example` and similar files
+        # 3. SLS files under directory `test/` which are pillar files
+        # Files to exclude
+        # 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
+        files: |
+          (?x)^(
+                .*\.yaml|
+                .*\.yml|
+                \.salt-lint|
+                \.yamllint|
+                .*\.example|
+                test/.*\.sls
+          )$
+        exclude: |
+          (?x)^(
+                kitchen.vagrant.yml|
+                test/.*/states/.*\.sls
+          )$
  - repo: https://github.com/warpnet/salt-lint
    rev: v0.9.2
    hooks:
@ -55,11 +74,12 @@ repos:
        name: Check Salt files using salt-lint
        files: ^.*\.(sls|jinja|j2|tmpl|tst)$
  - repo: https://github.com/myint/rstcheck
-    rev: v6.2.4
+    rev: v6.2.0
    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
    hooks:
@ -69,5 +89,7 @@ repos:
            (?x)^(
                docs/CHANGELOG.rst|
                docs/TOFS_pattern.rst|
+                docs/CONTRIBUTING_DOCS.rst|
+                docs/index.rst|
            )$
        additional_dependencies: [pygments==2.16.1]
--- a/.rstcheck.cfg
+++ b/.rstcheck.cfg
@ -1,4 +1,6 @@
 [rstcheck]
 report=info
 ignore_language=rst
-ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
+# salt['config.get']('roles') is misidentified as a Markdown link.
+#   Ignore for now, but perhaps try to submit a fix upstream in rstcheck
+ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$|\(rst\) Link is formatted in Markdown style\.)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -7,7 +7,7 @@ Layout/LineLength:
  # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
  Max: 88
 Metrics/BlockLength:
-  IgnoredMethods:
+  AllowedMethods:
    - control
    - describe
  # Increase from default of `25`
--- a/.yamllint
+++ b/.yamllint
@ -4,33 +4,6 @@
 # Extend the `default` configuration provided by `yamllint`
 extends: 'default'

-# Files to ignore completely
-# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
-# 2. All YAML files under directory `.cache/`, introduced during the CI run
-# 3. All YAML files under directory `.git/`
-# 4. All YAML files under directory `node_modules/`, introduced during the CI run
-# 5. Any SLS files under directory `test/`, which are actually state files
-# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
-# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
-ignore: |
-  .bundle/
-  .cache/
-  .git/
-  node_modules/
-  test/**/states/**/*.sls
-  .kitchen/
-  kitchen.vagrant.yml
-
-yaml-files:
-  # Default settings
-  - '*.yaml'
-  - '*.yml'
-  - .salt-lint
-  - .yamllint
-  # SaltStack Formulas additional settings
-  - '*.example'
-  - test/**/*.sls
-
 rules:
  empty-values:
    forbid-in-block-mappings: true
--- a/kitchen.yml
+++ b/kitchen.yml
@ -19,65 +19,18 @@ provisioner:
    - .git

 platforms:
-  ## SALT `tiamat`
-  - name: debian-11-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-11
-      run_command: /lib/systemd/systemd
-  - name: debian-10-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-stream8
-  - name: centos-7-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-7
-  - name: amazonlinux-2-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:amazonlinux-2
-  - name: oraclelinux-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:oraclelinux-8
-  - name: oraclelinux-7-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:oraclelinux-7
-  - name: almalinux-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:almalinux-8
-  - name: rockylinux-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:rockylinux-8
-
  ## SALT `master`
+  - name: debian-12-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-12
+      run_command: /lib/systemd/systemd
  - name: debian-11-master-py3
    driver:
      image: saltimages/salt-master-py3:debian-11
      run_command: /lib/systemd/systemd
-  - name: debian-10-master-py3
+  - name: ubuntu-2404-master-py3
    driver:
-      image: saltimages/salt-master-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-master-py3
-    driver:
-      image: saltimages/salt-master-py3:debian-9
+      image: saltimages/salt-master-py3:ubuntu-24.04
      run_command: /lib/systemd/systemd
  - name: ubuntu-2204-master-py3
    driver:
@ -87,26 +40,20 @@ platforms:
    driver:
      image: saltimages/salt-master-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-master-py3
+  - name: centos-stream9-master-py3
    driver:
-      image: saltimages/salt-master-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-master-py3
+      image: saltimages/salt-master-py3:centos-stream9
+  - name: opensuse-leap-156-master-py3
    driver:
-      image: saltimages/salt-master-py3:centos-stream8
-  - name: centos-7-master-py3
+      image: saltimages/salt-master-py3:opensuse-leap-15.6
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-leap-155-master-py3
    driver:
-      image: saltimages/salt-master-py3:centos-7
-  - name: fedora-36-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-36
-  - name: fedora-35-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-35
-  - name: opensuse-leap-153-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+      image: saltimages/salt-master-py3:opensuse-leap-15.5
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
@ -117,146 +64,185 @@ platforms:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: amazonlinux-2-master-py3
+  - name: fedora-41-master-py3
    driver:
-      image: saltimages/salt-master-py3:amazonlinux-2
+      image: saltimages/salt-master-py3:fedora-41
+  - name: fedora-40-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-40
+  - name: amazonlinux-2023-master-py3
+    driver:
+      image: saltimages/salt-master-py3:amazonlinux-2023
+  - name: oraclelinux-9-master-py3
+    driver:
+      image: saltimages/salt-master-py3:oraclelinux-9
  - name: oraclelinux-8-master-py3
    driver:
      image: saltimages/salt-master-py3:oraclelinux-8
-  - name: oraclelinux-7-master-py3
+  - name: almalinux-9-master-py3
    driver:
-      image: saltimages/salt-master-py3:oraclelinux-7
-  - name: arch-base-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:arch-base-latest
-  - name: gentoo-stage3-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-systemd
+      image: saltimages/salt-master-py3:almalinux-9
  - name: almalinux-8-master-py3
    driver:
      image: saltimages/salt-master-py3:almalinux-8
+  - name: rockylinux-9-master-py3
+    driver:
+      image: saltimages/salt-master-py3:rockylinux-9
  - name: rockylinux-8-master-py3
    driver:
      image: saltimages/salt-master-py3:rockylinux-8

-  ## SALT `3004.1`
-  - name: debian-11-3004-1-py3
+  ## SALT `3007.1`
+  - name: debian-12-3007-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:debian-11
+      image: saltimages/salt-3007.1-py3:debian-12
      run_command: /lib/systemd/systemd
-  - name: debian-10-3004-1-py3
+  - name: debian-11-3007-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:debian-10
+      image: saltimages/salt-3007.1-py3:debian-11
      run_command: /lib/systemd/systemd
-  - name: debian-9-3004-1-py3
+  - name: ubuntu-2404-3007-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:debian-9
+      image: saltimages/salt-3007.1-py3:ubuntu-24.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-3004-1-py3
+  - name: ubuntu-2204-3007-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-22.04
+      image: saltimages/salt-3007.1-py3:ubuntu-22.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3004-1-py3
+  - name: ubuntu-2004-3007-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-20.04
+      image: saltimages/salt-3007.1-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3004-1-py3
+  - name: centos-stream9-3007-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-3004-1-py3
+      image: saltimages/salt-3007.1-py3:centos-stream9
+  - name: opensuse-leap-155-3007-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:centos-stream8
-  - name: centos-7-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:centos-7
-  - name: fedora-36-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-36
-  - name: fedora-35-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-35
-  - name: amazonlinux-2-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:amazonlinux-2
-  - name: oraclelinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-8
-  - name: oraclelinux-7-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-7
-  - name: arch-base-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:almalinux-8
-  - name: rockylinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:rockylinux-8
-
-  ## SALT `3004.0`
-  - name: opensuse-leap-153-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+      image: saltimages/salt-3007.1-py3:opensuse-leap-15.5
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3004-0-py3
+  - name: opensuse-leap-156-3007-1-py3
    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3007.1-py3:opensuse-leap-15.6
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-tmbl-latest-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:opensuse-tumbleweed-latest
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
+  - name: fedora-41-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:fedora-41
+  - name: fedora-40-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:fedora-40
+  - name: amazonlinux-2023-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:amazonlinux-2023
+  - name: amazonlinux-2-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:amazonlinux-2
+  - name: oraclelinux-9-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:oraclelinux-9
+  - name: oraclelinux-8-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:oraclelinux-8
+  - name: almalinux-9-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:almalinux-9
+  - name: almalinux-8-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:almalinux-8
+  - name: rockylinux-9-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:rockylinux-9
+  - name: rockylinux-8-3007-1-py3
+    driver:
+      image: saltimages/salt-3007.1-py3:rockylinux-8

-  ## SALT `3003.4`
-  - name: debian-10-3003-4-py3
+  ## SALT `3006.10`
+  - name: debian-12-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:debian-10
+      image: saltimages/salt-3006.10-py3:debian-12
      run_command: /lib/systemd/systemd
-  - name: debian-9-3003-4-py3
+  - name: debian-11-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:debian-9
+      image: saltimages/salt-3006.10-py3:debian-11
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-4-py3
+  - name: ubuntu-2404-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-20.04
+      image: saltimages/salt-3006.10-py3:ubuntu-24.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-4-py3
+  - name: ubuntu-2204-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-18.04
+      image: saltimages/salt-3006.10-py3:ubuntu-22.04
      run_command: /lib/systemd/systemd
-  - name: centos-stream8-3003-4-py3
+  - name: ubuntu-2004-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:centos-stream8
-  - name: centos-7-3003-4-py3
+      image: saltimages/salt-3006.10-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+  - name: centos-stream9-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:centos-7
-  - name: amazonlinux-2-3003-4-py3
+      image: saltimages/salt-3006.10-py3:centos-stream9
+  - name: opensuse-tmbl-latest-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-4-py3
+      image: saltimages/salt-3006.10-py3:opensuse-tumbleweed-latest
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-leap-156-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-4-py3
+      image: saltimages/salt-3006.10-py3:opensuse-leap-15.6
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-leap-155-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-7
-  - name: almalinux-8-3003-4-py3
+      image: saltimages/salt-3006.10-py3:opensuse-leap-15.5
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: fedora-41-3006-10-py3
    driver:
-      image: saltimages/salt-3003.4-py3:almalinux-8
+      image: saltimages/salt-3006.10-py3:fedora-41
+  - name: fedora-40-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:fedora-40
+  - name: amazonlinux-2023-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:amazonlinux-2023
+  - name: amazonlinux-2-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:amazonlinux-2
+  - name: oraclelinux-9-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:oraclelinux-9
+  - name: oraclelinux-8-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:oraclelinux-8
+  - name: almalinux-9-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:almalinux-9
+  - name: almalinux-8-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:almalinux-8
+  - name: rockylinux-9-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:rockylinux-9
+  - name: rockylinux-8-3006-10-py3
+    driver:
+      image: saltimages/salt-3006.10-py3:rockylinux-8

 verifier:
  # https://www.inspec.io/