From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 7 Mar 2021 22:16:13 +0000 (+0000)
Subject: ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/7c7bc03cdf453194da4e449eccd1dc35d0952ced

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

* Automated using https://github.com/myii/ssf-formula/pull/299
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9bcf7a..c6cd6c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ variables:
   DOCKER_DRIVER: 'overlay2'
 
 ###############################################################################
-# `lint` stage: `commitlint` & `pre-commit`
+# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
 ###############################################################################
 commitlint:
   stage: *stage_lint
@@ -124,77 +124,86 @@ rubocop:
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
 # api-debian-10-tiamat-py3: {extends: '.test_instance'}
-# keepstore-debian-10-tiamat-py3: {extends: '.test_instance'}
-# shell-debian-10-tiamat-py3: {extends: '.test_instance'}
-# workbench-debian-10-tiamat-py3: {extends: '.test_instance'}
 # api-debian-9-tiamat-py3: {extends: '.test_instance'}
-# keepstore-debian-9-tiamat-py3: {extends: '.test_instance'}
-# shell-debian-9-tiamat-py3: {extends: '.test_instance'}
-# workbench-debian-9-tiamat-py3: {extends: '.test_instance'}
 # api-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
-# keepstore-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
-# shell-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
-# workbench-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # api-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# keepstore-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# shell-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# workbench-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
+# api-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
+# api-centos-8-tiamat-py3: {extends: '.test_instance'}
 # api-centos-7-tiamat-py3: {extends: '.test_instance'}
-# keepstore-centos-7-tiamat-py3: {extends: '.test_instance'}
-# shell-centos-7-tiamat-py3: {extends: '.test_instance'}
-# workbench-centos-7-tiamat-py3: {extends: '.test_instance'}
-# api-debian-10-master-py3: {extends: '.test_instance'}
-# keepstore-debian-10-master-py3: {extends: '.test_instance'}
+# api-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
+# api-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
+# api-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
+api-debian-10-master-py3: {extends: '.test_instance'}
+workbench-debian-10-master-py3: {extends: '.test_instance'}
 # shell-debian-10-master-py3: {extends: '.test_instance'}
-# workbench-debian-10-master-py3: {extends: '.test_instance'}
+keepstore-debian-10-master-py3: {extends: '.test_instance'}
+# api-debian-9-master-py3: {extends: '.test_instance'}
+# workbench-debian-9-master-py3: {extends: '.test_instance'}
+# shell-debian-9-master-py3: {extends: '.test_instance'}
+# keepstore-debian-9-master-py3: {extends: '.test_instance'}
 # api-ubuntu-2004-master-py3: {extends: '.test_instance'}
