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

* Automated using myii/ssf-formula#293
saltstack-formulas · Feb 19, 2021 · 592e3d1 · 592e3d1
1 parent 534a1f6
commit 592e3d1
Show file tree

Hide file tree

Showing 4 changed files with 449 additions and 149 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -123,38 +123,81 @@ rubocop:
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
+# debian-debian-10-tiamat-py3: {extends: '.test_instance'}
+# debian-debian-9-tiamat-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
+# redhat8-centos-8-tiamat-py3: {extends: '.test_instance'}
+# centos-centos-7-tiamat-py3: {extends: '.test_instance'}
+# amazon-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
+# redhat8-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
+# centos-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
 debian-debian-10-master-py3: {extends: '.test_instance'}
+debian-debian-9-master-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-master-py3: {extends: '.test_instance'}
 redhat8-centos-8-master-py3: {extends: '.test_instance'}
+centos-centos-7-master-py3: {extends: '.test_instance'}
+# fedora-fedora-33-master-py3: {extends: '.test_instance'}
 fedora-fedora-32-master-py3: {extends: '.test_instance'}
-# fedora-fedora-31-master-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
-# amazon-amazonlinux-2-master-py3: {extends: '.test_instance'}
+suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+amazon-amazonlinux-2-master-py3: {extends: '.test_instance'}
 redhat8-oraclelinux-8-master-py3: {extends: '.test_instance'}
-# debian-debian-10-3000-3-py3: {extends: '.test_instance'}
-# debian-debian-9-3000-3-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# redhat8-centos-8-3000-3-py3: {extends: '.test_instance'}
-centos-centos-7-3000-3-py3: {extends: '.test_instance'}
-# fedora-fedora-31-3000-3-py3: {extends: '.test_instance'}
-suse-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
-amazon-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# ubuntu-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
-# arch-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
-# debian-debian-10-2019-2-py3: {extends: '.test_instance'}
-# debian-debian-9-2019-2-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1604-2019-2-py3: {extends: '.test_instance'}
-# centos-centos-8-2019-2-py3: {extends: '.test_instance'}
-# centos-centos-7-2019-2-py3: {extends: '.test_instance'}
-# fedora-fedora-31-2019-2-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-2019-2-py3: {extends: '.test_instance'}
-# amazon-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
-# centos-centos-6-2019-2-py2: {extends: '.test_instance'}
-# amazon-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
-arch-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
+centos-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'}
+# debian-debian-10-3002-2-py3: {extends: '.test_instance'}
+# debian-debian-9-3002-2-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+# redhat8-centos-8-3002-2-py3: {extends: '.test_instance'}
+# centos-centos-7-3002-2-py3: {extends: '.test_instance'}
+# fedora-fedora-33-3002-2-py3: {extends: '.test_instance'}
+# fedora-fedora-32-3002-2-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# amazon-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
+# redhat8-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
+# centos-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+arch-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'}
+# debian-debian-10-3001-4-py3: {extends: '.test_instance'}
+# debian-debian-9-3001-4-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+# redhat8-centos-8-3001-4-py3: {extends: '.test_instance'}
+# centos-centos-7-3001-4-py3: {extends: '.test_instance'}
+# fedora-fedora-33-3001-4-py3: {extends: '.test_instance'}
+# fedora-fedora-32-3001-4-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
+# amazon-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
+# redhat8-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
+# centos-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# arch-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'}
+# debian-debian-10-3000-6-py3: {extends: '.test_instance'}
+# debian-debian-9-3000-6-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# redhat8-centos-8-3000-6-py3: {extends: '.test_instance'}
+# centos-centos-7-3000-6-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
+# amazon-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
+# redhat8-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
+# centos-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'}
+# ubuntu-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
+# arch-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -83,38 +83,81 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
+    # - env: INSTANCE=debian-debian-10-tiamat-py3
+    # - env: INSTANCE=debian-debian-9-tiamat-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-tiamat-py3
+    # - env: INSTANCE=redhat8-centos-8-tiamat-py3
+    # - env: INSTANCE=centos-centos-7-tiamat-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-tiamat-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-tiamat-py3
+    # - env: INSTANCE=centos-oraclelinux-7-tiamat-py3
     - env: INSTANCE=debian-debian-10-master-py3
