ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]

* Automated using myii/ssf-formula#293
saltstack-formulas · Feb 14, 2021 · 00823a2 · 00823a2
1 parent 3347b85
commit 00823a2
Show file tree

Hide file tree

Showing 5 changed files with 311 additions and 181 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -167,55 +167,81 @@ rubocop:
 #       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
 test-formula-conversion: {extends: '.test_conversion'}
 # REMOVEME>
-default-debian-10-tiamat-py3: {extends: '.test_instance'}
+# default-debian-10-tiamat-py3: {extends: '.test_instance'}
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
-default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
-default-centos-8-tiamat-py3: {extends: '.test_instance'}
+# 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'}
+# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
-# default-debian-10-master-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# default-centos-8-master-py3: {extends: '.test_instance'}
+default-debian-10-master-py3: {extends: '.test_instance'}
+default-debian-9-master-py3: {extends: '.test_instance'}
+default-ubuntu-2004-master-py3: {extends: '.test_instance'}
+default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+default-ubuntu-1604-master-py3: {extends: '.test_instance'}
+default-centos-8-master-py3: {extends: '.test_instance'}
+default-centos-7-master-py3: {extends: '.test_instance'}
+default-fedora-33-master-py3: {extends: '.test_instance'}
 default-fedora-32-master-py3: {extends: '.test_instance'}
-# default-fedora-31-master-py3: {extends: '.test_instance'}
 default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-10-3001-py3: {extends: '.test_instance'}
-# default-debian-9-3001-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-py3: {extends: '.test_instance'}
-# default-centos-8-3001-py3: {extends: '.test_instance'}
-# default-centos-7-3001-py3: {extends: '.test_instance'}
-# default-fedora-32-3001-py3: {extends: '.test_instance'}
-# default-fedora-31-3001-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-py3: {extends: '.test_instance'}
-# gentoo-gentoo-stage3-latest-3001-py3: {extends: '.test_instance'}
-# gentoo-gentoo-stage3-systemd-3001-py3: {extends: '.test_instance'}
-# default-debian-10-3000-3-py3: {extends: '.test_instance'}
-# default-debian-9-3000-3-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# default-centos-8-3000-3-py3: {extends: '.test_instance'}
-# default-centos-7-3000-3-py3: {extends: '.test_instance'}
-# default-fedora-31-3000-3-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
-# gentoo-gentoo-stage3-latest-3000-3-py3: {extends: '.test_instance'}
-# gentoo-gentoo-stage3-systemd-3000-3-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
-default-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
-# upstart-centos-6-2019-2-py2: {extends: '.test_instance'}
-upstart-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
+# default-debian-10-3002-2-py3: {extends: '.test_instance'}
+# default-debian-9-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+# default-centos-8-3002-2-py3: {extends: '.test_instance'}
+# default-centos-7-3002-2-py3: {extends: '.test_instance'}
+# default-fedora-33-3002-2-py3: {extends: '.test_instance'}
+# default-fedora-32-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+default-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
+# default-debian-10-3001-4-py3: {extends: '.test_instance'}
+# default-debian-9-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+# default-centos-8-3001-4-py3: {extends: '.test_instance'}
+# default-centos-7-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-32-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
+# default-debian-10-3000-6-py3: {extends: '.test_instance'}
+# default-debian-9-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# default-centos-8-3000-6-py3: {extends: '.test_instance'}
+# default-centos-7-3000-6-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
+# default-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -94,55 +94,81 @@ jobs:
     #       to allow for comprehensive local testing
     #       Ref: https://github.com/saltstack-formulas/template-formula/issues/118
     #       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
-    - env: INSTANCE=default-debian-10-tiamat-py3
+    # - env: INSTANCE=default-debian-10-tiamat-py3
     # - env: INSTANCE=default-debian-9-tiamat-py3
-    - env: INSTANCE=default-ubuntu-2004-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
     # - env: INSTANCE=default-ubuntu-1604-tiamat-py3
-    - env: INSTANCE=default-centos-8-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
+    # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
+    # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
-    # - env: INSTANCE=default-debian-10-master-py3
-    # - env: INSTANCE=default-ubuntu-2004-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-debian-10-master-py3
+    - env: INSTANCE=default-debian-9-master-py3
+    - env: INSTANCE=default-ubuntu-2004-master-py3
+    - env: INSTANCE=default-ubuntu-1804-master-py3
+    - env: INSTANCE=default-ubuntu-1604-master-py3
+    - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-centos-7-master-py3
+    - env: INSTANCE=default-fedora-33-master-py3
     - env: INSTANCE=default-fedora-32-master-py3
-    # - env: INSTANCE=default-fedora-31-master-py3
     - env: INSTANCE=default-opensuse-leap-152-master-py3
-    # - env: INSTANCE=default-amazonlinux-2-master-py3
+    - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
+    - env: INSTANCE=default-amazonlinux-2-master-py3
+    - env: INSTANCE=default-oraclelinux-8-master-py3
+    - env: INSTANCE=default-oraclelinux-7-master-py3
     - env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3
     - env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=default-debian-10-3001-py3
-    # - env: INSTANCE=default-debian-9-3001-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-py3
-    # - env: INSTANCE=default-centos-8-3001-py3
-    # - env: INSTANCE=default-centos-7-3001-py3
-    # - env: INSTANCE=default-fedora-32-3001-py3
-    # - env: INSTANCE=default-fedora-31-3001-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-py3
-    # - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-py3
-    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-py3
-    # - env: INSTANCE=default-debian-10-3000-3-py3
-    # - env: INSTANCE=default-debian-9-3000-3-py3
-    # - env: INSTANCE=default-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=default-centos-8-3000-3-py3
-    # - env: INSTANCE=default-centos-7-3000-3-py3
-    # - env: INSTANCE=default-fedora-31-3000-3-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
-    # - env: INSTANCE=default-amazonlinux-2-3000-3-py3
-    # - env: INSTANCE=gentoo-gentoo-stage3-latest-3000-3-py3
-    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-3-py3
-    # - env: INSTANCE=default-ubuntu-1804-3000-3-py2
-    # - env: INSTANCE=default-ubuntu-1604-3000-3-py2
-    - env: INSTANCE=default-arch-base-latest-3000-3-py2
-    # - env: INSTANCE=upstart-centos-6-2019-2-py2
-    - env: INSTANCE=upstart-amazonlinux-1-2019-2-py2
+    # - env: INSTANCE=default-debian-10-3002-2-py3
+    # - env: INSTANCE=default-debian-9-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-2004-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-1804-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-1604-3002-2-py3
+    # - env: INSTANCE=default-centos-8-3002-2-py3
+    # - env: INSTANCE=default-centos-7-3002-2-py3
+    # - env: INSTANCE=default-fedora-33-3002-2-py3
+    # - env: INSTANCE=default-fedora-32-3002-2-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
+    # - env: INSTANCE=default-amazonlinux-2-3002-2-py3
+    # - env: INSTANCE=default-oraclelinux-8-3002-2-py3
+    # - env: INSTANCE=default-oraclelinux-7-3002-2-py3
+    - env: INSTANCE=default-arch-base-latest-3002-2-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-latest-3002-2-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3002-2-py3
+    # - env: INSTANCE=default-debian-10-3001-4-py3
+    # - env: INSTANCE=default-debian-9-3001-4-py3
+    # - env: INSTANCE=default-ubuntu-2004-3001-4-py3
+    # - env: INSTANCE=default-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=default-ubuntu-1604-3001-4-py3
+    # - env: INSTANCE=default-centos-8-3001-4-py3
+    # - env: INSTANCE=default-centos-7-3001-4-py3
+    # - env: INSTANCE=default-fedora-33-3001-4-py3
+    # - env: INSTANCE=default-fedora-32-3001-4-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3001-4-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-4-py3
+    # - env: INSTANCE=default-amazonlinux-2-3001-4-py3
+    # - env: INSTANCE=default-oraclelinux-8-3001-4-py3
+    # - env: INSTANCE=default-oraclelinux-7-3001-4-py3
+    # - env: INSTANCE=default-arch-base-latest-3001-4-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-4-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-4-py3
+    # - env: INSTANCE=default-debian-10-3000-6-py3
+    # - env: INSTANCE=default-debian-9-3000-6-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=default-ubuntu-1604-3000-6-py3
+    # - env: INSTANCE=default-centos-8-3000-6-py3
+    # - env: INSTANCE=default-centos-7-3000-6-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3000-6-py3
+    # - env: INSTANCE=default-amazonlinux-2-3000-6-py3
+    # - env: INSTANCE=default-oraclelinux-8-3000-6-py3
+    # - env: INSTANCE=default-oraclelinux-7-3000-6-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-latest-3000-6-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-6-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-6-py2
+    # - env: INSTANCE=default-ubuntu-1604-3000-6-py2
+    # - env: INSTANCE=default-arch-base-latest-3000-6-py2
     # <REMOVEME
 
     # Test the conversion of `template-formula` into another formula