-# keepstore-ubuntu-2004-master-py3: {extends: '.test_instance'}
-# shell-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # workbench-ubuntu-2004-master-py3: {extends: '.test_instance'}
-# api-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# keepstore-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# shell-ubuntu-2004-master-py3: {extends: '.test_instance'}
+# keepstore-ubuntu-2004-master-py3: {extends: '.test_instance'}
+api-ubuntu-1804-master-py3: {extends: '.test_instance'}
+workbench-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # shell-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# workbench-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# api-debian-10-3001-py3: {extends: '.test_instance'}
-# keepstore-debian-10-3001-py3: {extends: '.test_instance'}
-# shell-debian-10-3001-py3: {extends: '.test_instance'}
-# workbench-debian-10-3001-py3: {extends: '.test_instance'}
-# api-debian-9-3001-py3: {extends: '.test_instance'}
-# keepstore-debian-9-3001-py3: {extends: '.test_instance'}
-# shell-debian-9-3001-py3: {extends: '.test_instance'}
-# workbench-debian-9-3001-py3: {extends: '.test_instance'}
-# api-ubuntu-2004-3001-py3: {extends: '.test_instance'}
-# keepstore-ubuntu-2004-3001-py3: {extends: '.test_instance'}
-# shell-ubuntu-2004-3001-py3: {extends: '.test_instance'}
-# workbench-ubuntu-2004-3001-py3: {extends: '.test_instance'}
-# api-ubuntu-1804-3001-py3: {extends: '.test_instance'}
-# keepstore-ubuntu-1804-3001-py3: {extends: '.test_instance'}
-# shell-ubuntu-1804-3001-py3: {extends: '.test_instance'}
-# workbench-ubuntu-1804-3001-py3: {extends: '.test_instance'}
-# api-centos-7-3001-py3: {extends: '.test_instance'}
-# keepstore-centos-7-3001-py3: {extends: '.test_instance'}
-shell-centos-7-3001-py3: {extends: '.test_instance'}
-# workbench-centos-7-3001-py3: {extends: '.test_instance'}
-# api-debian-10-3000-3-py3: {extends: '.test_instance'}
-# keepstore-debian-10-3000-3-py3: {extends: '.test_instance'}
-# shell-debian-10-3000-3-py3: {extends: '.test_instance'}
-# workbench-debian-10-3000-3-py3: {extends: '.test_instance'}
-# api-debian-9-3000-3-py3: {extends: '.test_instance'}
-# keepstore-debian-9-3000-3-py3: {extends: '.test_instance'}
-# shell-debian-9-3000-3-py3: {extends: '.test_instance'}
-# workbench-debian-9-3000-3-py3: {extends: '.test_instance'}
-# api-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# keepstore-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# shell-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# workbench-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# api-centos-7-3000-3-py3: {extends: '.test_instance'}
-keepstore-centos-7-3000-3-py3: {extends: '.test_instance'}
-# shell-centos-7-3000-3-py3: {extends: '.test_instance'}
-# workbench-centos-7-3000-3-py3: {extends: '.test_instance'}
-# api-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# keepstore-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# shell-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# workbench-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
+# keepstore-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# api-ubuntu-1604-master-py3: {extends: '.test_instance'}
+# workbench-ubuntu-1604-master-py3: {extends: '.test_instance'}
+# shell-ubuntu-1604-master-py3: {extends: '.test_instance'}
+# keepstore-ubuntu-1604-master-py3: {extends: '.test_instance'}
+# api-centos-8-master-py3: {extends: '.test_instance'}
+# workbench-centos-8-master-py3: {extends: '.test_instance'}
+# shell-centos-8-master-py3: {extends: '.test_instance'}
+# keepstore-centos-8-master-py3: {extends: '.test_instance'}
+# api-centos-7-master-py3: {extends: '.test_instance'}
+# workbench-centos-7-master-py3: {extends: '.test_instance'}
+shell-centos-7-master-py3: {extends: '.test_instance'}
+keepstore-centos-7-master-py3: {extends: '.test_instance'}
+# api-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# workbench-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# shell-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# keepstore-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# api-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# workbench-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# shell-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# keepstore-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# api-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# workbench-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# shell-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# keepstore-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# api-debian-10-3002-5-py3: {extends: '.test_instance'}
+# api-debian-9-3002-5-py3: {extends: '.test_instance'}
+# api-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
+# api-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
+# api-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
+# api-centos-8-3002-5-py3: {extends: '.test_instance'}
+# api-centos-7-3002-5-py3: {extends: '.test_instance'}
+# api-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
+# api-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
+# api-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
+# api-debian-10-3001-6-py3: {extends: '.test_instance'}
+# api-debian-9-3001-6-py3: {extends: '.test_instance'}
+# api-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
+# api-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
+# api-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
+# api-centos-8-3001-6-py3: {extends: '.test_instance'}
+# api-centos-7-3001-6-py3: {extends: '.test_instance'}
+# api-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
+# api-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
+# api-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
+# api-debian-10-3000-8-py3: {extends: '.test_instance'}
+# api-debian-9-3000-8-py3: {extends: '.test_instance'}
+# api-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
+# api-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
+# api-centos-8-3000-8-py3: {extends: '.test_instance'}
+# api-centos-7-3000-8-py3: {extends: '.test_instance'}
+# api-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
+# api-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
+# api-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
+# api-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
+# api-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index 273f12b..8a44d3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,77 +84,86 @@ jobs:
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
     # - env: INSTANCE=api-debian-10-tiamat-py3
-    # - env: INSTANCE=keepstore-debian-10-tiamat-py3
-    # - env: INSTANCE=shell-debian-10-tiamat-py3
-    # - env: INSTANCE=workbench-debian-10-tiamat-py3
     # - env: INSTANCE=api-debian-9-tiamat-py3
-    # - env: INSTANCE=keepstore-debian-9-tiamat-py3
-    # - env: INSTANCE=shell-debian-9-tiamat-py3
-    # - env: INSTANCE=workbench-debian-9-tiamat-py3
     # - env: INSTANCE=api-ubuntu-2004-tiamat-py3