+    - env: INSTANCE=debian-debian-9-master-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-master-py3
     - env: INSTANCE=redhat8-centos-8-master-py3
+    - env: INSTANCE=centos-centos-7-master-py3
+    # - env: INSTANCE=fedora-fedora-33-master-py3
     - env: INSTANCE=fedora-fedora-32-master-py3
-    # - env: INSTANCE=fedora-fedora-31-master-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-master-py3
-    # - env: INSTANCE=amazon-amazonlinux-2-master-py3
+    - env: INSTANCE=suse-opensuse-leap-152-master-py3
+    - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
+    - env: INSTANCE=amazon-amazonlinux-2-master-py3
     - env: INSTANCE=redhat8-oraclelinux-8-master-py3
-    # - env: INSTANCE=debian-debian-10-3000-3-py3
-    # - env: INSTANCE=debian-debian-9-3000-3-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=redhat8-centos-8-3000-3-py3
-    - env: INSTANCE=centos-centos-7-3000-3-py3
-    # - env: INSTANCE=fedora-fedora-31-3000-3-py3
-    - env: INSTANCE=suse-opensuse-leap-152-3000-3-py3
-    - env: INSTANCE=amazon-amazonlinux-2-3000-3-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py2
-    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-3-py2
-    # - env: INSTANCE=arch-arch-base-latest-3000-3-py2
-    # - env: INSTANCE=debian-debian-10-2019-2-py3
-    # - env: INSTANCE=debian-debian-9-2019-2-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1604-2019-2-py3
-    # - env: INSTANCE=centos-centos-8-2019-2-py3
-    # - env: INSTANCE=centos-centos-7-2019-2-py3
-    # - env: INSTANCE=fedora-fedora-31-2019-2-py3
-    # - env: INSTANCE=suse-opensuse-leap-152-2019-2-py3
-    # - env: INSTANCE=amazon-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=centos-centos-6-2019-2-py2
-    # - env: INSTANCE=amazon-amazonlinux-1-2019-2-py2
-    - env: INSTANCE=arch-arch-base-latest-2019-2-py2
+    - env: INSTANCE=centos-oraclelinux-7-master-py3
+    - env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3
+    - env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
+    # - env: INSTANCE=debian-debian-10-3002-2-py3
+    # - env: INSTANCE=debian-debian-9-3002-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3002-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3002-2-py3
+    # - env: INSTANCE=redhat8-centos-8-3002-2-py3
+    # - env: INSTANCE=centos-centos-7-3002-2-py3
+    # - env: INSTANCE=fedora-fedora-33-3002-2-py3
+    # - env: INSTANCE=fedora-fedora-32-3002-2-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-3002-2-py3
+    # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-2-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-3002-2-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-3002-2-py3
+    # - env: INSTANCE=centos-oraclelinux-7-3002-2-py3
+    - env: INSTANCE=arch-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=debian-debian-10-3001-4-py3
+    # - env: INSTANCE=debian-debian-9-3001-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3001-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3001-4-py3
+    # - env: INSTANCE=redhat8-centos-8-3001-4-py3
+    # - env: INSTANCE=centos-centos-7-3001-4-py3
+    # - env: INSTANCE=fedora-fedora-33-3001-4-py3
+    # - env: INSTANCE=fedora-fedora-32-3001-4-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-3001-4-py3
+    # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-4-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-3001-4-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-3001-4-py3
+    # - env: INSTANCE=centos-oraclelinux-7-3001-4-py3
+    # - env: INSTANCE=arch-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=debian-debian-10-3000-6-py3
+    # - env: INSTANCE=debian-debian-9-3000-6-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py3
+    # - env: INSTANCE=redhat8-centos-8-3000-6-py3
+    # - env: INSTANCE=centos-centos-7-3000-6-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-3000-6-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-3000-6-py3
+    # - env: INSTANCE=redhat8-oraclelinux-8-3000-6-py3
+    # - env: INSTANCE=centos-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=ubuntu-ubuntu-1804-3000-6-py2
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-6-py2
+    # - env: INSTANCE=arch-arch-base-latest-3000-6-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'