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

* Automated using myii/ssf-formula#293
saltstack-formulas · Feb 15, 2021 · ae1610b · ae1610b
1 parent 19998df
commit ae1610b
Show file tree

Hide file tree

Showing 6 changed files with 424 additions and 158 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -123,46 +123,90 @@ 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`
+# git-debian-10-tiamat-py3: {extends: '.test_instance'}
+# git-debian-9-tiamat-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
+# git-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
+# git-centos-8-tiamat-py3: {extends: '.test_instance'}
+# git-centos-7-tiamat-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
 # git-debian-10-master-py3: {extends: '.test_instance'}
 deb-debian-10-master-py3: {extends: '.test_instance'}
+# git-debian-9-master-py3: {extends: '.test_instance'}
+deb-debian-9-master-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # git-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# git-ubuntu-1604-master-py3: {extends: '.test_instance'}
 # git-centos-8-master-py3: {extends: '.test_instance'}
-# rpm-centos-8-master-py3: {extends: '.test_instance'}
-# git-fedora-31-master-py3: {extends: '.test_instance'}
-# rpm-fedora-31-master-py3: {extends: '.test_instance'}
-# git-opensuse-leap-151-master-py3: {extends: '.test_instance'}
+rpm-centos-8-master-py3: {extends: '.test_instance'}
+# git-centos-7-master-py3: {extends: '.test_instance'}
+rpm-centos-7-master-py3: {extends: '.test_instance'}
+# git-fedora-33-master-py3: {extends: '.test_instance'}
+rpm-fedora-33-master-py3: {extends: '.test_instance'}
+# git-fedora-32-master-py3: {extends: '.test_instance'}
+rpm-fedora-32-master-py3: {extends: '.test_instance'}
+git-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+git-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # git-amazonlinux-2-master-py3: {extends: '.test_instance'}
-# rpm-amazonlinux-2-master-py3: {extends: '.test_instance'}
-# git-debian-10-2019-2-py3: {extends: '.test_instance'}
-# deb-debian-10-2019-2-py3: {extends: '.test_instance'}
-# git-debian-9-2019-2-py3: {extends: '.test_instance'}
-# deb-debian-9-2019-2-py3: {extends: '.test_instance'}
-git-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-git-centos-8-2019-2-py3: {extends: '.test_instance'}
-# rpm-centos-8-2019-2-py3: {extends: '.test_instance'}
-# git-fedora-31-2019-2-py3: {extends: '.test_instance'}
-# rpm-fedora-31-2019-2-py3: {extends: '.test_instance'}
-# git-opensuse-leap-151-2019-2-py3: {extends: '.test_instance'}
-# git-centos-7-2019-2-py2: {extends: '.test_instance'}
-# rpm-centos-7-2019-2-py2: {extends: '.test_instance'}
-# git-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
-rpm-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
-git-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
-git-fedora-30-2018-3-py3: {extends: '.test_instance'}
-# rpm-fedora-30-2018-3-py3: {extends: '.test_instance'}
-# git-debian-9-2018-3-py2: {extends: '.test_instance'}
-# deb-debian-9-2018-3-py2: {extends: '.test_instance'}
-# git-ubuntu-1604-2018-3-py2: {extends: '.test_instance'}
-# git-centos-7-2018-3-py2: {extends: '.test_instance'}
-# rpm-centos-7-2018-3-py2: {extends: '.test_instance'}
-git-opensuse-leap-151-2018-3-py2: {extends: '.test_instance'}
-# git-amazonlinux-1-2018-3-py2: {extends: '.test_instance'}
-# rpm-amazonlinux-1-2018-3-py2: {extends: '.test_instance'}
-# git-arch-base-latest-2018-3-py2: {extends: '.test_instance'}
-# deb-debian-8-2017-7-py2: {extends: '.test_instance'}
-# rpm-centos-6-2017-7-py2: {extends: '.test_instance'}
-# rpm-fedora-30-2017-7-py2: {extends: '.test_instance'}
-# rpm-amazonlinux-1-2017-7-py2: {extends: '.test_instance'}
+rpm-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-master-py3: {extends: '.test_instance'}
+rpm-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# rpm-oraclelinux-7-master-py3: {extends: '.test_instance'}
+git-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+# git-debian-10-3002-2-py3: {extends: '.test_instance'}
+# git-debian-9-3002-2-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+# git-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+# git-centos-8-3002-2-py3: {extends: '.test_instance'}
+# git-centos-7-3002-2-py3: {extends: '.test_instance'}
+# git-fedora-33-3002-2-py3: {extends: '.test_instance'}
+# git-fedora-32-3002-2-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+git-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
+# git-debian-10-3001-4-py3: {extends: '.test_instance'}
+# git-debian-9-3001-4-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# git-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+# git-centos-8-3001-4-py3: {extends: '.test_instance'}
+# git-centos-7-3001-4-py3: {extends: '.test_instance'}
+# git-fedora-33-3001-4-py3: {extends: '.test_instance'}
+# git-fedora-32-3001-4-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# git-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
+# git-debian-10-3000-6-py3: {extends: '.test_instance'}
+# git-debian-9-3000-6-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# git-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# git-centos-8-3000-6-py3: {extends: '.test_instance'}
+# git-centos-7-3000-6-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+# git-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
+# git-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -83,46 +83,90 @@ 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=git-debian-10-tiamat-py3
+    # - env: INSTANCE=git-debian-9-tiamat-py3
+    # - env: INSTANCE=git-ubuntu-2004-tiamat-py3
+    # - env: INSTANCE=git-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=git-ubuntu-1604-tiamat-py3
+    # - env: INSTANCE=git-centos-8-tiamat-py3
+    # - env: INSTANCE=git-centos-7-tiamat-py3
+    # - env: INSTANCE=git-amazonlinux-2-tiamat-py3
+    # - env: INSTANCE=git-oraclelinux-8-tiamat-py3
+    # - env: INSTANCE=git-oraclelinux-7-tiamat-py3
     # - env: INSTANCE=git-debian-10-master-py3
     - env: INSTANCE=deb-debian-10-master-py3
+    # - env: INSTANCE=git-debian-9-master-py3
+    - env: INSTANCE=deb-debian-9-master-py3
+    # - env: INSTANCE=git-ubuntu-2004-master-py3
     # - env: INSTANCE=git-ubuntu-1804-master-py3
+    # - env: INSTANCE=git-ubuntu-1604-master-py3
     # - env: INSTANCE=git-centos-8-master-py3
-    # - env: INSTANCE=rpm-centos-8-master-py3
-    # - env: INSTANCE=git-fedora-31-master-py3
-    # - env: INSTANCE=rpm-fedora-31-master-py3
-    # - env: INSTANCE=git-opensuse-leap-151-master-py3
+    - env: INSTANCE=rpm-centos-8-master-py3
+    # - env: INSTANCE=git-centos-7-master-py3
+    - env: INSTANCE=rpm-centos-7-master-py3
+    # - env: INSTANCE=git-fedora-33-master-py3
+    - env: INSTANCE=rpm-fedora-33-master-py3
+    # - env: INSTANCE=git-fedora-32-master-py3
+    - env: INSTANCE=rpm-fedora-32-master-py3
+    - env: INSTANCE=git-opensuse-leap-152-master-py3
+    - env: INSTANCE=git-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=git-amazonlinux-2-master-py3
-    # - env: INSTANCE=rpm-amazonlinux-2-master-py3
-    # - env: INSTANCE=git-debian-10-2019-2-py3
-    # - env: INSTANCE=deb-debian-10-2019-2-py3
-    # - env: INSTANCE=git-debian-9-2019-2-py3
-    # - env: INSTANCE=deb-debian-9-2019-2-py3
-    - env: INSTANCE=git-ubuntu-1804-2019-2-py3
-    - env: INSTANCE=git-centos-8-2019-2-py3
-    # - env: INSTANCE=rpm-centos-8-2019-2-py3
-    # - env: INSTANCE=git-fedora-31-2019-2-py3
-    # - env: INSTANCE=rpm-fedora-31-2019-2-py3
-    # - env: INSTANCE=git-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=git-centos-7-2019-2-py2
-    # - env: INSTANCE=rpm-centos-7-2019-2-py2
-    # - env: INSTANCE=git-amazonlinux-2-2019-2-py3
-    - env: INSTANCE=rpm-amazonlinux-2-2019-2-py3
-    - env: INSTANCE=git-arch-base-latest-2019-2-py2
-    - env: INSTANCE=git-fedora-30-2018-3-py3
-    # - env: INSTANCE=rpm-fedora-30-2018-3-py3
-    # - env: INSTANCE=git-debian-9-2018-3-py2
-    # - env: INSTANCE=deb-debian-9-2018-3-py2
-    # - env: INSTANCE=git-ubuntu-1604-2018-3-py2
-    # - env: INSTANCE=git-centos-7-2018-3-py2
-    # - env: INSTANCE=rpm-centos-7-2018-3-py2
-    - env: INSTANCE=git-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=git-amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=rpm-amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=git-arch-base-latest-2018-3-py2
-    # - env: INSTANCE=deb-debian-8-2017-7-py2
-    # - env: INSTANCE=rpm-centos-6-2017-7-py2
-    # - env: INSTANCE=rpm-fedora-30-2017-7-py2
-    # - env: INSTANCE=rpm-amazonlinux-1-2017-7-py2
+    - env: INSTANCE=rpm-amazonlinux-2-master-py3
+    # - env: INSTANCE=git-oraclelinux-8-master-py3
+    - env: INSTANCE=rpm-oraclelinux-8-master-py3
+    # - env: INSTANCE=git-oraclelinux-7-master-py3
+    # - env: INSTANCE=rpm-oraclelinux-7-master-py3
+    - env: INSTANCE=git-gentoo-stage3-latest-master-py3
+    - env: INSTANCE=git-gentoo-stage3-systemd-master-py3
+    # - env: INSTANCE=git-debian-10-3002-2-py3
+    # - env: INSTANCE=git-debian-9-3002-2-py3
+    # - env: INSTANCE=git-ubuntu-2004-3002-2-py3
+    # - env: INSTANCE=git-ubuntu-1804-3002-2-py3
+    # - env: INSTANCE=git-ubuntu-1604-3002-2-py3
+    # - env: INSTANCE=git-centos-8-3002-2-py3
+    # - env: INSTANCE=git-centos-7-3002-2-py3
+    # - env: INSTANCE=git-fedora-33-3002-2-py3
+    # - env: INSTANCE=git-fedora-32-3002-2-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3002-2-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3002-2-py3
+    # - env: INSTANCE=git-amazonlinux-2-3002-2-py3
+    # - env: INSTANCE=git-oraclelinux-8-3002-2-py3
+    # - env: INSTANCE=git-oraclelinux-7-3002-2-py3
+    - env: INSTANCE=git-arch-base-latest-3002-2-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3002-2-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3002-2-py3
+    # - env: INSTANCE=git-debian-10-3001-4-py3
+    # - env: INSTANCE=git-debian-9-3001-4-py3
+    # - env: INSTANCE=git-ubuntu-2004-3001-4-py3
+    # - env: INSTANCE=git-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=git-ubuntu-1604-3001-4-py3
+    # - env: INSTANCE=git-centos-8-3001-4-py3
+    # - env: INSTANCE=git-centos-7-3001-4-py3
+    # - env: INSTANCE=git-fedora-33-3001-4-py3
+    # - env: INSTANCE=git-fedora-32-3001-4-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3001-4-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3001-4-py3
+    # - env: INSTANCE=git-amazonlinux-2-3001-4-py3
+    # - env: INSTANCE=git-oraclelinux-8-3001-4-py3
+    # - env: INSTANCE=git-oraclelinux-7-3001-4-py3
+    # - env: INSTANCE=git-arch-base-latest-3001-4-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3001-4-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3001-4-py3
+    # - env: INSTANCE=git-debian-10-3000-6-py3
+    # - env: INSTANCE=git-debian-9-3000-6-py3
+    # - env: INSTANCE=git-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=git-ubuntu-1604-3000-6-py3
+    # - env: INSTANCE=git-centos-8-3000-6-py3
+    # - env: INSTANCE=git-centos-7-3000-6-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3000-6-py3
+    # - env: INSTANCE=git-amazonlinux-2-3000-6-py3
+    # - env: INSTANCE=git-oraclelinux-8-3000-6-py3
+    # - env: INSTANCE=git-oraclelinux-7-3000-6-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3000-6-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3000-6-py3
+    # - env: INSTANCE=git-ubuntu-1804-3000-6-py2
+    # - env: INSTANCE=git-ubuntu-1604-3000-6-py2
+    # - env: INSTANCE=git-arch-base-latest-3000-6-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'