-    # - env: INSTANCE=keepstore-ubuntu-2004-tiamat-py3
-    # - env: INSTANCE=shell-ubuntu-2004-tiamat-py3
-    # - env: INSTANCE=workbench-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=api-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=keepstore-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=shell-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=workbench-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=api-ubuntu-1604-tiamat-py3
+    # - env: INSTANCE=api-centos-8-tiamat-py3
     # - env: INSTANCE=api-centos-7-tiamat-py3
-    # - env: INSTANCE=keepstore-centos-7-tiamat-py3
-    # - env: INSTANCE=shell-centos-7-tiamat-py3
-    # - env: INSTANCE=workbench-centos-7-tiamat-py3
-    # - env: INSTANCE=api-debian-10-master-py3
-    # - env: INSTANCE=keepstore-debian-10-master-py3
+    # - env: INSTANCE=api-amazonlinux-2-tiamat-py3
+    # - env: INSTANCE=api-oraclelinux-8-tiamat-py3
+    # - env: INSTANCE=api-oraclelinux-7-tiamat-py3
+    - env: INSTANCE=api-debian-10-master-py3
+    - env: INSTANCE=workbench-debian-10-master-py3
     # - env: INSTANCE=shell-debian-10-master-py3
-    # - env: INSTANCE=workbench-debian-10-master-py3
+    - env: INSTANCE=keepstore-debian-10-master-py3
+    # - env: INSTANCE=api-debian-9-master-py3
+    # - env: INSTANCE=workbench-debian-9-master-py3
+    # - env: INSTANCE=shell-debian-9-master-py3
+    # - env: INSTANCE=keepstore-debian-9-master-py3
     # - env: INSTANCE=api-ubuntu-2004-master-py3
-    # - env: INSTANCE=keepstore-ubuntu-2004-master-py3
-    # - env: INSTANCE=shell-ubuntu-2004-master-py3
     # - env: INSTANCE=workbench-ubuntu-2004-master-py3
-    # - env: INSTANCE=api-ubuntu-1804-master-py3
-    # - env: INSTANCE=keepstore-ubuntu-1804-master-py3
+    # - env: INSTANCE=shell-ubuntu-2004-master-py3
+    # - env: INSTANCE=keepstore-ubuntu-2004-master-py3
+    - env: INSTANCE=api-ubuntu-1804-master-py3
+    - env: INSTANCE=workbench-ubuntu-1804-master-py3
     # - env: INSTANCE=shell-ubuntu-1804-master-py3
-    # - env: INSTANCE=workbench-ubuntu-1804-master-py3
-    # - env: INSTANCE=api-debian-10-3001-py3
-    # - env: INSTANCE=keepstore-debian-10-3001-py3
-    # - env: INSTANCE=shell-debian-10-3001-py3
-    # - env: INSTANCE=workbench-debian-10-3001-py3
-    # - env: INSTANCE=api-debian-9-3001-py3
-    # - env: INSTANCE=keepstore-debian-9-3001-py3
-    # - env: INSTANCE=shell-debian-9-3001-py3
-    # - env: INSTANCE=workbench-debian-9-3001-py3
-    # - env: INSTANCE=api-ubuntu-2004-3001-py3
-    # - env: INSTANCE=keepstore-ubuntu-2004-3001-py3
-    # - env: INSTANCE=shell-ubuntu-2004-3001-py3
-    # - env: INSTANCE=workbench-ubuntu-2004-3001-py3
-    # - env: INSTANCE=api-ubuntu-1804-3001-py3
-    # - env: INSTANCE=keepstore-ubuntu-1804-3001-py3
-    # - env: INSTANCE=shell-ubuntu-1804-3001-py3
-    # - env: INSTANCE=workbench-ubuntu-1804-3001-py3
-    # - env: INSTANCE=api-centos-7-3001-py3
-    # - env: INSTANCE=keepstore-centos-7-3001-py3
-    - env: INSTANCE=shell-centos-7-3001-py3
-    # - env: INSTANCE=workbench-centos-7-3001-py3
-    # - env: INSTANCE=api-debian-10-3000-3-py3
-    # - env: INSTANCE=keepstore-debian-10-3000-3-py3
-    # - env: INSTANCE=shell-debian-10-3000-3-py3
-    # - env: INSTANCE=workbench-debian-10-3000-3-py3
-    # - env: INSTANCE=api-debian-9-3000-3-py3
-    # - env: INSTANCE=keepstore-debian-9-3000-3-py3
-    # - env: INSTANCE=shell-debian-9-3000-3-py3
-    # - env: INSTANCE=workbench-debian-9-3000-3-py3
-    # - env: INSTANCE=api-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=keepstore-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=shell-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=workbench-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=api-centos-7-3000-3-py3
-    - env: INSTANCE=keepstore-centos-7-3000-3-py3
-    # - env: INSTANCE=shell-centos-7-3000-3-py3
-    # - env: INSTANCE=workbench-centos-7-3000-3-py3
-    # - env: INSTANCE=api-ubuntu-1804-3000-3-py2
-    # - env: INSTANCE=keepstore-ubuntu-1804-3000-3-py2
-    # - env: INSTANCE=shell-ubuntu-1804-3000-3-py2
-    # - env: INSTANCE=workbench-ubuntu-1804-3000-3-py2
+    # - env: INSTANCE=keepstore-ubuntu-1804-master-py3
+    # - env: INSTANCE=api-ubuntu-1604-master-py3
+    # - env: INSTANCE=workbench-ubuntu-1604-master-py3
+    # - env: INSTANCE=shell-ubuntu-1604-master-py3
+    # - env: INSTANCE=keepstore-ubuntu-1604-master-py3
+    # - env: INSTANCE=api-centos-8-master-py3
+    # - env: INSTANCE=workbench-centos-8-master-py3
+    # - env: INSTANCE=shell-centos-8-master-py3
+    # - env: INSTANCE=keepstore-centos-8-master-py3
+    # - env: INSTANCE=api-centos-7-master-py3
+    # - env: INSTANCE=workbench-centos-7-master-py3
+    - env: INSTANCE=shell-centos-7-master-py3
+    - env: INSTANCE=keepstore-centos-7-master-py3
+    # - env: INSTANCE=api-amazonlinux-2-master-py3
+    # - env: INSTANCE=workbench-amazonlinux-2-master-py3
+    # - env: INSTANCE=shell-amazonlinux-2-master-py3
+    # - env: INSTANCE=keepstore-amazonlinux-2-master-py3
+    # - env: INSTANCE=api-oraclelinux-8-master-py3
+    # - env: INSTANCE=workbench-oraclelinux-8-master-py3
+    # - env: INSTANCE=shell-oraclelinux-8-master-py3
+    # - env: INSTANCE=keepstore-oraclelinux-8-master-py3
+    # - env: INSTANCE=api-oraclelinux-7-master-py3
+    # - env: INSTANCE=workbench-oraclelinux-7-master-py3
+    # - env: INSTANCE=shell-oraclelinux-7-master-py3
+    # - env: INSTANCE=keepstore-oraclelinux-7-master-py3
+    # - env: INSTANCE=api-debian-10-3002-5-py3
+    # - env: INSTANCE=api-debian-9-3002-5-py3
+    # - env: INSTANCE=api-ubuntu-2004-3002-5-py3
+    # - env: INSTANCE=api-ubuntu-1804-3002-5-py3
+    # - env: INSTANCE=api-ubuntu-1604-3002-5-py3
+    # - env: INSTANCE=api-centos-8-3002-5-py3
+    # - env: INSTANCE=api-centos-7-3002-5-py3
+    # - env: INSTANCE=api-amazonlinux-2-3002-5-py3
+    # - env: INSTANCE=api-oraclelinux-8-3002-5-py3
+    # - env: INSTANCE=api-oraclelinux-7-3002-5-py3
+    # - env: INSTANCE=api-debian-10-3001-6-py3
+    # - env: INSTANCE=api-debian-9-3001-6-py3
+    # - env: INSTANCE=api-ubuntu-2004-3001-6-py3
+    # - env: INSTANCE=api-ubuntu-1804-3001-6-py3
+    # - env: INSTANCE=api-ubuntu-1604-3001-6-py3
+    # - env: INSTANCE=api-centos-8-3001-6-py3
+    # - env: INSTANCE=api-centos-7-3001-6-py3
+    # - env: INSTANCE=api-amazonlinux-2-3001-6-py3
+    # - env: INSTANCE=api-oraclelinux-8-3001-6-py3
+    # - env: INSTANCE=api-oraclelinux-7-3001-6-py3
+    # - env: INSTANCE=api-debian-10-3000-8-py3
+    # - env: INSTANCE=api-debian-9-3000-8-py3
+    # - env: INSTANCE=api-ubuntu-1804-3000-8-py3
+    # - env: INSTANCE=api-ubuntu-1604-3000-8-py3
+    # - env: INSTANCE=api-centos-8-3000-8-py3
+    # - env: INSTANCE=api-centos-7-3000-8-py3
+    # - env: INSTANCE=api-amazonlinux-2-3000-8-py3
+    # - env: INSTANCE=api-oraclelinux-8-3000-8-py3
+    # - env: INSTANCE=api-oraclelinux-7-3000-8-py3
+    # - env: INSTANCE=api-ubuntu-1804-3000-8-py2
+    # - env: INSTANCE=api-ubuntu-1604-3000-8-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index 53f989b..37ed50b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -8,8 +8,6 @@ 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
@@ -24,57 +22,155 @@ platforms:
   - 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: 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
+
+  ## SALT `3002.5`
+  - name: debian-10-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:debian-10
+  - name: debian-9-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:debian-9
+  - name: ubuntu-2004-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:ubuntu-16.04
+  - name: centos-8-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:centos-8
+  - name: centos-7-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:centos-7
+  - name: amazonlinux-2-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-5-py3
+    driver:
+      image: saltimages/salt-3002.5-py3:oraclelinux-7
 
-  ## SALT `3001`
-  - name: debian-10-3001-py3
+  ## SALT `3001.6`
+  - name: debian-10-3001-6-py3
+    driver:
+      image: saltimages/salt-3001.6-py3:debian-10
+  - name: debian-9-3001-6-py3
+    driver:
+      image: saltimages/salt-3001.6-py3:debian-9
+  - name: ubuntu-2004-3001-6-py3
+    driver:
+      image: saltimages/salt-3001.6-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-6-py3
+    driver:
+      image: saltimages/salt-3001.6-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-6-py3
     driver:
-      image: saltimages/salt-3001-py3:debian-10
-  - name: debian-9-3001-py3
+      image: saltimages/salt-3001.6-py3:ubuntu-16.04
+  - name: centos-8-3001-6-py3
     driver:
-      image: saltimages/salt-3001-py3:debian-9
-  - name: ubuntu-2004-3001-py3
+      image: saltimages/salt-3001.6-py3:centos-8
+  - name: centos-7-3001-6-py3
     driver:
-      image: saltimages/salt-3001-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-py3
+      image: saltimages/salt-3001.6-py3:centos-7
+  - name: amazonlinux-2-3001-6-py3
     driver:
-      image: saltimages/salt-3001-py3:ubuntu-18.04
-  - name: centos-7-3001-py3
+      image: saltimages/salt-3001.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-6-py3
     driver:
-      image: saltimages/salt-3001-py3:centos-7
-  - name: amazonlinux-2-3001-py3
+      image: saltimages/salt-3001.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-6-py3
     driver:
-      image: saltimages/salt-3001-py3:amazonlinux-2
+      image: saltimages/salt-3001.6-py3:oraclelinux-7
 
-  ## SALT `3000.3`
-  - name: debian-10-3000-3-py3
+  ## SALT `3000.8`
+  - name: debian-10-3000-8-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-10
-  - name: debian-9-3000-3-py3
+      image: saltimages/salt-3000.8-py3:debian-10
+  - name: debian-9-3000-8-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-9
-  - name: ubuntu-1804-3000-3-py3
+      image: saltimages/salt-3000.8-py3:debian-9
+  - name: ubuntu-1804-3000-8-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: centos-7-3000-3-py3
+      image: saltimages/salt-3000.8-py3:ubuntu-18.04
+  - name: ubuntu-1604-3000-8-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-7
-  - name: ubuntu-1804-3000-3-py2
+      image: saltimages/salt-3000.8-py3:ubuntu-16.04
+  - name: centos-8-3000-8-py3
     driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
+      image: saltimages/salt-3000.8-py3:centos-8
+  - name: centos-7-3000-8-py3
+    driver:
+      image: saltimages/salt-3000.8-py3:centos-7
+  - name: amazonlinux-2-3000-8-py3
+    driver:
+      image: saltimages/salt-3000.8-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-8-py3
+    driver:
+      image: saltimages/salt-3000.8-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-8-py3
+    driver:
+      image: saltimages/salt-3000.8-py3:oraclelinux-7
+  - name: ubuntu-1804-3000-8-py2
+    driver:
+      image: saltimages/salt-3000.8-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-8-py2
+    driver:
+      image: saltimages/salt-3000.8-py2:ubuntu-16.04
 
 provisioner:
   name: salt_solo
@@ -100,6 +196,18 @@ suites:
     driver:
       hostname: fixme.example.net
     provisioner:
+      dependencies:
+        - name: single_host
+          path: test/salt/states/examples
+        - name: locale
+          repo: git
+          source: https://github.com/saltstack-formulas/locale-formula.git
+        - name: postgres
+          repo: git
+          source: https://github.com/saltstack-formulas/postgres-formula.git
+        - name: nginx
+          repo: git
+          source: https://github.com/netmanagers/nginx-formula.git
       state_top:
         base:
           '*':
@@ -142,18 +250,6 @@ suites:
         example_nginx_keepproxy.sls: test/salt/pillar/examples/nginx_keepproxy_configuration.sls
         example_nginx_controller.sls: test/salt/pillar/examples/nginx_controller_configuration.sls
         # yamllint enable rule:line-length
-      dependencies:
-        - name: single_host
-          path: test/salt/states/examples
-        - name: locale
-          repo: git
-          source: https://github.com/saltstack-formulas/locale-formula.git
-        - name: postgres
-          repo: git
-          source: https://github.com/saltstack-formulas/postgres-formula.git
-        - name: nginx
-          repo: git
-          source: https://github.com/netmanagers/nginx-formula.git
     verifier:
       inspec_tests:
         - path: test/integration/api
@@ -161,12 +257,17 @@ suites:
         - path: test/integration/keepproxy
         - path: test/integration/keepweb
         - path: test/integration/controller
-
   #### workbench,workbench2
   - name: workbench
     driver:
       hostname: workbench.fixme.example.net
     provisioner:
+      dependencies:
+        - name: single_host
+          path: test/salt/states/examples
+        - name: nginx
+          repo: git
+          source: https://github.com/netmanagers/nginx-formula.git
       state_top:
         base:
           '*':
@@ -191,17 +292,10 @@ suites:
         example_nginx_workbench.sls: test/salt/pillar/examples/nginx_workbench_configuration.sls
         example_nginx_workbench2.sls: test/salt/pillar/examples/nginx_workbench2_configuration.sls
         # yamllint enable rule:line-length
-      dependencies:
-        - name: single_host
-          path: test/salt/states/examples
-        - name: nginx
-          repo: git
-          source: https://github.com/netmanagers/nginx-formula.git
     verifier:
       inspec_tests:
         - path: test/integration/workbench
         - path: test/integration/workbench2
-
   #### shell
   - name: shell
     driver:
@@ -223,7 +317,6 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/shell
-
   #### keepstore
   - name: keepstore
     driver:
diff --git a/test/integration/api/inspec.yml b/test/integration/api/inspec.yml
index 36440eb..5745cda 100644
--- a/test/integration/api/inspec.yml
+++ b/test/integration/api/inspec.yml
@@ -10,3 +10,12 @@ supports:
   - platform-name: debian
   - platform-name: ubuntu
   - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
+  - platform: windows
diff --git a/test/integration/keepstore/inspec.yml b/test/integration/keepstore/inspec.yml
index 0da62ce..61a872f 100644
--- a/test/integration/keepstore/inspec.yml
+++ b/test/integration/keepstore/inspec.yml
@@ -10,3 +10,12 @@ supports:
   - platform-name: debian
   - platform-name: ubuntu
   - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
+  - platform: windows
diff --git a/test/integration/shell/inspec.yml b/test/integration/shell/inspec.yml
index f30f71d..ecf5bfd 100644
--- a/test/integration/shell/inspec.yml
+++ b/test/integration/shell/inspec.yml
@@ -11,3 +11,12 @@ supports:
   - platform-name: debian
   - platform-name: ubuntu
   - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
+  - platform: windows
diff --git a/test/integration/workbench/inspec.yml b/test/integration/workbench/inspec.yml
index 5ffcaf8..86575b3 100644
--- a/test/integration/workbench/inspec.yml
+++ b/test/integration/workbench/inspec.yml
@@ -10,3 +10,12 @@ supports:
   - platform-name: debian
   - platform-name: ubuntu
   - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
+  - platform: windows