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

* Automated using myii/ssf-formula#426
saltstack-formulas · Apr 3, 2022 · e618ee2 · e618ee2
1 parent 43bb04a
commit e618ee2
Show file tree

Hide file tree

Showing 3 changed files with 171 additions and 263 deletions.
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
@@ -77,6 +77,13 @@ jobs:
           # - composeclean-centos-7-master-py3
           # - dockeronly-centos-7-master-py3
           - centos-7-master-py3
+          # - archive-fedora-35-master-py3
+          # - package-fedora-35-master-py3
+          # - repo-fedora-35-master-py3
+          # - clean-fedora-35-master-py3
+          # - composeclean-fedora-35-master-py3
+          # - dockeronly-fedora-35-master-py3
+          - fedora-35-master-py3
           # - archive-fedora-34-master-py3
           # - package-fedora-34-master-py3
           # - repo-fedora-34-master-py3
@@ -153,54 +160,43 @@ jobs:
           # - composeclean-rockylinux-8-master-py3
           # - dockeronly-rockylinux-8-master-py3
           - rockylinux-8-master-py3
-          # - archive-debian-11-3004-0-py3
-          # - archive-debian-10-3004-0-py3
-          # - archive-debian-9-3004-0-py3
-          # - archive-ubuntu-2004-3004-0-py3
-          # - archive-ubuntu-1804-3004-0-py3
-          # - archive-centos-stream8-3004-0-py3
-          # - archive-centos-7-3004-0-py3
-          # - archive-fedora-34-3004-0-py3
+          # - archive-debian-11-3004-1-py3
+          # - archive-debian-10-3004-1-py3
+          # - archive-debian-9-3004-1-py3
+          # - archive-ubuntu-2004-3004-1-py3
+          # - archive-ubuntu-1804-3004-1-py3
+          # - archive-centos-stream8-3004-1-py3
+          # - archive-centos-7-3004-1-py3
+          # - archive-fedora-35-3004-1-py3
+          # - archive-fedora-34-3004-1-py3
+          # - archive-amazonlinux-2-3004-1-py3
+          # - archive-oraclelinux-8-3004-1-py3
+          # - archive-oraclelinux-7-3004-1-py3
+          # - archive-arch-base-latest-3004-1-py3
+          # - archive-gentoo-stage3-latest-3004-1-py3
+          # - archive-gentoo-stage3-systemd-3004-1-py3
+          # - archive-almalinux-8-3004-1-py3
+          # - archive-rockylinux-8-3004-1-py3
           # - archive-opensuse-leap-153-3004-0-py3
           # - archive-opensuse-tmbl-latest-3004-0-py3
-          # - archive-amazonlinux-2-3004-0-py3
-          # - archive-oraclelinux-8-3004-0-py3
-          # - archive-oraclelinux-7-3004-0-py3
-          # - archive-arch-base-latest-3004-0-py3
-          # - archive-gentoo-stage3-latest-3004-0-py3
-          # - archive-gentoo-stage3-systemd-3004-0-py3
-          # - archive-almalinux-8-3004-0-py3
-          # - archive-rockylinux-8-3004-0-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-7-3003-3-py3
-          # - archive-fedora-35-3003-3-py3
-          # - archive-fedora-34-3003-3-py3
-          # - archive-opensuse-leap-153-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-gentoo-stage3-latest-3003-3-py3
-          # - archive-gentoo-stage3-systemd-3003-3-py3
-          # - archive-almalinux-8-3003-3-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-7-3002-7-py3
-          # - archive-fedora-35-3002-7-py3
-          # - archive-fedora-34-3002-7-py3
-          # - archive-opensuse-leap-153-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-gentoo-stage3-latest-3002-7-py3
-          # - archive-gentoo-stage3-systemd-3002-7-py3
+          # - archive-debian-10-3003-4-py3
+          # - archive-debian-9-3003-4-py3
+          # - archive-ubuntu-2004-3003-4-py3
+          # - archive-ubuntu-1804-3003-4-py3
+          # - archive-centos-stream8-3003-4-py3
+          # - archive-centos-7-3003-4-py3
+          # - archive-amazonlinux-2-3003-4-py3
+          # - archive-oraclelinux-8-3003-4-py3
+          # - archive-oraclelinux-7-3003-4-py3
+          # - archive-almalinux-8-3003-4-py3
+          # - archive-debian-10-3002-8-py3
+          # - archive-debian-9-3002-8-py3
+          # - archive-ubuntu-2004-3002-8-py3
+          # - archive-ubuntu-1804-3002-8-py3
+          # - archive-centos-7-3002-8-py3
+          # - archive-amazonlinux-2-3002-8-py3
+          # - archive-oraclelinux-8-3002-8-py3
+          # - archive-oraclelinux-7-3002-8-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'

