ci(kitchen+gitlab): update for new pre-salted images [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/426

.gitlab-ci.yml

@@ -159,48 +159,40 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
 redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
 redhat-almalinux-8-master-py3: {extends: '.test_instance'}
 redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
-# debian-debian-11-3004-0-py3: {extends: '.test_instance'}
-# debian-debian-10-3004-0-py3: {extends: '.test_instance'}
-# debian-debian-9-3004-0-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
-# redhat-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-centos-7-3004-0-py3: {extends: '.test_instance'}
-# redhat-fedora-35-3004-0-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3004-0-py3: {extends: '.test_instance'}
+# debian-debian-11-3004-1-py3: {extends: '.test_instance'}
+# debian-debian-10-3004-1-py3: {extends: '.test_instance'}
+# debian-debian-9-3004-1-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
+# redhat-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
+# redhat-centos-7-3004-1-py3: {extends: '.test_instance'}
+# redhat-fedora-35-3004-1-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3004-1-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
+# redhat-almalinux-8-3004-1-py3: {extends: '.test_instance'}
+# redhat-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
 # suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
 # suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
-# redhat-almalinux-8-3004-0-py3: {extends: '.test_instance'}
-# redhat-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
-# debian-debian-10-3003-3-py3: {extends: '.test_instance'}
-# debian-debian-9-3003-3-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
-# redhat-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-centos-7-3003-3-py3: {extends: '.test_instance'}
-# redhat-fedora-35-3003-3-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3003-3-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
-# redhat-almalinux-8-3003-3-py3: {extends: '.test_instance'}
-# debian-debian-10-3002-7-py3: {extends: '.test_instance'}
-# debian-debian-9-3002-7-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
-# redhat-centos-7-3002-7-py3: {extends: '.test_instance'}
-# redhat-fedora-35-3002-7-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3002-7-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
+# debian-debian-10-3003-4-py3: {extends: '.test_instance'}
+# debian-debian-9-3003-4-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
+# redhat-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
+# redhat-centos-7-3003-4-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
+# redhat-almalinux-8-3003-4-py3: {extends: '.test_instance'}
+# debian-debian-10-3002-8-py3: {extends: '.test_instance'}
+# debian-debian-9-3002-8-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
+# redhat-centos-7-3002-8-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################

.travis.yml

@@ -111,48 +111,40 @@ jobs:
     - env: INSTANCE=redhat-oraclelinux-7-master-py3
     - env: INSTANCE=redhat-almalinux-8-master-py3
     - env: INSTANCE=redhat-rockylinux-8-master-py3
-    # - env: INSTANCE=debian-debian-11-3004-0-py3
-    # - env: INSTANCE=debian-debian-10-3004-0-py3
-    # - env: INSTANCE=debian-debian-9-3004-0-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3004-0-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3004-0-py3
-    # - env: INSTANCE=redhat-centos-stream8-3004-0-py3
-    # - env: INSTANCE=redhat-centos-7-3004-0-py3
-    # - env: INSTANCE=redhat-fedora-35-3004-0-py3
-    # - env: INSTANCE=redhat-fedora-34-3004-0-py3
+    # - env: INSTANCE=debian-debian-11-3004-1-py3
+    # - env: INSTANCE=debian-debian-10-3004-1-py3
+    # - env: INSTANCE=debian-debian-9-3004-1-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3004-1-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3004-1-py3
+    # - env: INSTANCE=redhat-centos-stream8-3004-1-py3
+    # - env: INSTANCE=redhat-centos-7-3004-1-py3
+    # - env: INSTANCE=redhat-fedora-35-3004-1-py3
+    # - env: INSTANCE=redhat-fedora-34-3004-1-py3
+    # - env: INSTANCE=redhat-amazonlinux-2-3004-1-py3
+    # - env: INSTANCE=redhat-oraclelinux-8-3004-1-py3
+    # - env: INSTANCE=redhat-oraclelinux-7-3004-1-py3
+    # - env: INSTANCE=redhat-almalinux-8-3004-1-py3
+    # - env: INSTANCE=redhat-rockylinux-8-3004-1-py3
     # - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3
     # - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-3004-0-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-3004-0-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-3004-0-py3
-    # - env: INSTANCE=redhat-almalinux-8-3004-0-py3
-    # - env: INSTANCE=redhat-rockylinux-8-3004-0-py3
-    # - env: INSTANCE=debian-debian-10-3003-3-py3
-    # - env: INSTANCE=debian-debian-9-3003-3-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
-    # - env: INSTANCE=redhat-centos-stream8-3003-3-py3
-    # - env: INSTANCE=redhat-centos-7-3003-3-py3
-    # - env: INSTANCE=redhat-fedora-35-3003-3-py3
-    # - env: INSTANCE=redhat-fedora-34-3003-3-py3
-    # - env: INSTANCE=suse-opensuse-leap-153-3003-3-py3
-    # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-3-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-3003-3-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-3003-3-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-3003-3-py3
-    # - env: INSTANCE=redhat-almalinux-8-3003-3-py3
-    # - env: INSTANCE=debian-debian-10-3002-7-py3
-    # - env: INSTANCE=debian-debian-9-3002-7-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-7-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3002-7-py3
-    # - env: INSTANCE=redhat-centos-7-3002-7-py3
-    # - env: INSTANCE=redhat-fedora-35-3002-7-py3
-    # - env: INSTANCE=redhat-fedora-34-3002-7-py3
-    # - env: INSTANCE=suse-opensuse-leap-153-3002-7-py3
-    # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-7-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-3002-7-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-3002-7-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-3002-7-py3
+    # - env: INSTANCE=debian-debian-10-3003-4-py3
+    # - env: INSTANCE=debian-debian-9-3003-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3003-4-py3
+    # - env: INSTANCE=redhat-centos-stream8-3003-4-py3
+    # - env: INSTANCE=redhat-centos-7-3003-4-py3
+    # - env: INSTANCE=redhat-amazonlinux-2-3003-4-py3
+    # - env: INSTANCE=redhat-oraclelinux-8-3003-4-py3
+    # - env: INSTANCE=redhat-oraclelinux-7-3003-4-py3
+    # - env: INSTANCE=redhat-almalinux-8-3003-4-py3
+    # - env: INSTANCE=debian-debian-10-3002-8-py3
+    # - env: INSTANCE=debian-debian-9-3002-8-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-8-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3002-8-py3
+    # - env: INSTANCE=redhat-centos-7-3002-8-py3
+    # - env: INSTANCE=redhat-amazonlinux-2-3002-8-py3
+    # - env: INSTANCE=redhat-oraclelinux-8-3002-8-py3
+    # - env: INSTANCE=redhat-oraclelinux-7-3002-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

kitchen.yml

@@ -135,39 +135,66 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3004.0`
-  - name: debian-11-3004-0-py3
+  ## SALT `3004.1`
+  - name: debian-11-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:debian-11
+      image: saltimages/salt-3004.1-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3004-0-py3
+  - name: debian-10-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:debian-10
+      image: saltimages/salt-3004.1-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3004-0-py3
+  - name: debian-9-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:debian-9
+      image: saltimages/salt-3004.1-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3004-0-py3
+  - name: ubuntu-2004-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:ubuntu-20.04
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3004-0-py3
+  - name: ubuntu-1804-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:ubuntu-18.04
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-stream8-3004-0-py3
+  - name: centos-stream8-3004-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-35-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:fedora-35
+  - name: fedora-34-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:centos-stream8
-  - name: centos-7-3004-0-py3
+      image: saltimages/salt-3004.1-py3:fedora-34
+  - name: amazonlinux-2-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:centos-7
-  - name: fedora-35-3004-0-py3
+      image: saltimages/salt-3004.1-py3:amazonlinux-2
+  - name: oraclelinux-8-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:fedora-35
-  - name: fedora-34-3004-0-py3
+      image: saltimages/salt-3004.1-py3:oraclelinux-8
+  - name: oraclelinux-7-3004-1-py3
     driver:
-      image: saltimages/salt-3004.0-py3:fedora-34
+      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
@@ -182,151 +209,72 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:amazonlinux-2
-  - name: oraclelinux-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:oraclelinux-8
-  - name: oraclelinux-7-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:oraclelinux-7
-  - name: arch-base-latest-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:almalinux-8
-  - name: rockylinux-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:rockylinux-8
 
-  ## SALT `3003.3`
-  - name: debian-10-3003-3-py3
+  ## SALT `3003.4`
+  - name: debian-10-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:debian-10
+      image: saltimages/salt-3003.4-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3003-3-py3
+  - name: debian-9-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:debian-9
+      image: saltimages/salt-3003.4-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-3-py3
+  - name: ubuntu-2004-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-20.04
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-3-py3
+  - name: ubuntu-1804-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:ubuntu-18.04
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-stream8-3003-3-py3
+  - name: centos-stream8-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:centos-stream8
-  - name: centos-7-3003-3-py3
+      image: saltimages/salt-3003.4-py3:centos-stream8
+  - name: centos-7-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:centos-7
-  - name: fedora-35-3003-3-py3
+      image: saltimages/salt-3003.4-py3:centos-7
+  - name: amazonlinux-2-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-35
-  - name: fedora-34-3003-3-py3
+      image: saltimages/salt-3003.4-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:fedora-34
-  - name: opensuse-leap-153-3003-3-py3
+      image: saltimages/salt-3003.4-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3003-3-py3
+      image: saltimages/salt-3003.4-py3:oraclelinux-7
+  - name: almalinux-8-3003-4-py3
     driver:
-      image: saltimages/salt-3003.3-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: amazonlinux-2-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:almalinux-8
+      image: saltimages/salt-3003.4-py3:almalinux-8
 
-  ## SALT `3002.7`
-  - name: debian-10-3002-7-py3
+  ## SALT `3002.8`
+  - name: debian-10-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:debian-10
+      image: saltimages/salt-3002.8-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3002-7-py3
+  - name: debian-9-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:debian-9
+      image: saltimages/salt-3002.8-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-7-py3
+  - name: ubuntu-2004-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-20.04
+      image: saltimages/salt-3002.8-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-7-py3
+  - name: ubuntu-1804-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:ubuntu-18.04
+      image: saltimages/salt-3002.8-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-7-3002-7-py3
+  - name: centos-7-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:centos-7
-  - name: fedora-35-3002-7-py3
+      image: saltimages/salt-3002.8-py3:centos-7
+  - name: amazonlinux-2-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:fedora-35
-  - name: fedora-34-3002-7-py3
+      image: saltimages/salt-3002.8-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:fedora-34
-  - name: opensuse-leap-153-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-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: amazonlinux-2-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3002-7-py3
+      image: saltimages/salt-3002.8-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-8-py3
     driver:
-      image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3002.8-py3:oraclelinux-7
 
 verifier:
   # https://www.inspec.io/
@@ -345,13 +293,13 @@ suites:
       - debian-11-master-py3
       - debian-10-master-py3
       - debian-9-master-py3
-      - debian-11-3004-0-py3
-      - debian-10-3004-0-py3
-      - debian-9-3004-0-py3
-      - debian-10-3003-3-py3
-      - debian-9-3003-3-py3
-      - debian-10-3002-7-py3
-      - debian-9-3002-7-py3
+      - debian-11-3004-1-py3
+      - debian-10-3004-1-py3
+      - debian-9-3004-1-py3
+      - debian-10-3003-4-py3
+      - debian-9-3003-4-py3
+      - debian-10-3002-8-py3
+      - debian-9-3002-8-py3
     provisioner:
       state_top:
         base:
@@ -379,12 +327,12 @@ suites:
       - ubuntu-1804-tiamat-py3
       - ubuntu-2004-master-py3
       - ubuntu-1804-master-py3
-      - ubuntu-2004-3004-0-py3
-      - ubuntu-1804-3004-0-py3
-      - ubuntu-2004-3003-3-py3
-      - ubuntu-1804-3003-3-py3
-      - ubuntu-2004-3002-7-py3
-      - ubuntu-1804-3002-7-py3
+      - ubuntu-2004-3004-1-py3
+      - ubuntu-1804-3004-1-py3
+      - ubuntu-2004-3003-4-py3
+      - ubuntu-1804-3003-4-py3
+      - ubuntu-2004-3002-8-py3
+      - ubuntu-1804-3002-8-py3
     provisioner:
       state_top:
         base:
@@ -426,29 +374,25 @@ suites:
       - oraclelinux-7-master-py3
       - almalinux-8-master-py3
       - rockylinux-8-master-py3
-      - centos-stream8-3004-0-py3
-      - centos-7-3004-0-py3
-      - fedora-35-3004-0-py3
-      - fedora-34-3004-0-py3
-      - amazonlinux-2-3004-0-py3
-      - oraclelinux-8-3004-0-py3
-      - oraclelinux-7-3004-0-py3
-      - almalinux-8-3004-0-py3
-      - rockylinux-8-3004-0-py3
-      - centos-stream8-3003-3-py3
-      - centos-7-3003-3-py3
-      - fedora-35-3003-3-py3
-      - fedora-34-3003-3-py3
-      - amazonlinux-2-3003-3-py3
-      - oraclelinux-8-3003-3-py3
-      - oraclelinux-7-3003-3-py3
-      - almalinux-8-3003-3-py3
-      - centos-7-3002-7-py3
-      - fedora-35-3002-7-py3
-      - fedora-34-3002-7-py3
-      - amazonlinux-2-3002-7-py3
-      - oraclelinux-8-3002-7-py3
-      - oraclelinux-7-3002-7-py3
+      - centos-stream8-3004-1-py3
+      - centos-7-3004-1-py3
+      - fedora-35-3004-1-py3
+      - fedora-34-3004-1-py3
+      - amazonlinux-2-3004-1-py3
+      - oraclelinux-8-3004-1-py3
+      - oraclelinux-7-3004-1-py3
+      - almalinux-8-3004-1-py3
+      - rockylinux-8-3004-1-py3
+      - centos-stream8-3003-4-py3
+      - centos-7-3003-4-py3
+      - amazonlinux-2-3003-4-py3
+      - oraclelinux-8-3003-4-py3
+      - oraclelinux-7-3003-4-py3
+      - almalinux-8-3003-4-py3
+      - centos-7-3002-8-py3
+      - amazonlinux-2-3002-8-py3
+      - oraclelinux-8-3002-8-py3
+      - oraclelinux-7-3002-8-py3
     provisioner:
       state_top:
         base:
@@ -471,10 +415,6 @@ suites:
       - opensuse-tmbl-latest-master-py3
       - opensuse-leap-153-3004-0-py3
       - opensuse-tmbl-latest-3004-0-py3
-      - opensuse-leap-153-3003-3-py3
-      - opensuse-tmbl-latest-3003-3-py3
-      - opensuse-leap-153-3002-7-py3
-      - opensuse-tmbl-latest-3002-7-py3
     provisioner:
       state_top:
         base: