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

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

.gitlab-ci.yml

@@ -136,7 +136,6 @@ rubocop:
 # ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # redhat-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-centos-8-tiamat-py3: {extends: '.test_instance'}
 # redhat-centos-7-tiamat-py3: {extends: '.test_instance'}
 # redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # redhat-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
@@ -149,12 +148,9 @@ debian-debian-9-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
 redhat-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-redhat-centos-8-master-py3: {extends: '.test_instance'}
 redhat-centos-7-master-py3: {extends: '.test_instance'}
 redhat-fedora-34-master-py3: {extends: '.test_instance'}
-redhat-fedora-33-master-py3: {extends: '.test_instance'}
 suse-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
 redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -167,64 +163,41 @@ redhat-rockylinux-8-master-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-8-3004-0-py3: {extends: '.test_instance'}
 # redhat-centos-7-3004-0-py3: {extends: '.test_instance'}
 # redhat-fedora-34-3004-0-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3004-0-py3: {extends: '.test_instance'}
 # suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-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-11-3003-3-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-8-3003-3-py3: {extends: '.test_instance'}
 # redhat-centos-7-3003-3-py3: {extends: '.test_instance'}
+# redhat-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 # redhat-fedora-34-3003-3-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3003-3-py3: {extends: '.test_instance'}
 # suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-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-11-3002-7-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-8-3002-7-py3: {extends: '.test_instance'}
 # redhat-centos-7-3002-7-py3: {extends: '.test_instance'}
+# redhat-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
 # redhat-fedora-34-3002-7-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3002-7-py3: {extends: '.test_instance'}
 # suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-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-3001-8-py3: {extends: '.test_instance'}
-# debian-debian-9-3001-8-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
-# redhat-centos-8-3001-8-py3: {extends: '.test_instance'}
-# redhat-centos-7-3001-8-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3001-8-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3001-8-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

.travis.yml

@@ -89,7 +89,6 @@ jobs:
     # - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
     # - env: INSTANCE=redhat-centos-stream8-tiamat-py3
-    # - env: INSTANCE=redhat-centos-8-tiamat-py3
     # - env: INSTANCE=redhat-centos-7-tiamat-py3
     # - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=redhat-oraclelinux-8-tiamat-py3
@@ -102,12 +101,9 @@ jobs:
     - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
     - env: INSTANCE=redhat-centos-stream8-master-py3
-    - env: INSTANCE=redhat-centos-8-master-py3
     - env: INSTANCE=redhat-centos-7-master-py3
     - env: INSTANCE=redhat-fedora-34-master-py3
-    - env: INSTANCE=redhat-fedora-33-master-py3
     - env: INSTANCE=suse-opensuse-leap-153-master-py3
-    - env: INSTANCE=suse-opensuse-leap-152-master-py3
     - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
     - env: INSTANCE=redhat-amazonlinux-2-master-py3
     - env: INSTANCE=redhat-oraclelinux-8-master-py3
@@ -120,64 +116,41 @@ jobs:
     # - 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-8-3004-0-py3
     # - env: INSTANCE=redhat-centos-7-3004-0-py3
     # - env: INSTANCE=redhat-fedora-34-3004-0-py3
-    # - env: INSTANCE=redhat-fedora-33-3004-0-py3
     # - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-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-11-3003-3-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-8-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=redhat-fedora-33-3003-3-py3
     # - env: INSTANCE=suse-opensuse-leap-153-3003-3-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-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-11-3002-7-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-8-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=redhat-fedora-33-3002-7-py3
     # - env: INSTANCE=suse-opensuse-leap-153-3002-7-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-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-3001-8-py3
-    # - env: INSTANCE=debian-debian-9-3001-8-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3001-8-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3001-8-py3
-    # - env: INSTANCE=redhat-centos-8-3001-8-py3
-    # - env: INSTANCE=redhat-centos-7-3001-8-py3
-    # - env: INSTANCE=redhat-fedora-34-3001-8-py3
-    # - env: INSTANCE=redhat-fedora-33-3001-8-py3
-    # - env: INSTANCE=suse-opensuse-leap-153-3001-8-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-3001-8-py3
-    # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-8-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-3001-8-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-3001-8-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

kitchen.yml

@@ -43,9 +43,6 @@ platforms:
   - name: centos-stream8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-stream8
-  - name: centos-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-8
   - name: centos-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-7
@@ -89,18 +86,12 @@ platforms:
   - name: centos-stream8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-stream8
-  - name: centos-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:centos-8
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
   - name: fedora-34-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-34
-  - name: fedora-33-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-33
   - name: opensuse-leap-153-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -108,13 +99,6 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: opensuse-tmbl-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
@@ -172,18 +156,12 @@ platforms:
   - name: centos-stream8-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:centos-stream8
-  - name: centos-8-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:centos-8
   - name: centos-7-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:centos-7
   - name: fedora-34-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:fedora-34
-  - name: fedora-33-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:fedora-33
   - name: opensuse-leap-153-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
@@ -191,13 +169,6 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: opensuse-tmbl-latest-3004-0-py3
     driver:
       image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
@@ -232,10 +203,6 @@ platforms:
       image: saltimages/salt-3004.0-py3:rockylinux-8
 
   ## SALT `3003.3`
-  - name: debian-11-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:debian-11
-      run_command: /lib/systemd/systemd
   - name: debian-10-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:debian-10
@@ -255,18 +222,15 @@ platforms:
   - name: centos-stream8-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:centos-stream8
-  - name: centos-8-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:centos-8
   - name: centos-7-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:centos-7
+  - name: fedora-35-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:fedora-35
   - name: fedora-34-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:fedora-34
-  - name: fedora-33-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:fedora-33
   - name: opensuse-leap-153-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
