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

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

Hide file tree

Showing 3 changed files with 12 additions and 318 deletions.
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
@@ -23,7 +23,6 @@ jobs:
           # - archive-ubuntu-2004-tiamat-py3
           # - archive-ubuntu-1804-tiamat-py3
           # - archive-centos-stream8-tiamat-py3
-          # - archive-centos-8-tiamat-py3
           # - archive-centos-7-tiamat-py3
           # - archive-amazonlinux-2-tiamat-py3
           # - archive-oraclelinux-8-tiamat-py3
@@ -71,13 +70,6 @@ jobs:
           # - composeclean-centos-stream8-master-py3
           # - dockeronly-centos-stream8-master-py3
           - centos-stream8-master-py3
-          # - archive-centos-8-master-py3
-          # - package-centos-8-master-py3
-          # - repo-centos-8-master-py3
-          # - clean-centos-8-master-py3
-          # - composeclean-centos-8-master-py3
-          # - dockeronly-centos-8-master-py3
-          - centos-8-master-py3
           # - archive-centos-7-master-py3
           # - package-centos-7-master-py3
           # - repo-centos-7-master-py3
@@ -92,27 +84,13 @@ jobs:
           # - composeclean-fedora-34-master-py3
           # - dockeronly-fedora-34-master-py3
           - fedora-34-master-py3
-          # - archive-fedora-33-master-py3
-          # - package-fedora-33-master-py3
-          # - repo-fedora-33-master-py3
-          # - clean-fedora-33-master-py3
-          # - composeclean-fedora-33-master-py3
-          # - dockeronly-fedora-33-master-py3
-          - fedora-33-master-py3
           # - archive-opensuse-leap-153-master-py3
           # - package-opensuse-leap-153-master-py3
           # - repo-opensuse-leap-153-master-py3
           # - clean-opensuse-leap-153-master-py3
           # - composeclean-opensuse-leap-153-master-py3
           # - dockeronly-opensuse-leap-153-master-py3
           # - opensuse-leap-153-master-py3
-          # - archive-opensuse-leap-152-master-py3
-          # - package-opensuse-leap-152-master-py3
-          # - repo-opensuse-leap-152-master-py3
-          # - clean-opensuse-leap-152-master-py3
-          # - composeclean-opensuse-leap-152-master-py3
-          # - dockeronly-opensuse-leap-152-master-py3
-          # - opensuse-leap-152-master-py3
           # - archive-opensuse-tmbl-latest-master-py3
           # - package-opensuse-tmbl-latest-master-py3
           # - repo-opensuse-tmbl-latest-master-py3
@@ -182,12 +160,9 @@ jobs:
           # - archive-ubuntu-2004-3004-0-py3
           # - archive-ubuntu-1804-3004-0-py3
           # - archive-centos-stream8-3004-0-py3
-          # - archive-centos-8-3004-0-py3
           # - archive-centos-7-3004-0-py3
           # - archive-fedora-34-3004-0-py3
-          # - archive-fedora-33-3004-0-py3
           # - archive-opensuse-leap-153-3004-0-py3
-          # - archive-opensuse-leap-152-3004-0-py3
           # - archive-opensuse-tmbl-latest-3004-0-py3
           # - archive-amazonlinux-2-3004-0-py3
           # - archive-oraclelinux-8-3004-0-py3
@@ -197,61 +172,36 @@ jobs:
           # - archive-gentoo-stage3-systemd-3004-0-py3
           # - archive-almalinux-8-3004-0-py3
           # - archive-rockylinux-8-3004-0-py3
-          # - archive-debian-11-3003-3-py3
           # - archive-debian-10-3003-3-py3
           # - archive-debian-9-3003-3-py3
           # - archive-ubuntu-2004-3003-3-py3
           # - archive-ubuntu-1804-3003-3-py3
           # - archive-centos-stream8-3003-3-py3
-          # - archive-centos-8-3003-3-py3
           # - archive-centos-7-3003-3-py3