diff --git a/.travis.yml b/.travis.yml
@@ -234,55 +234,43 @@ jobs:
     # - env: INSTANCE=composeclean-rockylinux-8-master-py3
     # - env: INSTANCE=dockeronly-rockylinux-8-master-py3
     - env: INSTANCE=rockylinux-8-master-py3
-    # - env: INSTANCE=archive-debian-11-3004-0-py3
-    # - env: INSTANCE=archive-debian-10-3004-0-py3
-    # - env: INSTANCE=archive-debian-9-3004-0-py3
-    # - 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-7-3004-0-py3
-    # - env: INSTANCE=archive-fedora-35-3004-0-py3
-    # - env: INSTANCE=archive-fedora-34-3004-0-py3
+    # - env: INSTANCE=archive-debian-11-3004-1-py3
+    # - env: INSTANCE=archive-debian-10-3004-1-py3
+    # - env: INSTANCE=archive-debian-9-3004-1-py3
+    # - env: INSTANCE=archive-ubuntu-2004-3004-1-py3
+    # - env: INSTANCE=archive-ubuntu-1804-3004-1-py3
+    # - env: INSTANCE=archive-centos-stream8-3004-1-py3
+    # - env: INSTANCE=archive-centos-7-3004-1-py3
+    # - env: INSTANCE=archive-fedora-35-3004-1-py3
+    # - env: INSTANCE=archive-fedora-34-3004-1-py3
+    # - env: INSTANCE=archive-amazonlinux-2-3004-1-py3
+    # - env: INSTANCE=archive-oraclelinux-8-3004-1-py3
+    # - env: INSTANCE=archive-oraclelinux-7-3004-1-py3
+    # - env: INSTANCE=archive-arch-base-latest-3004-1-py3
+    # - env: INSTANCE=archive-gentoo-stage3-latest-3004-1-py3
+    # - env: INSTANCE=archive-gentoo-stage3-systemd-3004-1-py3
+    # - env: INSTANCE=archive-almalinux-8-3004-1-py3
+    # - env: INSTANCE=archive-rockylinux-8-3004-1-py3
     # - env: INSTANCE=archive-opensuse-leap-153-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
-    # - env: INSTANCE=archive-oraclelinux-7-3004-0-py3
-    # - env: INSTANCE=archive-arch-base-latest-3004-0-py3
-    # - env: INSTANCE=archive-gentoo-stage3-latest-3004-0-py3
-    # - 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-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-7-3003-3-py3
-    # - env: INSTANCE=archive-fedora-35-3003-3-py3
-    # - env: INSTANCE=archive-fedora-34-3003-3-py3
-    # - env: INSTANCE=archive-opensuse-leap-153-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-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-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-7-3002-7-py3
-    # - env: INSTANCE=archive-fedora-35-3002-7-py3
-    # - env: INSTANCE=archive-fedora-34-3002-7-py3
-    # - env: INSTANCE=archive-opensuse-leap-153-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-gentoo-stage3-latest-3002-7-py3
-    # - env: INSTANCE=archive-gentoo-stage3-systemd-3002-7-py3
+    # - env: INSTANCE=archive-debian-10-3003-4-py3
+    # - env: INSTANCE=archive-debian-9-3003-4-py3
+    # - env: INSTANCE=archive-ubuntu-2004-3003-4-py3
+    # - env: INSTANCE=archive-ubuntu-1804-3003-4-py3
+    # - env: INSTANCE=archive-centos-stream8-3003-4-py3
+    # - env: INSTANCE=archive-centos-7-3003-4-py3
+    # - env: INSTANCE=archive-amazonlinux-2-3003-4-py3
+    # - env: INSTANCE=archive-oraclelinux-8-3003-4-py3
+    # - env: INSTANCE=archive-oraclelinux-7-3003-4-py3
+    # - env: INSTANCE=archive-almalinux-8-3003-4-py3
+    # - env: INSTANCE=archive-debian-10-3002-8-py3
+    # - env: INSTANCE=archive-debian-9-3002-8-py3
+    # - env: INSTANCE=archive-ubuntu-2004-3002-8-py3
+    # - env: INSTANCE=archive-ubuntu-1804-3002-8-py3
+    # - env: INSTANCE=archive-centos-7-3002-8-py3
+    # - env: INSTANCE=archive-amazonlinux-2-3002-8-py3
+    # - env: INSTANCE=archive-oraclelinux-8-3002-8-py3
+    # - env: INSTANCE=archive-oraclelinux-7-3002-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'