From ea66a0d2b85635dc66088caac94614191a772a9d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 12 Feb 2021 15:53:11 +0000
Subject: [PATCH] ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/293
---
 .gitlab-ci.yml                      |  98 +++++++---
 .travis.yml                         |  98 +++++++---
 kitchen.yml                         | 275 ++++++++++++++++++++++------
 test/integration/default/inspec.yml |   3 +
 4 files changed, 361 insertions(+), 113 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c16632..768861d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,37 +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`
+# 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-1804-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-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-oraclelinux-7-tiamat-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-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-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'}
-# 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'}
-# default-debian-10-2019-2-py3: {extends: '.test_instance'}
-# default-debian-9-2019-2-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-2019-2-py3: {extends: '.test_instance'}
-# default-centos-8-2019-2-py3: {extends: '.test_instance'}
-# default-centos-7-2019-2-py3: {extends: '.test_instance'}
-# default-fedora-31-2019-2-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-2019-2-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
-# default-centos-6-2019-2-py2: {extends: '.test_instance'}
-# default-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
-# default-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
+default-opensuse-leap-152-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'}
+default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+default-gentoo-stage3-systemd-master-py3: {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'}
+# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
+# default-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'}
+# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
+# default-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'}
+# default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
+# default-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
index 89a9a8b..c6251fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,37 +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=default-debian-10-tiamat-py3
+    # - env: INSTANCE=default-debian-9-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-7-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-debian-9-master-py3
     - env: INSTANCE=default-ubuntu-2004-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-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-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=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=default-debian-10-2019-2-py3
-    # - env: INSTANCE=default-debian-9-2019-2-py3
-    # - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=default-ubuntu-1604-2019-2-py3
-    # - env: INSTANCE=default-centos-8-2019-2-py3
-    # - env: INSTANCE=default-centos-7-2019-2-py3
-    # - env: INSTANCE=default-fedora-31-2019-2-py3
-    # - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
-    # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=default-centos-6-2019-2-py2
-    # - env: INSTANCE=default-amazonlinux-1-2019-2-py2
-    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
+    - env: INSTANCE=default-opensuse-leap-152-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=default-gentoo-stage3-latest-master-py3
+    - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+    # - 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=default-gentoo-stage3-latest-3002-2-py3
+    # - env: INSTANCE=default-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=default-gentoo-stage3-latest-3001-4-py3
+    # - env: INSTANCE=default-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=default-gentoo-stage3-latest-3000-6-py3
+    # - env: INSTANCE=default-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
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index b7adc82..5faf211 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -8,28 +8,67 @@ driver:
   privileged: true
   run_command: /lib/systemd/systemd
 
-# Make sure the platforms listed below match up with
-# the `env.matrix` instances defined in `.travis.yml`
 platforms:
+  ## SALT `tiamat`
+  - name: debian-10-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-10
+  - name: debian-9-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-9
+  - name: ubuntu-2004-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-20.04
+  - name: ubuntu-1804-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-18.04
+  - name: ubuntu-1604-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-16.04
+  - name: centos-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-8
+  - name: centos-7-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-7
+  - name: amazonlinux-2-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:amazonlinux-2
+  - name: oraclelinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:oraclelinux-8
+  - name: oraclelinux-7-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:oraclelinux-7
+
   ## SALT `master`
   - name: debian-10-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-10
+  - name: debian-9-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-9
   - name: ubuntu-2004-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-20.04
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
+  - name: ubuntu-1604-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-16.04
   - name: centos-8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-8
+  - name: centos-7-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-7
+  - name: fedora-33-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-33
   - name: fedora-32-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-32
-  - name: fedora-31-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-31
   - name: opensuse-leap-152-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.2
@@ -38,95 +77,213 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+  - name: opensuse-tmbl-latest-master-py3
+    driver:
+      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: amazonlinux-2-master-py3
     driver:
       image: saltimages/salt-master-py3:amazonlinux-2
+  - name: oraclelinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:oraclelinux-8
+  - name: oraclelinux-7-master-py3
+    driver:
+      image: saltimages/salt-master-py3:oraclelinux-7
+  - name: gentoo-stage3-latest-master-py3
+    driver:
+      image: saltimages/salt-master-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-master-py3
+    driver:
+      image: saltimages/salt-master-py3:gentoo-stage3-systemd
 
-  ## SALT `3000.3`
-  - name: debian-10-3000-3-py3
+  ## SALT `3002.2`
+  - name: debian-10-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-10
-  - name: debian-9-3000-3-py3
+      image: saltimages/salt-3002.2-py3:debian-10
+  - name: debian-9-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-9
-  - name: ubuntu-1804-3000-3-py3
+      image: saltimages/salt-3002.2-py3:debian-9
+  - name: ubuntu-2004-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: centos-8-3000-3-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-8
-  - name: centos-7-3000-3-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-7
-  - name: fedora-31-3000-3-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-16.04
+  - name: centos-8-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:fedora-31
-  - name: opensuse-leap-152-3000-3-py3
+      image: saltimages/salt-3002.2-py3:centos-8
+  - name: centos-7-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:opensuse-leap-15.2
+      image: saltimages/salt-3002.2-py3:centos-7
+  - name: fedora-33-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:fedora-33
+  - name: fedora-32-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:fedora-32
+  - name: opensuse-leap-152-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3000-3-py3
+  - name: opensuse-tmbl-latest-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:amazonlinux-2
-  - name: ubuntu-1804-3000-3-py2
-    driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-3-py2
-    driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-16.04
-  - name: arch-base-latest-3000-3-py2
-    driver:
-      image: saltimages/salt-3000.3-py2:arch-base-latest
+      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
       run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:oraclelinux-7
+  - name: arch-base-latest-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd
 
-  ## SALT `2019.2`
-  - name: debian-10-2019-2-py3
+  ## SALT `3001.4`
+  - name: debian-10-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:debian-10
-  - name: debian-9-2019-2-py3
+      image: saltimages/salt-3001.4-py3:debian-10
+  - name: debian-9-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:debian-9
-  - name: ubuntu-1804-2019-2-py3
+      image: saltimages/salt-3001.4-py3:debian-9
+  - name: ubuntu-2004-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-18.04
-  - name: ubuntu-1604-2019-2-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-16.04
-  - name: centos-8-2019-2-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:centos-8
-  - name: centos-7-2019-2-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-16.04
+  - name: centos-8-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:centos-7
-  - name: fedora-31-2019-2-py3
+      image: saltimages/salt-3001.4-py3:centos-8
+  - name: centos-7-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-152-2019-2-py3
+      image: saltimages/salt-3001.4-py3:centos-7
+  - name: fedora-33-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:opensuse-leap-15.2
+      image: saltimages/salt-3001.4-py3:fedora-33
+  - name: fedora-32-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:fedora-32
+  - name: opensuse-leap-152-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-2019-2-py3
+  - name: opensuse-tmbl-latest-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:amazonlinux-2
-  - name: centos-6-2019-2-py2
+      image: saltimages/salt-3001.4-py3:opensuse-tumbleweed-latest
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py2:centos-6
+      image: saltimages/salt-3001.4-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:oraclelinux-7
+  - name: arch-base-latest-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: amazonlinux-1-2019-2-py2
+  - name: gentoo-stage3-systemd-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py2:amazonlinux-1
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd
+
+  ## SALT `3000.6`
+  - name: debian-10-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:debian-10
+  - name: debian-9-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:debian-9
+  - name: ubuntu-1804-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:ubuntu-16.04
+  - name: centos-8-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:centos-8
+  - name: centos-7-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:centos-7
+  - name: opensuse-leap-152-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:opensuse-leap-15.2
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:oraclelinux-7
+  - name: gentoo-stage3-latest-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: arch-base-latest-2019-2-py2
+  - name: gentoo-stage3-systemd-3000-6-py3
     driver:
-      image: saltimages/salt-2019.2-py2:arch-base-latest
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd
+  - name: ubuntu-1804-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
 provisioner:
@@ -150,6 +307,9 @@ verifier:
 suites:
   - name: default
     provisioner:
+      dependencies:
+        - name: states
+          path: ./test/salt
       state_top:
         base:
           'G@os_family:Suse or G@os_family:Debian':
@@ -164,9 +324,6 @@ suites:
               - logrotate
       pillars_from_files:
         logrotate.sls: pillar.example
-      dependencies:
-        - name: states
-          path: ./test/salt
     verifier:
       inspec_tests:
         - path: test/integration/default
diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml
index 45b7cce..a596732 100644
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -15,4 +15,7 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: oracle
   - platform-name: arch
+  - platform-name: gentoo
+  - platform: windows