+          # - archive-fedora-35-3003-3-py3
           # - archive-fedora-34-3003-3-py3
-          # - archive-fedora-33-3003-3-py3
           # - archive-opensuse-leap-153-3003-3-py3
-          # - archive-opensuse-leap-152-3003-3-py3
           # - archive-opensuse-tmbl-latest-3003-3-py3
           # - archive-amazonlinux-2-3003-3-py3
           # - archive-oraclelinux-8-3003-3-py3
           # - archive-oraclelinux-7-3003-3-py3
-          # - archive-arch-base-latest-3003-3-py3
           # - archive-gentoo-stage3-latest-3003-3-py3
           # - archive-gentoo-stage3-systemd-3003-3-py3
           # - archive-almalinux-8-3003-3-py3
-          # - archive-debian-11-3002-7-py3
           # - archive-debian-10-3002-7-py3
           # - archive-debian-9-3002-7-py3
           # - archive-ubuntu-2004-3002-7-py3
           # - archive-ubuntu-1804-3002-7-py3
-          # - archive-centos-8-3002-7-py3
           # - archive-centos-7-3002-7-py3
+          # - archive-fedora-35-3002-7-py3
           # - archive-fedora-34-3002-7-py3
-          # - archive-fedora-33-3002-7-py3
           # - archive-opensuse-leap-153-3002-7-py3
-          # - archive-opensuse-leap-152-3002-7-py3
           # - archive-opensuse-tmbl-latest-3002-7-py3
           # - archive-amazonlinux-2-3002-7-py3
           # - archive-oraclelinux-8-3002-7-py3
           # - archive-oraclelinux-7-3002-7-py3
-          # - archive-arch-base-latest-3002-7-py3
           # - archive-gentoo-stage3-latest-3002-7-py3
           # - archive-gentoo-stage3-systemd-3002-7-py3
-          # - archive-debian-10-3001-8-py3
-          # - archive-debian-9-3001-8-py3
-          # - archive-ubuntu-2004-3001-8-py3
-          # - archive-ubuntu-1804-3001-8-py3
-          # - archive-centos-8-3001-8-py3
-          # - archive-centos-7-3001-8-py3
-          # - archive-fedora-34-3001-8-py3
-          # - archive-fedora-33-3001-8-py3
-          # - archive-opensuse-leap-153-3001-8-py3
-          # - archive-opensuse-leap-152-3001-8-py3
-          # - archive-opensuse-tmbl-latest-3001-8-py3
-          # - archive-amazonlinux-2-3001-8-py3
-          # - archive-oraclelinux-8-3001-8-py3
-          # - archive-oraclelinux-7-3001-8-py3
-          # - archive-arch-base-latest-3001-8-py3
-          # - archive-gentoo-stage3-latest-3001-8-py3
-          # - archive-gentoo-stage3-systemd-3001-8-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'

diff --git a/.travis.yml b/.travis.yml
@@ -97,7 +97,6 @@ jobs:
     # - env: INSTANCE=archive-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=archive-ubuntu-1804-tiamat-py3
     # - env: INSTANCE=archive-centos-stream8-tiamat-py3
-    # - env: INSTANCE=archive-centos-8-tiamat-py3
     # - env: INSTANCE=archive-centos-7-tiamat-py3
     # - env: INSTANCE=archive-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=archive-oraclelinux-8-tiamat-py3
@@ -145,13 +144,6 @@ jobs:
     # - env: INSTANCE=composeclean-centos-stream8-master-py3
     # - env: INSTANCE=dockeronly-centos-stream8-master-py3
     - env: INSTANCE=centos-stream8-master-py3
-    # - env: INSTANCE=archive-centos-8-master-py3
-    # - env: INSTANCE=package-centos-8-master-py3
-    # - env: INSTANCE=repo-centos-8-master-py3
-    # - env: INSTANCE=clean-centos-8-master-py3
-    # - env: INSTANCE=composeclean-centos-8-master-py3
-    # - env: INSTANCE=dockeronly-centos-8-master-py3
-    - env: INSTANCE=centos-8-master-py3
     # - env: INSTANCE=archive-centos-7-master-py3
     # - env: INSTANCE=package-centos-7-master-py3
     # - env: INSTANCE=repo-centos-7-master-py3
