From a0fdc618b009180a67f33a634699bc34e8ed163c Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 20 Dec 2020 21:47:04 +0000
Subject: [PATCH] ci(kitchen+gitlab): update for new pre-salted images [skip
 ci]

* Automated using https://github.com/myii/ssf-formula/pull/279
---
 .gitlab-ci.yml | 102 ++++++++++++-----------
 .travis.yml    | 102 ++++++++++++-----------
 kitchen.yml    | 213 +++++++++++++++++++++++--------------------------
 3 files changed, 198 insertions(+), 219 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b9b691..dd3e1b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,70 +134,66 @@ rubocop:
 # 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-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-oraclelinux-8-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-0-py3: {extends: '.test_instance'}
-# default-debian-9-3002-0-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-0-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-0-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3002-0-py3: {extends: '.test_instance'}
-# default-centos-8-3002-0-py3: {extends: '.test_instance'}
-# default-centos-7-3002-0-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-0-py3: {extends: '.test_instance'}
-# default-fedora-32-3002-0-py3: {extends: '.test_instance'}
-# default-fedora-31-3002-0-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3002-0-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-0-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-0-py3: {extends: '.test_instance'}
-default-oraclelinux-7-3002-0-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-0-py3: {extends: '.test_instance'}
-# default-debian-10-3001-1-py3: {extends: '.test_instance'}
-# default-debian-9-3001-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3001-1-py3: {extends: '.test_instance'}
-# default-centos-8-3001-1-py3: {extends: '.test_instance'}
-# default-centos-7-3001-1-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-1-py3: {extends: '.test_instance'}
-# default-fedora-32-3001-1-py3: {extends: '.test_instance'}
-# default-fedora-31-3001-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-1-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-1-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-ubuntu-1604-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-oraclelinux-8-3000-3-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3000-3-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3000-3-py3: {extends: '.test_instance'}
-# default-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-centos-6-3000-3-py2: {extends: '.test_instance'}
-# default-amazonlinux-1-3000-3-py2: {extends: '.test_instance'}
-# default-arch-base-latest-3000-3-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-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-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 3403445..2706ccf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,70 +94,66 @@ jobs:
     # - 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-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-oraclelinux-8-master-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=default-debian-10-3002-0-py3
-    # - env: INSTANCE=default-debian-9-3002-0-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-0-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-0-py3
-    # - env: INSTANCE=default-ubuntu-1604-3002-0-py3
-    # - env: INSTANCE=default-centos-8-3002-0-py3
-    # - env: INSTANCE=default-centos-7-3002-0-py3
-    # - env: INSTANCE=default-fedora-33-3002-0-py3
-    # - env: INSTANCE=default-fedora-32-3002-0-py3
-    # - env: INSTANCE=default-fedora-31-3002-0-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3002-0-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-0-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-0-py3
-    - env: INSTANCE=default-oraclelinux-7-3002-0-py3
-    # - env: INSTANCE=default-arch-base-latest-3002-0-py3
-    # - env: INSTANCE=default-debian-10-3001-1-py3
-    # - env: INSTANCE=default-debian-9-3001-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-1-py3
-    # - env: INSTANCE=default-ubuntu-1604-3001-1-py3
-    # - env: INSTANCE=default-centos-8-3001-1-py3
-    # - env: INSTANCE=default-centos-7-3001-1-py3
-    # - env: INSTANCE=default-fedora-33-3001-1-py3
-    # - env: INSTANCE=default-fedora-32-3001-1-py3
-    # - env: INSTANCE=default-fedora-31-3001-1-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-1-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-1-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-ubuntu-1604-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-oraclelinux-8-3000-3-py3
-    # - env: INSTANCE=default-oraclelinux-7-3000-3-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3000-3-py3
-    # - env: INSTANCE=default-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-centos-6-3000-3-py2
-    # - env: INSTANCE=default-amazonlinux-1-3000-3-py2
-    # - env: INSTANCE=default-arch-base-latest-3000-3-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-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-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 9261e0e..d033047 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -71,9 +71,6 @@ platforms:
   - 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
@@ -96,182 +93,172 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-systemd
 
-  ## SALT `3002.0`
-  - name: debian-10-3002-0-py3
-    driver:
-      image: saltimages/salt-3002.0-py3:debian-10
-  - name: debian-9-3002-0-py3
+  ## SALT `3002.2`
+  - name: debian-10-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:debian-9
-  - name: ubuntu-2004-3002-0-py3
+      image: saltimages/salt-3002.2-py3:debian-10
+  - name: debian-9-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002-0-py3
+      image: saltimages/salt-3002.2-py3:debian-9
+  - name: ubuntu-2004-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:ubuntu-18.04
-  - name: ubuntu-1604-3002-0-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:ubuntu-16.04
-  - name: centos-8-3002-0-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:centos-8
-  - name: centos-7-3002-0-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-16.04
+  - name: centos-8-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:centos-7
-  - name: fedora-33-3002-0-py3
+      image: saltimages/salt-3002.2-py3:centos-8
+  - name: centos-7-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:fedora-33
-  - name: fedora-32-3002-0-py3
+      image: saltimages/salt-3002.2-py3:centos-7
+  - name: fedora-33-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:fedora-32
-  - name: fedora-31-3002-0-py3
+      image: saltimages/salt-3002.2-py3:fedora-33
+  - name: fedora-32-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:fedora-31
-  - name: opensuse-leap-152-3002-0-py3
+      image: saltimages/salt-3002.2-py3:fedora-32
+  - name: opensuse-leap-152-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:opensuse-leap-15.2
+      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-3002-0-py3
+  - name: amazonlinux-2-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-0-py3
+      image: saltimages/salt-3002.2-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-0-py3
+      image: saltimages/salt-3002.2-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:oraclelinux-7
-  - name: arch-base-latest-3002-0-py3
+      image: saltimages/salt-3002.2-py3:oraclelinux-7
+  - name: arch-base-latest-3002-2-py3
     driver:
-      image: saltimages/salt-3002.0-py3:arch-base-latest
+      image: saltimages/salt-3002.2-py3:arch-base-latest
       run_command: /usr/lib/systemd/systemd
-
-  ## SALT `3001.1`
-  - name: debian-10-3001-1-py3
+  - name: gentoo-stage3-latest-3002-2-py3
     driver:
-      image: saltimages/salt-3001.1-py3:debian-10
-  - name: debian-9-3001-1-py3
+      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 `3001.4`
+  - name: debian-10-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:debian-9
-  - name: ubuntu-2004-3001-1-py3
+      image: saltimages/salt-3001.4-py3:debian-10
+  - name: debian-9-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-1-py3
+      image: saltimages/salt-3001.4-py3:debian-9
+  - name: ubuntu-2004-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-1-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:ubuntu-16.04
-  - name: centos-8-3001-1-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:centos-8
-  - name: centos-7-3001-1-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-16.04
+  - name: centos-8-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:centos-7
-  - name: fedora-33-3001-1-py3
+      image: saltimages/salt-3001.4-py3:centos-8
+  - name: centos-7-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:fedora-33
-  - name: fedora-32-3001-1-py3
+      image: saltimages/salt-3001.4-py3:centos-7
+  - name: fedora-33-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:fedora-32
-  - name: fedora-31-3001-1-py3
+      image: saltimages/salt-3001.4-py3:fedora-33
+  - name: fedora-32-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:fedora-31
-  - name: opensuse-leap-152-3001-1-py3
+      image: saltimages/salt-3001.4-py3:fedora-32
+  - name: opensuse-leap-152-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:opensuse-leap-15.2
+      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-3001-1-py3
+  - name: amazonlinux-2-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-1-py3
+      image: saltimages/salt-3001.4-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-1-py3
+      image: saltimages/salt-3001.4-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:oraclelinux-7
-  - name: arch-base-latest-3001-1-py3
+      image: saltimages/salt-3001.4-py3:oraclelinux-7
+  - name: arch-base-latest-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:arch-base-latest
+      image: saltimages/salt-3001.4-py3:arch-base-latest
       run_command: /usr/lib/systemd/systemd
-  - name: gentoo-stage3-latest-3001-1-py3
+  - name: gentoo-stage3-latest-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:gentoo-stage3-latest
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-1-py3
+  - name: gentoo-stage3-systemd-3001-4-py3
     driver:
-      image: saltimages/salt-3001.1-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd
 
-  ## SALT `3000.3`
-  - name: debian-10-3000-3-py3
+  ## SALT `3000.6`
+  - name: debian-10-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-10
-  - name: debian-9-3000-3-py3
+      image: saltimages/salt-3000.6-py3:debian-10
+  - name: debian-9-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-9
-  - name: ubuntu-1804-3000-3-py3
+      image: saltimages/salt-3000.6-py3:debian-9
+  - name: ubuntu-1804-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: ubuntu-1604-3000-3-py3
+      image: saltimages/salt-3000.6-py3:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-16.04
-  - name: centos-8-3000-3-py3
+      image: saltimages/salt-3000.6-py3:ubuntu-16.04
+  - name: centos-8-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-8
-  - name: centos-7-3000-3-py3
+      image: saltimages/salt-3000.6-py3:centos-8
+  - name: centos-7-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-7
-  - name: fedora-31-3000-3-py3
+      image: saltimages/salt-3000.6-py3:centos-7
+  - name: opensuse-leap-152-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:fedora-31
-  - name: opensuse-leap-152-3000-3-py3
-    driver:
-      image: saltimages/salt-3000.3-py3:opensuse-leap-15.2
+      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-3-py3
+  - name: amazonlinux-2-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-3-py3
+      image: saltimages/salt-3000.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-3-py3
+      image: saltimages/salt-3000.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3000-3-py3
+      image: saltimages/salt-3000.6-py3:oraclelinux-7
+  - name: gentoo-stage3-latest-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:gentoo-stage3-latest
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3000-3-py3
-    driver:
-      image: saltimages/salt-3000.3-py3:gentoo-stage3-systemd
-  - name: ubuntu-1804-3000-3-py2
+  - name: gentoo-stage3-systemd-3000-6-py3
     driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-3-py2
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd
+  - name: ubuntu-1804-3000-6-py2
     driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-16.04
-  - name: centos-6-3000-3-py2
+      image: saltimages/salt-3000.6-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py2
     driver:
-      image: saltimages/salt-3000.3-py2:centos-6
-      run_command: /sbin/init
-  - name: amazonlinux-1-3000-3-py2
-    driver:
-      image: saltimages/salt-3000.3-py2:amazonlinux-1
-      run_command: /sbin/init
-  - name: arch-base-latest-3000-3-py2
+      image: saltimages/salt-3000.6-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-6-py2
     driver:
-      image: saltimages/salt-3000.3-py2:arch-base-latest
+      image: saltimages/salt-3000.6-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
 provisioner: