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

* Automated using myii/ssf-formula#410
saltstack-formulas · Feb 2, 2022 · d95dac2 · d95dac2
1 parent e6963c0
commit d95dac2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 315 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -136,7 +136,6 @@ rubocop:
 # 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-8-tiamat-py3: {extends: '.test_instance'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
@@ -149,12 +148,9 @@ rubocop:
 # 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-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # default-fedora-34-master-py3: {extends: '.test_instance'}
-# default-fedora-33-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -170,13 +166,10 @@ default-debian-11-3004-0-py3: {extends: '.test_instance'}
 default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
 default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-default-centos-8-3004-0-py3: {extends: '.test_instance'}
 # default-centos-7-3004-0-py3: {extends: '.test_instance'}
 # default-fedora-34-3004-0-py3: {extends: '.test_instance'}
-# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
 default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
 default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
@@ -185,61 +178,36 @@ default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
 default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
 default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
-# default-debian-11-3003-3-py3: {extends: '.test_instance'}
 default-debian-10-3003-3-py3: {extends: '.test_instance'}
 # default-debian-9-3003-3-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
 default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
 # default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-8-3003-3-py3: {extends: '.test_instance'}
 default-centos-7-3003-3-py3: {extends: '.test_instance'}
+default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 default-fedora-34-3003-3-py3: {extends: '.test_instance'}
-default-fedora-33-3003-3-py3: {extends: '.test_instance'}
-default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
+# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
 default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
 default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
 default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
 # default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
-# default-debian-11-3002-7-py3: {extends: '.test_instance'}
 # default-debian-10-3002-7-py3: {extends: '.test_instance'}
 default-debian-9-3002-7-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
-# default-centos-8-3002-7-py3: {extends: '.test_instance'}
 # default-centos-7-3002-7-py3: {extends: '.test_instance'}
+# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
 # default-fedora-34-3002-7-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
-# default-debian-10-3001-8-py3: {extends: '.test_instance'}
-# default-debian-9-3001-8-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
-# default-centos-8-3001-8-py3: {extends: '.test_instance'}
-# default-centos-7-3001-8-py3: {extends: '.test_instance'}
-# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
-# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -89,7 +89,6 @@ jobs:
     # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
     # - env: INSTANCE=default-centos-stream8-tiamat-py3
-    # - env: INSTANCE=default-centos-8-tiamat-py3
     # - env: INSTANCE=default-centos-7-tiamat-py3
     # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
@@ -102,12 +101,9 @@ jobs:
     # - env: INSTANCE=default-ubuntu-2004-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     # - env: INSTANCE=default-centos-stream8-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
     # - env: INSTANCE=default-centos-7-master-py3
     # - env: INSTANCE=default-fedora-34-master-py3
-    # - env: INSTANCE=default-fedora-33-master-py3
     # - env: INSTANCE=default-opensuse-leap-153-master-py3
-    # - env: INSTANCE=default-opensuse-leap-152-master-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-oraclelinux-8-master-py3
@@ -123,13 +119,10 @@ jobs:
     - env: INSTANCE=default-ubuntu-2004-3004-0-py3
     # - env: INSTANCE=default-ubuntu-1804-3004-0-py3
     - env: INSTANCE=default-centos-stream8-3004-0-py3
-    - env: INSTANCE=default-centos-8-3004-0-py3
     # - env: INSTANCE=default-centos-7-3004-0-py3
     # - env: INSTANCE=default-fedora-34-3004-0-py3
-    # - env: INSTANCE=default-fedora-33-3004-0-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
+    - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
+    - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
     - env: INSTANCE=default-amazonlinux-2-3004-0-py3
     - env: INSTANCE=default-oraclelinux-8-3004-0-py3
     # - env: INSTANCE=default-oraclelinux-7-3004-0-py3
@@ -138,61 +131,36 @@ jobs:
     # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
     - env: INSTANCE=default-almalinux-8-3004-0-py3
     - env: INSTANCE=default-rockylinux-8-3004-0-py3
-    # - env: INSTANCE=default-debian-11-3003-3-py3
     - env: INSTANCE=default-debian-10-3003-3-py3
     # - env: INSTANCE=default-debian-9-3003-3-py3
     # - env: INSTANCE=default-ubuntu-2004-3003-3-py3
     - env: INSTANCE=default-ubuntu-1804-3003-3-py3
     # - env: INSTANCE=default-centos-stream8-3003-3-py3
-    # - env: INSTANCE=default-centos-8-3003-3-py3
     - env: INSTANCE=default-centos-7-3003-3-py3
+    - env: INSTANCE=default-fedora-35-3003-3-py3
     - env: INSTANCE=default-fedora-34-3003-3-py3
-    - env: INSTANCE=default-fedora-33-3003-3-py3
-    - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
-    - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
     # - env: INSTANCE=default-amazonlinux-2-3003-3-py3
     # - env: INSTANCE=default-oraclelinux-8-3003-3-py3
     - env: INSTANCE=default-oraclelinux-7-3003-3-py3
-    # - env: INSTANCE=default-arch-base-latest-3003-3-py3
     - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
     - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
     # - env: INSTANCE=default-almalinux-8-3003-3-py3
-    # - env: INSTANCE=default-debian-11-3002-7-py3
     # - env: INSTANCE=default-debian-10-3002-7-py3
     - env: INSTANCE=default-debian-9-3002-7-py3
     # - env: INSTANCE=default-ubuntu-2004-3002-7-py3
     # - env: INSTANCE=default-ubuntu-1804-3002-7-py3
-    # - env: INSTANCE=default-centos-8-3002-7-py3
     # - env: INSTANCE=default-centos-7-3002-7-py3
+    # - env: INSTANCE=default-fedora-35-3002-7-py3
     # - env: INSTANCE=default-fedora-34-3002-7-py3
-    # - env: INSTANCE=default-fedora-33-3002-7-py3
     # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
     # - env: INSTANCE=default-amazonlinux-2-3002-7-py3
     # - env: INSTANCE=default-oraclelinux-8-3002-7-py3
     # - env: INSTANCE=default-oraclelinux-7-3002-7-py3
-    # - env: INSTANCE=default-arch-base-latest-3002-7-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
-    # - env: INSTANCE=default-debian-10-3001-8-py3
-    # - env: INSTANCE=default-debian-9-3001-8-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-8-py3
-    # - env: INSTANCE=default-centos-8-3001-8-py3
-    # - env: INSTANCE=default-centos-7-3001-8-py3
-    # - env: INSTANCE=default-fedora-34-3001-8-py3
-    # - env: INSTANCE=default-fedora-33-3001-8-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-8-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-8-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-8-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'