@@ -166,27 +158,13 @@ jobs:
     # - env: INSTANCE=composeclean-fedora-34-master-py3
     # - env: INSTANCE=dockeronly-fedora-34-master-py3
     - env: INSTANCE=fedora-34-master-py3
-    # - env: INSTANCE=archive-fedora-33-master-py3
-    # - env: INSTANCE=package-fedora-33-master-py3
-    # - env: INSTANCE=repo-fedora-33-master-py3
-    # - env: INSTANCE=clean-fedora-33-master-py3
-    # - env: INSTANCE=composeclean-fedora-33-master-py3
-    # - env: INSTANCE=dockeronly-fedora-33-master-py3
-    - env: INSTANCE=fedora-33-master-py3
     # - env: INSTANCE=archive-opensuse-leap-153-master-py3
     # - env: INSTANCE=package-opensuse-leap-153-master-py3
     # - env: INSTANCE=repo-opensuse-leap-153-master-py3
     # - env: INSTANCE=clean-opensuse-leap-153-master-py3
     # - env: INSTANCE=composeclean-opensuse-leap-153-master-py3
     # - env: INSTANCE=dockeronly-opensuse-leap-153-master-py3
     # - env: INSTANCE=opensuse-leap-153-master-py3
-    # - env: INSTANCE=archive-opensuse-leap-152-master-py3
-    # - env: INSTANCE=package-opensuse-leap-152-master-py3
-    # - env: INSTANCE=repo-opensuse-leap-152-master-py3
-    # - env: INSTANCE=clean-opensuse-leap-152-master-py3
-    # - env: INSTANCE=composeclean-opensuse-leap-152-master-py3
-    # - env: INSTANCE=dockeronly-opensuse-leap-152-master-py3
-    # - env: INSTANCE=opensuse-leap-152-master-py3
     # - env: INSTANCE=archive-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=package-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=repo-opensuse-tmbl-latest-master-py3
@@ -256,12 +234,9 @@ jobs:
     # - env: INSTANCE=archive-ubuntu-2004-3004-0-py3
     # - env: INSTANCE=archive-ubuntu-1804-3004-0-py3
     # - env: INSTANCE=archive-centos-stream8-3004-0-py3
-    # - env: INSTANCE=archive-centos-8-3004-0-py3
     # - env: INSTANCE=archive-centos-7-3004-0-py3
     # - env: INSTANCE=archive-fedora-34-3004-0-py3
-    # - env: INSTANCE=archive-fedora-33-3004-0-py3
     # - env: INSTANCE=archive-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=archive-opensuse-leap-152-3004-0-py3
     # - env: INSTANCE=archive-opensuse-tmbl-latest-3004-0-py3
     # - env: INSTANCE=archive-amazonlinux-2-3004-0-py3
     # - env: INSTANCE=archive-oraclelinux-8-3004-0-py3
@@ -271,61 +246,36 @@ jobs:
     # - env: INSTANCE=archive-gentoo-stage3-systemd-3004-0-py3
     # - env: INSTANCE=archive-almalinux-8-3004-0-py3
     # - env: INSTANCE=archive-rockylinux-8-3004-0-py3
-    # - env: INSTANCE=archive-debian-11-3003-3-py3
     # - env: INSTANCE=archive-debian-10-3003-3-py3
     # - env: INSTANCE=archive-debian-9-3003-3-py3
     # - env: INSTANCE=archive-ubuntu-2004-3003-3-py3
     # - env: INSTANCE=archive-ubuntu-1804-3003-3-py3
     # - env: INSTANCE=archive-centos-stream8-3003-3-py3
-    # - env: INSTANCE=archive-centos-8-3003-3-py3
     # - env: INSTANCE=archive-centos-7-3003-3-py3
+    # - env: INSTANCE=archive-fedora-35-3003-3-py3
     # - env: INSTANCE=archive-fedora-34-3003-3-py3
-    # - env: INSTANCE=archive-fedora-33-3003-3-py3
     # - env: INSTANCE=archive-opensuse-leap-153-3003-3-py3
-    # - env: INSTANCE=archive-opensuse-leap-152-3003-3-py3
     # - env: INSTANCE=archive-opensuse-tmbl-latest-3003-3-py3
     # - env: INSTANCE=archive-amazonlinux-2-3003-3-py3
     # - env: INSTANCE=archive-oraclelinux-8-3003-3-py3
     # - env: INSTANCE=archive-oraclelinux-7-3003-3-py3
-    # - env: INSTANCE=archive-arch-base-latest-3003-3-py3
     # - env: INSTANCE=archive-gentoo-stage3-latest-3003-3-py3
     # - env: INSTANCE=archive-gentoo-stage3-systemd-3003-3-py3
     # - env: INSTANCE=archive-almalinux-8-3003-3-py3
-    # - env: INSTANCE=archive-debian-11-3002-7-py3
     # - env: INSTANCE=archive-debian-10-3002-7-py3
     # - env: INSTANCE=archive-debian-9-3002-7-py3
     # - env: INSTANCE=archive-ubuntu-2004-3002-7-py3
     # - env: INSTANCE=archive-ubuntu-1804-3002-7-py3
-    # - env: INSTANCE=archive-centos-8-3002-7-py3
     # - env: INSTANCE=archive-centos-7-3002-7-py3
+    # - env: INSTANCE=archive-fedora-35-3002-7-py3
     # - env: INSTANCE=archive-fedora-34-3002-7-py3
-    # - env: INSTANCE=archive-fedora-33-3002-7-py3
     # - env: INSTANCE=archive-opensuse-leap-153-3002-7-py3
-    # - env: INSTANCE=archive-opensuse-leap-152-3002-7-py3
     # - env: INSTANCE=archive-opensuse-tmbl-latest-3002-7-py3
     # - env: INSTANCE=archive-amazonlinux-2-3002-7-py3
     # - env: INSTANCE=archive-oraclelinux-8-3002-7-py3
     # - env: INSTANCE=archive-oraclelinux-7-3002-7-py3
-    # - env: INSTANCE=archive-arch-base-latest-3002-7-py3
     # - env: INSTANCE=archive-gentoo-stage3-latest-3002-7-py3
     # - env: INSTANCE=archive-gentoo-stage3-systemd-3002-7-py3
-    # - env: INSTANCE=archive-debian-10-3001-8-py3
-    # - env: INSTANCE=archive-debian-9-3001-8-py3
-    # - env: INSTANCE=archive-ubuntu-2004-3001-8-py3
-    # - env: INSTANCE=archive-ubuntu-1804-3001-8-py3
-    # - env: INSTANCE=archive-centos-8-3001-8-py3
-    # - env: INSTANCE=archive-centos-7-3001-8-py3
-    # - env: INSTANCE=archive-fedora-34-3001-8-py3
-    # - env: INSTANCE=archive-fedora-33-3001-8-py3
-    # - env: INSTANCE=archive-opensuse-leap-153-3001-8-py3
-    # - env: INSTANCE=archive-opensuse-leap-152-3001-8-py3
-    # - env: INSTANCE=archive-opensuse-tmbl-latest-3001-8-py3
-    # - env: INSTANCE=archive-amazonlinux-2-3001-8-py3
-    # - env: INSTANCE=archive-oraclelinux-8-3001-8-py3
-    # - env: INSTANCE=archive-oraclelinux-7-3001-8-py3
-    # - env: INSTANCE=archive-arch-base-latest-3001-8-py3
-    # - env: INSTANCE=archive-gentoo-stage3-latest-3001-8-py3
-    # - env: INSTANCE=archive-gentoo-stage3-systemd-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'