@@ -274,13 +238,6 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: opensuse-tmbl-latest-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
@@ -297,9 +254,6 @@ platforms:
   - name: oraclelinux-7-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:oraclelinux-7
-  - name: arch-base-latest-3003-3-py3
-    driver:
-      image: saltimages/salt-3003.3-py3:arch-base-latest
   - name: gentoo-stage3-latest-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
@@ -312,10 +266,6 @@ platforms:
       image: saltimages/salt-3003.3-py3:almalinux-8
 
   ## SALT `3002.7`
-  - name: debian-11-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:debian-11
-      run_command: /lib/systemd/systemd
   - name: debian-10-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:debian-10
@@ -332,18 +282,15 @@ platforms:
     driver:
       image: saltimages/salt-3002.7-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:centos-8
   - name: centos-7-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:centos-7
+  - name: fedora-35-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:fedora-35
   - name: fedora-34-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:fedora-34
-  - name: fedora-33-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:fedora-33
   - name: opensuse-leap-153-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
@@ -351,13 +298,6 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => 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
@@ -374,9 +314,6 @@ platforms:
   - name: oraclelinux-7-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:oraclelinux-7
-  - name: arch-base-latest-3002-7-py3
-    driver:
-      image: saltimages/salt-3002.7-py3:arch-base-latest
   - name: gentoo-stage3-latest-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
@@ -385,76 +322,6 @@ platforms:
     driver:
       image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
 
-  ## SALT `3001.8`
-  - name: debian-10-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-8-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:centos-8
-  - name: centos-7-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:centos-7
-  - name: fedora-34-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:fedora-34
-  - name: fedora-33-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:fedora-33
-  - name: opensuse-leap-153-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-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-leap-152-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-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-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:oraclelinux-7
-  - name: arch-base-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-8-py3
-    driver:
-      image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
-
 verifier:
   # https://www.inspec.io/
   name: inspec
@@ -475,14 +342,10 @@ suites:
       - debian-11-3004-0-py3
       - debian-10-3004-0-py3
       - debian-9-3004-0-py3
-      - debian-11-3003-3-py3
       - debian-10-3003-3-py3
       - debian-9-3003-3-py3
-      - debian-11-3002-7-py3
       - debian-10-3002-7-py3
       - debian-9-3002-7-py3
-      - debian-10-3001-8-py3
-      - debian-9-3001-8-py3
     provisioner:
       state_top:
         base:
@@ -516,8 +379,6 @@ suites:
       - ubuntu-1804-3003-3-py3
       - ubuntu-2004-3002-7-py3
       - ubuntu-1804-3002-7-py3
-      - ubuntu-2004-3001-8-py3
-      - ubuntu-1804-3001-8-py3
     provisioner:
       state_top:
         base:
@@ -544,7 +405,6 @@ suites:
   - name: redhat
     includes:
       - centos-stream8-tiamat-py3
-      - centos-8-tiamat-py3
       - centos-7-tiamat-py3
       - amazonlinux-2-tiamat-py3
       - oraclelinux-8-tiamat-py3
@@ -552,48 +412,35 @@ suites:
       - almalinux-8-tiamat-py3
       - rockylinux-8-tiamat-py3
       - centos-stream8-master-py3
-      - centos-8-master-py3
       - centos-7-master-py3
       - fedora-34-master-py3
-      - fedora-33-master-py3
       - amazonlinux-2-master-py3
       - oraclelinux-8-master-py3
       - oraclelinux-7-master-py3
       - almalinux-8-master-py3
       - rockylinux-8-master-py3
       - centos-stream8-3004-0-py3
-      - centos-8-3004-0-py3
       - centos-7-3004-0-py3
       - fedora-34-3004-0-py3
-      - fedora-33-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-8-3003-3-py3
       - centos-7-3003-3-py3
+      - fedora-35-3003-3-py3
       - fedora-34-3003-3-py3
-      - fedora-33-3003-3-py3
       - amazonlinux-2-3003-3-py3
       - oraclelinux-8-3003-3-py3
       - oraclelinux-7-3003-3-py3
       - almalinux-8-3003-3-py3
-      - centos-8-3002-7-py3
       - centos-7-3002-7-py3
+      - fedora-35-3002-7-py3
       - fedora-34-3002-7-py3
-      - fedora-33-3002-7-py3
       - amazonlinux-2-3002-7-py3
       - oraclelinux-8-3002-7-py3
       - oraclelinux-7-3002-7-py3
-      - centos-8-3001-8-py3
-      - centos-7-3001-8-py3
-      - fedora-34-3001-8-py3
-      - fedora-33-3001-8-py3
-      - amazonlinux-2-3001-8-py3
-      - oraclelinux-8-3001-8-py3
-      - oraclelinux-7-3001-8-py3
     provisioner:
       state_top:
         base:
@@ -613,20 +460,13 @@ suites:
   - name: suse
     includes:
       - opensuse-leap-153-master-py3
-      - opensuse-leap-152-master-py3
       - opensuse-tmbl-latest-master-py3
       - opensuse-leap-153-3004-0-py3
-      - opensuse-leap-152-3004-0-py3
       - opensuse-tmbl-latest-3004-0-py3
       - opensuse-leap-153-3003-3-py3
-      - opensuse-leap-152-3003-3-py3
       - opensuse-tmbl-latest-3003-3-py3
       - opensuse-leap-153-3002-7-py3
-      - opensuse-leap-152-3002-7-py3
       - opensuse-tmbl-latest-3002-7-py3
-      - opensuse-leap-153-3001-8-py3
-      - opensuse-leap-152-3001-8-py3
-      - opensuse-tmbl-latest-3001-8-py3
     provisioner:
       state_top:
         base: