From f0608fb22e975ca2ffd5d096436c0b0abde43d55 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Sun, 3 Aug 2014 21:59:56 +0100
Subject: [PATCH 001/135] The stable branch should not see the unstable warning
 messagunstable e

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 7bf85c512..3bb2fa342 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -436,7 +436,7 @@ if [ "${CALLER}x" = "${0}x" ]; then
 fi
 
 echoinfo "${CALLER} ${0} -- Version ${__ScriptVersion}"
-echowarn "Running the unstable version of ${__ScriptName}"
+#echowarn "Running the unstable version of ${__ScriptName}"
 
 #---  FUNCTION  -------------------------------------------------------------------------------------------------------
 #          NAME:  __exit_cleanup

From 54a38f4461aba8e70dfb4b664df6f070f2aa665d Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 14 Oct 2014 05:42:05 +0100
Subject: [PATCH 002/135] Bump version for stable release

---
 ChangeLog         | 2 +-
 bootstrap-salt.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcc8a4771..4e58f37ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Version 2014.xx.xx:
+Version 2014.10.14:
 	* Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag
 	* Distro Support Added:
 		* Added Linux Mint 17 support(Thanks Skyler Berg)
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 5d594ec73..ca985f150 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2014.09.24"
+__ScriptVersion="2014.10.14"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================

From 79e9c7e7fb60a42e6a679715150cfa28127a6b9e Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 28 Oct 2014 02:04:26 +0000
Subject: [PATCH 003/135] Bump version for stable release.

---
 ChangeLog         | 2 +-
 bootstrap-salt.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b9f17b67..4417489de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Version 2014.xx.xx:
+Version 2014.10.28:
 	* Install the python systemd bindings for Arch and Fedora git installations
 	* Allow cloning from Salt's git repository using HTTPS. #475
 
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 7c3897156..6c746d5fc 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2014.10.21"
+__ScriptVersion="2014.10.28"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================

From 68329b80c86c731b46af740566daf2d7f8a2fd46 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 28 Oct 2014 02:04:53 +0000
Subject: [PATCH 004/135] If using the default git clone URL, also update it to
 use HTTPS if the flag is passed.

---
 bootstrap-salt.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 6c746d5fc..8d57ef9d5 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -300,7 +300,12 @@ do
          fi
          ;;
     g ) _SALT_REPO_URL=$OPTARG                          ;;
-    G ) _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git"
+    G ) if [ "${_SALT_REPO_URL}" = "${_SALTSTACK_REPO_URL}" ]; then
+            _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git"
+            _SALT_REPO_URL=${_SALTSTACK_REPO_URL}
+        else
+            _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git"
+        fi
          ;;
     k )  _TEMP_KEYS_DIR="$OPTARG"
          # If the configuration directory does not exist, error out

From 224ebd305c43ba0e449f3321df915cc792882d05 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 30 Oct 2014 01:16:07 +0000
Subject: [PATCH 005/135] Apply the forking patch to openSUSE git
 installations.

This is needed while SuSE/openSUSE doesn't ship the systemd python
bindings.

Closes saltstack/salt#16982
---
 bootstrap-salt.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 8d57ef9d5..d52a46991 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3979,6 +3979,12 @@ install_opensuse_git_deps() {
 
     __git_clone_and_checkout || return 1
 
+    if [ -f "${__SALT_GIT_CHECKOUT_DIR}/pkg/suse/use-forking-daemon.patch" ]; then
+        cd "${__SALT_GIT_CHECKOUT_DIR}"
+        echowarn "Applying patch to systemd service unit file"
+        patch -p1 < pkg/suse/use-forking-daemon.patch || return 1
+    fi
+
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
         _TEMP_CONFIG_DIR="${__SALT_GIT_CHECKOUT_DIR}/conf/"

From 96bb6d90f603b91f83159bc87c271a11e54ecd97 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 30 Oct 2014 01:21:20 +0000
Subject: [PATCH 006/135] Update changes log

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4417489de..7c709e453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2014.10.30:
+	* Apply the forking patch to openSUSE git installations.
+
 Version 2014.10.28:
 	* Install the python systemd bindings for Arch and Fedora git installations
 	* Allow cloning from Salt's git repository using HTTPS. #475

From 534cd6856dae18791d237f80fc4ed23b64c0877a Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 30 Oct 2014 01:21:58 +0000
Subject: [PATCH 007/135] Bump version for stable release

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d52a46991..c97324bbd 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2014.10.28"
+__ScriptVersion="2014.10.30"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================

From 08dfaab188e6b54ad9389e978f1bf0f7f8c979cc Mon Sep 17 00:00:00 2001
From: panticz <mail@konczalski.de>
Date: Mon, 27 Apr 2015 18:08:56 +0200
Subject: [PATCH 008/135] Fix Debian Squeeze backports mirror

http://http.debian.net/debian-backports is not available anymore
---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4a4313d67..989c42f3a 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2040,7 +2040,7 @@ _eof
 
     # Debian Backports
     if [ "$(grep -R 'squeeze-backports' /etc/apt | grep -v "^#")" = "" ]; then
-        echo "deb http://http.debian.net/debian-backports squeeze-backports main" >> \
+        echo "deb http://ftp.de.debian.org/debian-backports squeeze-backports main" >> \
             /etc/apt/sources.list.d/backports.list
     fi
 

From 3e2fee978a31fe06508146ffd3b500dfe3d62193 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 30 Apr 2015 11:58:21 +0100
Subject: [PATCH 009/135] Revert "Fix Debian Squeeze backports mirror"

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 989c42f3a..4a4313d67 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2040,7 +2040,7 @@ _eof
 
     # Debian Backports
     if [ "$(grep -R 'squeeze-backports' /etc/apt | grep -v "^#")" = "" ]; then
-        echo "deb http://ftp.de.debian.org/debian-backports squeeze-backports main" >> \
+        echo "deb http://http.debian.net/debian-backports squeeze-backports main" >> \
             /etc/apt/sources.list.d/backports.list
     fi
 

From 2b13563439332c2a5f6a0883b2e045ce93ecebb7 Mon Sep 17 00:00:00 2001
From: RuriRyan <ryan@btsoft.eu>
Date: Mon, 18 Apr 2016 20:44:50 +0200
Subject: [PATCH 010/135] Update epel-release version number (#809)

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b37ffaadc..057b1659b 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2901,7 +2901,7 @@ __install_epel_repository() {
     elif [ "$DISTRO_MAJOR_VERSION" -eq 6 ]; then
         rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/6/${EPEL_ARCH}/epel-release-6-8.noarch.rpm" || return 1
     elif [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
-        rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/7/${EPEL_ARCH}/e/epel-release-7-5.noarch.rpm" || return 1
+        rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/7/${EPEL_ARCH}/e/epel-release-7-6.noarch.rpm" || return 1
     else
         echoerror "Failed add EPEL repository support."
         return 1

From aa52ca51dd4b04ae700398d561640d0624ac38d5 Mon Sep 17 00:00:00 2001
From: pjcreath <pjcreath@users.noreply.github.com>
Date: Wed, 14 Mar 2018 16:25:19 -0400
Subject: [PATCH 011/135] bootstrap-salt.sh: fix for silently ignored version
 argument on CentOS/RHEL

This commit adds a warning when a pre-existing saltstack.repo
on CentOS/RHEL causes the version argument to be ignored.

It also allows the -F (forced overwrite) option to override
this situation, overwriting the saltstack.repo file, and
thus installing the specified version.

Resolves #1209.
---
 bootstrap-salt.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index f1e86bb44..2d1bc42b0 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3550,7 +3550,7 @@ __install_saltstack_rhel_repository() {
     gpg_key="SALTSTACK-GPG-KEY.pub"
     repo_file="/etc/yum.repos.d/saltstack.repo"
 
-    if [ ! -s "$repo_file" ]; then
+    if [ ! -s "$repo_file" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then
         cat <<_eof > "$repo_file"
 [saltstack]
 name=SaltStack ${repo_rev} Release Channel for RHEL/CentOS \$releasever
@@ -3564,6 +3564,9 @@ _eof
 
         fetch_url="${HTTP_VAL}://${_REPO_URL}/yum/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
         __rpm_import_gpg "${fetch_url}${gpg_key}" || return 1
+    elif [ "$repo_rev" != "latest" ]; then
+        echowarn "saltstack.repo already exists, ignoring salt version argument."
+        echowarn "Use -F (forced overwrite) to install $repo_rev."
     fi
 
     return 0

From f1df3ec949d9e4e8ed92db365badc4dc8024c2f0 Mon Sep 17 00:00:00 2001
From: pjcreath <pjcreath@users.noreply.github.com>
Date: Fri, 16 Mar 2018 20:10:23 -0400
Subject: [PATCH 012/135] Add 'yum clean metadata' after updating the
 saltstack.repo file as requested.

According to https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/deployment_guide/sec-working_with_yum_cache
this option "eliminates all files that yum uses to determine the remote
availability of packages."
---
 bootstrap-salt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2d1bc42b0..928013949 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3564,6 +3564,7 @@ _eof
 
         fetch_url="${HTTP_VAL}://${_REPO_URL}/yum/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
         __rpm_import_gpg "${fetch_url}${gpg_key}" || return 1
+        yum clean metadata || return 1
     elif [ "$repo_rev" != "latest" ]; then
         echowarn "saltstack.repo already exists, ignoring salt version argument."
         echowarn "Use -F (forced overwrite) to install $repo_rev."

From c252c74dc800b0b34fcbe0293eb3e608b9ee5a28 Mon Sep 17 00:00:00 2001
From: twangboy <slee@saltstack.com>
Date: Mon, 15 Apr 2019 10:18:16 -0600
Subject: [PATCH 013/135] Add tls support for version 1.2

---
 bootstrap-salt.ps1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 747c74d42..34c89845d 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -99,6 +99,9 @@ Param(
     [string]$repourl= "https://repo.saltstack.com/windows"
 )
 
+# Powershell supports only TLS 1.0 by default. Add support up to TLS 1.2
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'
+
 #===============================================================================
 # Script Functions
 #===============================================================================

From b5bed486d6e352bfe0971787039a6ea0b7072e9d Mon Sep 17 00:00:00 2001
From: Bryce Larson <blarson@saltstack.com>
Date: Tue, 23 Jun 2020 13:44:39 -0600
Subject: [PATCH 014/135] add sha256 files for release

---
 bootstrap-salt.ps1.sha256 | 1 +
 bootstrap-salt.sh.sha256  | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 bootstrap-salt.ps1.sha256
 create mode 100644 bootstrap-salt.sh.sha256

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
new file mode 100644
index 000000000..aea8adc93
--- /dev/null
+++ b/bootstrap-salt.ps1.sha256
@@ -0,0 +1 @@
+4be5028f29e36ae02b10a1d1a5af15af20db2fccc6000cb3d8c567d5ff5d1700
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
new file mode 100644
index 000000000..333113feb
--- /dev/null
+++ b/bootstrap-salt.sh.sha256
@@ -0,0 +1 @@
+1d07db867c195c864d0ae70664524f2099cc9a46872953293c67c3f239d4f4f5

From 7f3872a12643a19999e6173039a01f8801afb6cc Mon Sep 17 00:00:00 2001
From: SaltStack GH Automation <actions@github.com>
Date: Mon, 19 Oct 2020 12:02:10 +0000
Subject: [PATCH 015/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index aea8adc93..010e1cb43 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-4be5028f29e36ae02b10a1d1a5af15af20db2fccc6000cb3d8c567d5ff5d1700
+1819f33bc96b90762a4e955f05563c402fe03f139a8011a223172861d5158e59
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 333113feb..4674a0b8f 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-1d07db867c195c864d0ae70664524f2099cc9a46872953293c67c3f239d4f4f5
+f6c3e2c52f98d115809044b09062219369957caf30228b594033f0543e202c52

From defd13df5b67a7eb2ba3f2402efa2240933adf4e Mon Sep 17 00:00:00 2001
From: s0undt3ch <s0undt3ch@users.noreply.github.com>
Date: Wed, 21 Oct 2020 14:05:26 +0000
Subject: [PATCH 016/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 4674a0b8f..db9c747d2 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-f6c3e2c52f98d115809044b09062219369957caf30228b594033f0543e202c52
+b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2

From b8a6066350e1d5627162d086750a48efd2512d5e Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Mon, 7 Dec 2020 23:27:37 +0000
Subject: [PATCH 017/135] update tested oses

---
 .github/workflows/main.yml              | 2118 +++++++++++++++++------
 .github/workflows/templates/generate.py |   40 +-
 .kitchen.yml                            |   76 +-
 3 files changed, 1653 insertions(+), 581 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a0fefb41f..f3f7b379f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -458,8 +458,8 @@ jobs:
           bundle exec kitchen destroy py3-stable-3001-0-amazon-2
 
 
-  py3-git-master-amazon-2:
-    name: Amazon 2 Master Py3 Git
+  py3-stable-3002-amazon-2:
+    name: Amazon 2 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -492,20 +492,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-amazon-2 || bundle exec kitchen create py3-git-master-amazon-2
+          bundle exec kitchen create py3-stable-3002-amazon-2 || bundle exec kitchen create py3-stable-3002-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-amazon-2
+          bundle exec kitchen verify py3-stable-3002-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-amazon-2
+          bundle exec kitchen destroy py3-stable-3002-amazon-2
 
 
-  latest-amazon-2:
-    name: Amazon 2 Latest packaged release
+  py3-git-3002-amazon-2:
+    name: Amazon 2 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -538,20 +538,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-amazon-2 || bundle exec kitchen create latest-amazon-2
+          bundle exec kitchen create py3-git-3002-amazon-2 || bundle exec kitchen create py3-git-3002-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-amazon-2
+          bundle exec kitchen verify py3-git-3002-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-amazon-2
+          bundle exec kitchen destroy py3-git-3002-amazon-2
 
 
-  py2-git-2019-2-arch:
-    name: Arch v2019.2 Py2 Git
+  py3-stable-3002-0-amazon-2:
+    name: Amazon 2 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -584,20 +584,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-arch || bundle exec kitchen create py2-git-2019-2-arch
+          bundle exec kitchen create py3-stable-3002-0-amazon-2 || bundle exec kitchen create py3-stable-3002-0-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-arch
+          bundle exec kitchen verify py3-stable-3002-0-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-arch
+          bundle exec kitchen destroy py3-stable-3002-0-amazon-2
 
 
-  py3-git-3001-arch:
-    name: Arch v3001 Py3 Git
+  py3-git-master-amazon-2:
+    name: Amazon 2 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -630,20 +630,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-arch || bundle exec kitchen create py3-git-3001-arch
+          bundle exec kitchen create py3-git-master-amazon-2 || bundle exec kitchen create py3-git-master-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-arch
+          bundle exec kitchen verify py3-git-master-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-arch
+          bundle exec kitchen destroy py3-git-master-amazon-2
 
 
-  py3-git-master-arch:
-    name: Arch Master Py3 Git
+  latest-amazon-2:
+    name: Amazon 2 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -676,20 +676,66 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-arch || bundle exec kitchen create py3-git-master-arch
+          bundle exec kitchen create latest-amazon-2 || bundle exec kitchen create latest-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-arch
+          bundle exec kitchen verify latest-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-arch
+          bundle exec kitchen destroy latest-amazon-2
+
+
+  py2-git-2019-2-arch:
+    name: Arch v2019.2 Py2 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py2-git-2019-2-arch || bundle exec kitchen create py2-git-2019-2-arch
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py2-git-2019-2-arch
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py2-git-2019-2-arch
 
 
-  py2-stable-2019-2-centos-6:
-    name: CentOS 6 v2019.2 Py2 Stable
+  py3-git-3001-arch:
+    name: Arch v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -722,20 +768,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-centos-6 || bundle exec kitchen create py2-stable-2019-2-centos-6
+          bundle exec kitchen create py3-git-3001-arch || bundle exec kitchen create py3-git-3001-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-centos-6
+          bundle exec kitchen verify py3-git-3001-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-centos-6
+          bundle exec kitchen destroy py3-git-3001-arch
 
 
-  py2-git-2019-2-centos-6:
-    name: CentOS 6 v2019.2 Py2 Git
+  py3-git-3002-arch:
+    name: Arch v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -768,20 +814,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-centos-6 || bundle exec kitchen create py2-git-2019-2-centos-6
+          bundle exec kitchen create py3-git-3002-arch || bundle exec kitchen create py3-git-3002-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-centos-6
+          bundle exec kitchen verify py3-git-3002-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-centos-6
+          bundle exec kitchen destroy py3-git-3002-arch
 
 
-  latest-centos-6:
-    name: CentOS 6 Latest packaged release
+  py3-git-master-arch:
+    name: Arch Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -814,16 +860,16 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-6 || bundle exec kitchen create latest-centos-6
+          bundle exec kitchen create py3-git-master-arch || bundle exec kitchen create py3-git-master-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-6
+          bundle exec kitchen verify py3-git-master-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-6
+          bundle exec kitchen destroy py3-git-master-arch
 
 
   py2-stable-2019-2-centos-7:
@@ -1240,8 +1286,8 @@ jobs:
           bundle exec kitchen destroy py3-stable-3001-0-centos-7
 
 
-  py3-git-master-centos-7:
-    name: CentOS 7 Master Py3 Git
+  py3-stable-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1274,20 +1320,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
+          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-centos-7
+          bundle exec kitchen verify py3-stable-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-centos-7
+          bundle exec kitchen destroy py3-stable-3002-centos-7
 
 
-  latest-centos-7:
-    name: CentOS 7 Latest packaged release
+  py3-git-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1320,20 +1366,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
+          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-7
+          bundle exec kitchen verify py3-git-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-7
+          bundle exec kitchen destroy py3-git-3002-centos-7
 
 
-  py3-stable-2019-2-centos-8:
-    name: CentOS 8 v2019.2 Py3 Stable
+  py3-stable-3002-0-centos-7:
+    name: CentOS 7 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1366,20 +1412,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-centos-8 || bundle exec kitchen create py3-stable-2019-2-centos-8
+          bundle exec kitchen create py3-stable-3002-0-centos-7 || bundle exec kitchen create py3-stable-3002-0-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-centos-8
+          bundle exec kitchen verify py3-stable-3002-0-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-centos-8
+          bundle exec kitchen destroy py3-stable-3002-0-centos-7
 
 
-  py3-git-2019-2-centos-8:
-    name: CentOS 8 v2019.2 Py3 Git
+  py3-git-master-centos-7:
+    name: CentOS 7 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1412,20 +1458,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-centos-8 || bundle exec kitchen create py3-git-2019-2-centos-8
+          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-centos-8
+          bundle exec kitchen verify py3-git-master-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-centos-8
+          bundle exec kitchen destroy py3-git-master-centos-7
 
 
-  py3-stable-3000-centos-8:
-    name: CentOS 8 v3000 Py3 Stable
+  latest-centos-7:
+    name: CentOS 7 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1458,20 +1504,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8
+          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-centos-8
+          bundle exec kitchen verify latest-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-centos-8
+          bundle exec kitchen destroy latest-centos-7
 
 
-  py3-git-3000-centos-8:
-    name: CentOS 8 v3000 Py3 Git
+  py3-stable-2019-2-centos-8:
+    name: CentOS 8 v2019.2 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1504,20 +1550,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-centos-8 || bundle exec kitchen create py3-git-3000-centos-8
+          bundle exec kitchen create py3-stable-2019-2-centos-8 || bundle exec kitchen create py3-stable-2019-2-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-centos-8
+          bundle exec kitchen verify py3-stable-2019-2-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-centos-8
+          bundle exec kitchen destroy py3-stable-2019-2-centos-8
 
 
-  py3-stable-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Stable
+  py3-git-2019-2-centos-8:
+    name: CentOS 8 v2019.2 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1550,20 +1596,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-centos-8 || bundle exec kitchen create py3-stable-3001-centos-8
+          bundle exec kitchen create py3-git-2019-2-centos-8 || bundle exec kitchen create py3-git-2019-2-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-centos-8
+          bundle exec kitchen verify py3-git-2019-2-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-centos-8
+          bundle exec kitchen destroy py3-git-2019-2-centos-8
 
 
-  py3-git-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Git
+  py3-stable-3000-centos-8:
+    name: CentOS 8 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1596,20 +1642,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-centos-8 || bundle exec kitchen create py3-git-3001-centos-8
+          bundle exec kitchen create py3-stable-3000-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-centos-8
+          bundle exec kitchen verify py3-stable-3000-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-centos-8
+          bundle exec kitchen destroy py3-stable-3000-centos-8
 
 
-  py3-stable-3001-0-centos-8:
-    name: CentOS 8 v3001.0 Py3 Stable
+  py3-git-3000-centos-8:
+    name: CentOS 8 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1642,20 +1688,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-centos-8 || bundle exec kitchen create py3-stable-3001-0-centos-8
+          bundle exec kitchen create py3-git-3000-centos-8 || bundle exec kitchen create py3-git-3000-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-centos-8
+          bundle exec kitchen verify py3-git-3000-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-centos-8
+          bundle exec kitchen destroy py3-git-3000-centos-8
 
 
-  py3-git-master-centos-8:
-    name: CentOS 8 Master Py3 Git
+  py3-stable-3001-centos-8:
+    name: CentOS 8 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1688,20 +1734,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
+          bundle exec kitchen create py3-stable-3001-centos-8 || bundle exec kitchen create py3-stable-3001-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-centos-8
+          bundle exec kitchen verify py3-stable-3001-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-centos-8
+          bundle exec kitchen destroy py3-stable-3001-centos-8
 
 
-  latest-centos-8:
-    name: CentOS 8 Latest packaged release
+  py3-git-3001-centos-8:
+    name: CentOS 8 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1734,20 +1780,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
+          bundle exec kitchen create py3-git-3001-centos-8 || bundle exec kitchen create py3-git-3001-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-8
+          bundle exec kitchen verify py3-git-3001-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-8
+          bundle exec kitchen destroy py3-git-3001-centos-8
 
 
-  py3-stable-2019-2-debian-10:
-    name: Debian 10 v2019.2 Py3 Stable
+  py3-stable-3001-0-centos-8:
+    name: CentOS 8 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1780,20 +1826,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-debian-10 || bundle exec kitchen create py3-stable-2019-2-debian-10
+          bundle exec kitchen create py3-stable-3001-0-centos-8 || bundle exec kitchen create py3-stable-3001-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-debian-10
+          bundle exec kitchen verify py3-stable-3001-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-debian-10
+          bundle exec kitchen destroy py3-stable-3001-0-centos-8
 
 
-  py3-git-2019-2-debian-10:
-    name: Debian 10 v2019.2 Py3 Git
+  py3-stable-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1826,20 +1872,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-debian-10 || bundle exec kitchen create py3-git-2019-2-debian-10
+          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-debian-10
+          bundle exec kitchen verify py3-stable-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-debian-10
+          bundle exec kitchen destroy py3-stable-3002-centos-8
 
 
-  py3-stable-3000-debian-10:
-    name: Debian 10 v3000 Py3 Stable
+  py3-git-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1872,20 +1918,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10
+          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-debian-10
+          bundle exec kitchen verify py3-git-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-debian-10
+          bundle exec kitchen destroy py3-git-3002-centos-8
 
 
-  py3-git-3000-debian-10:
-    name: Debian 10 v3000 Py3 Git
+  py3-stable-3002-0-centos-8:
+    name: CentOS 8 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1918,20 +1964,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-debian-10 || bundle exec kitchen create py3-git-3000-debian-10
+          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-debian-10
+          bundle exec kitchen verify py3-stable-3002-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-debian-10
+          bundle exec kitchen destroy py3-stable-3002-0-centos-8
 
 
-  py3-stable-3001-debian-10:
-    name: Debian 10 v3001 Py3 Stable
+  py3-git-master-centos-8:
+    name: CentOS 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1964,20 +2010,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
+          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-debian-10
+          bundle exec kitchen verify py3-git-master-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-10
+          bundle exec kitchen destroy py3-git-master-centos-8
 
 
-  py3-git-3001-debian-10:
-    name: Debian 10 v3001 Py3 Git
+  latest-centos-8:
+    name: CentOS 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2010,20 +2056,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
+          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-debian-10
+          bundle exec kitchen verify latest-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-debian-10
+          bundle exec kitchen destroy latest-centos-8
 
 
-  py3-stable-3001-0-debian-10:
-    name: Debian 10 v3001.0 Py3 Stable
+  py3-stable-2019-2-debian-10:
+    name: Debian 10 v2019.2 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2056,20 +2102,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-10 || bundle exec kitchen create py3-stable-3001-0-debian-10
+          bundle exec kitchen create py3-stable-2019-2-debian-10 || bundle exec kitchen create py3-stable-2019-2-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-10
+          bundle exec kitchen verify py3-stable-2019-2-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-10
+          bundle exec kitchen destroy py3-stable-2019-2-debian-10
 
 
-  py3-git-master-debian-10:
-    name: Debian 10 Master Py3 Git
+  py3-git-2019-2-debian-10:
+    name: Debian 10 v2019.2 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2102,20 +2148,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
+          bundle exec kitchen create py3-git-2019-2-debian-10 || bundle exec kitchen create py3-git-2019-2-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-10
+          bundle exec kitchen verify py3-git-2019-2-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-10
+          bundle exec kitchen destroy py3-git-2019-2-debian-10
 
 
-  latest-debian-10:
-    name: Debian 10 Latest packaged release
+  py3-stable-3000-debian-10:
+    name: Debian 10 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2148,20 +2194,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
+          bundle exec kitchen create py3-stable-3000-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-10
+          bundle exec kitchen verify py3-stable-3000-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-10
+          bundle exec kitchen destroy py3-stable-3000-debian-10
 
 
-  py2-stable-2019-2-debian-8:
-    name: Debian 8 v2019.2 Py2 Stable
+  py3-git-3000-debian-10:
+    name: Debian 10 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2194,20 +2240,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-debian-8 || bundle exec kitchen create py2-stable-2019-2-debian-8
+          bundle exec kitchen create py3-git-3000-debian-10 || bundle exec kitchen create py3-git-3000-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-debian-8
+          bundle exec kitchen verify py3-git-3000-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-debian-8
+          bundle exec kitchen destroy py3-git-3000-debian-10
 
 
-  py2-git-2019-2-debian-8:
-    name: Debian 8 v2019.2 Py2 Git
+  py3-stable-3001-debian-10:
+    name: Debian 10 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2240,20 +2286,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-debian-8 || bundle exec kitchen create py2-git-2019-2-debian-8
+          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-debian-8
+          bundle exec kitchen verify py3-stable-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-debian-8
+          bundle exec kitchen destroy py3-stable-3001-debian-10
 
 
-  latest-debian-8:
-    name: Debian 8 Latest packaged release
+  py3-git-3001-debian-10:
+    name: Debian 10 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2286,20 +2332,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-8 || bundle exec kitchen create latest-debian-8
+          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-8
+          bundle exec kitchen verify py3-git-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-8
+          bundle exec kitchen destroy py3-git-3001-debian-10
 
 
-  py2-stable-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py2 Stable
+  py3-stable-3001-0-debian-10:
+    name: Debian 10 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2332,20 +2378,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-debian-9 || bundle exec kitchen create py2-stable-2019-2-debian-9
+          bundle exec kitchen create py3-stable-3001-0-debian-10 || bundle exec kitchen create py3-stable-3001-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-debian-9
+          bundle exec kitchen verify py3-stable-3001-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-debian-9
+          bundle exec kitchen destroy py3-stable-3001-0-debian-10
 
 
-  py2-git-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py2 Git
+  py3-stable-3002-debian-10:
+    name: Debian 10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2378,20 +2424,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-debian-9 || bundle exec kitchen create py2-git-2019-2-debian-9
+          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-debian-9
+          bundle exec kitchen verify py3-stable-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-debian-9
+          bundle exec kitchen destroy py3-stable-3002-debian-10
 
 
-  py3-stable-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py3 Stable
+  py3-git-3002-debian-10:
+    name: Debian 10 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2424,20 +2470,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-debian-9 || bundle exec kitchen create py3-stable-2019-2-debian-9
+          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-debian-9
+          bundle exec kitchen verify py3-git-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-debian-9
+          bundle exec kitchen destroy py3-git-3002-debian-10
 
 
-  py3-git-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py3 Git
+  py3-stable-3002-0-debian-10:
+    name: Debian 10 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2470,20 +2516,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-debian-9 || bundle exec kitchen create py3-git-2019-2-debian-9
+          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-debian-9
+          bundle exec kitchen verify py3-stable-3002-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-debian-9
+          bundle exec kitchen destroy py3-stable-3002-0-debian-10
 
 
-  py3-stable-3000-debian-9:
-    name: Debian 9 v3000 Py3 Stable
+  py3-git-master-debian-10:
+    name: Debian 10 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2516,20 +2562,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9
+          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-debian-9
+          bundle exec kitchen verify py3-git-master-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-debian-9
+          bundle exec kitchen destroy py3-git-master-debian-10
 
 
-  py3-git-3000-debian-9:
-    name: Debian 9 v3000 Py3 Git
+  latest-debian-10:
+    name: Debian 10 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2562,20 +2608,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-debian-9 || bundle exec kitchen create py3-git-3000-debian-9
+          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-debian-9
+          bundle exec kitchen verify latest-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-debian-9
+          bundle exec kitchen destroy latest-debian-10
 
 
-  py3-stable-3001-debian-9:
-    name: Debian 9 v3001 Py3 Stable
+  py2-stable-2019-2-debian-9:
+    name: Debian 9 v2019.2 Py2 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2608,20 +2654,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-debian-9 || bundle exec kitchen create py3-stable-3001-debian-9
+          bundle exec kitchen create py2-stable-2019-2-debian-9 || bundle exec kitchen create py2-stable-2019-2-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-debian-9
+          bundle exec kitchen verify py2-stable-2019-2-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-9
+          bundle exec kitchen destroy py2-stable-2019-2-debian-9
 
 
-  py3-git-3001-debian-9:
-    name: Debian 9 v3001 Py3 Git
+  py2-git-2019-2-debian-9:
+    name: Debian 9 v2019.2 Py2 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2654,20 +2700,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-debian-9 || bundle exec kitchen create py3-git-3001-debian-9
+          bundle exec kitchen create py2-git-2019-2-debian-9 || bundle exec kitchen create py2-git-2019-2-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-debian-9
+          bundle exec kitchen verify py2-git-2019-2-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-debian-9
+          bundle exec kitchen destroy py2-git-2019-2-debian-9
 
 
-  py3-stable-3001-0-debian-9:
-    name: Debian 9 v3001.0 Py3 Stable
+  py3-stable-2019-2-debian-9:
+    name: Debian 9 v2019.2 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2700,20 +2746,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-9 || bundle exec kitchen create py3-stable-3001-0-debian-9
+          bundle exec kitchen create py3-stable-2019-2-debian-9 || bundle exec kitchen create py3-stable-2019-2-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-9
+          bundle exec kitchen verify py3-stable-2019-2-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-9
+          bundle exec kitchen destroy py3-stable-2019-2-debian-9
 
 
-  py3-git-master-debian-9:
-    name: Debian 9 Master Py3 Git
+  py3-git-2019-2-debian-9:
+    name: Debian 9 v2019.2 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2746,20 +2792,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
+          bundle exec kitchen create py3-git-2019-2-debian-9 || bundle exec kitchen create py3-git-2019-2-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-9
+          bundle exec kitchen verify py3-git-2019-2-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-9
+          bundle exec kitchen destroy py3-git-2019-2-debian-9
 
 
-  latest-debian-9:
-    name: Debian 9 Latest packaged release
+  py3-stable-3000-debian-9:
+    name: Debian 9 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2792,20 +2838,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
+          bundle exec kitchen create py3-stable-3000-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-9
+          bundle exec kitchen verify py3-stable-3000-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-9
+          bundle exec kitchen destroy py3-stable-3000-debian-9
 
 
-  py3-git-2019-2-fedora-30:
-    name: Fedora 30 v2019.2 Py3 Git
+  py3-git-3000-debian-9:
+    name: Debian 9 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2838,20 +2884,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-fedora-30 || bundle exec kitchen create py3-git-2019-2-fedora-30
+          bundle exec kitchen create py3-git-3000-debian-9 || bundle exec kitchen create py3-git-3000-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-fedora-30
+          bundle exec kitchen verify py3-git-3000-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-fedora-30
+          bundle exec kitchen destroy py3-git-3000-debian-9
 
 
-  latest-fedora-30:
-    name: Fedora 30 Latest packaged release
+  py3-stable-3001-debian-9:
+    name: Debian 9 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2884,20 +2930,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-30 || bundle exec kitchen create latest-fedora-30
+          bundle exec kitchen create py3-stable-3001-debian-9 || bundle exec kitchen create py3-stable-3001-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-30
+          bundle exec kitchen verify py3-stable-3001-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-30
+          bundle exec kitchen destroy py3-stable-3001-debian-9
 
 
-  py3-git-2019-2-fedora-31:
-    name: Fedora 31 v2019.2 Py3 Git
+  py3-git-3001-debian-9:
+    name: Debian 9 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2930,20 +2976,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-fedora-31 || bundle exec kitchen create py3-git-2019-2-fedora-31
+          bundle exec kitchen create py3-git-3001-debian-9 || bundle exec kitchen create py3-git-3001-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-fedora-31
+          bundle exec kitchen verify py3-git-3001-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-fedora-31
+          bundle exec kitchen destroy py3-git-3001-debian-9
 
 
-  py3-git-3000-fedora-31:
-    name: Fedora 31 v3000 Py3 Git
+  py3-stable-3001-0-debian-9:
+    name: Debian 9 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2976,20 +3022,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-fedora-31 || bundle exec kitchen create py3-git-3000-fedora-31
+          bundle exec kitchen create py3-stable-3001-0-debian-9 || bundle exec kitchen create py3-stable-3001-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-fedora-31
+          bundle exec kitchen verify py3-stable-3001-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-fedora-31
+          bundle exec kitchen destroy py3-stable-3001-0-debian-9
 
 
-  py3-git-3001-fedora-31:
-    name: Fedora 31 v3001 Py3 Git
+  py3-stable-3002-debian-9:
+    name: Debian 9 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3022,20 +3068,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-31 || bundle exec kitchen create py3-git-3001-fedora-31
+          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-31
+          bundle exec kitchen verify py3-stable-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-31
+          bundle exec kitchen destroy py3-stable-3002-debian-9
 
 
-  py3-git-master-fedora-31:
-    name: Fedora 31 Master Py3 Git
+  py3-git-3002-debian-9:
+    name: Debian 9 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3068,20 +3114,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-31 || bundle exec kitchen create py3-git-master-fedora-31
+          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-31
+          bundle exec kitchen verify py3-git-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-31
+          bundle exec kitchen destroy py3-git-3002-debian-9
 
 
-  latest-fedora-31:
-    name: Fedora 31 Latest packaged release
+  py3-stable-3002-0-debian-9:
+    name: Debian 9 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3114,20 +3160,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-31 || bundle exec kitchen create latest-fedora-31
+          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-31
+          bundle exec kitchen verify py3-stable-3002-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-31
+          bundle exec kitchen destroy py3-stable-3002-0-debian-9
 
 
-  py3-git-3001-fedora-32:
-    name: Fedora 32 v3001 Py3 Git
+  py3-git-master-debian-9:
+    name: Debian 9 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3160,20 +3206,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-32 || bundle exec kitchen create py3-git-3001-fedora-32
+          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-32
+          bundle exec kitchen verify py3-git-master-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-32
+          bundle exec kitchen destroy py3-git-master-debian-9
 
 
-  py3-git-master-fedora-32:
-    name: Fedora 32 Master Py3 Git
+  latest-debian-9:
+    name: Debian 9 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3206,20 +3252,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-32 || bundle exec kitchen create py3-git-master-fedora-32
+          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-32
+          bundle exec kitchen verify latest-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-32
+          bundle exec kitchen destroy latest-debian-9
 
 
-  latest-fedora-32:
-    name: Fedora 32 Latest packaged release
+  py3-git-3001-fedora-32:
+    name: Fedora 32 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3252,22 +3298,22 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-32 || bundle exec kitchen create latest-fedora-32
+          bundle exec kitchen create py3-git-3001-fedora-32 || bundle exec kitchen create py3-git-3001-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-32
+          bundle exec kitchen verify py3-git-3001-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-32
+          bundle exec kitchen destroy py3-git-3001-fedora-32
 
 
-  py3-stable-2019-2-gentoo:
-    name: Gentoo v2019.2 Py3 Stable
+  py3-git-3002-fedora-32:
+    name: Fedora 32 v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 20
 
     needs: lint
 
@@ -3298,22 +3344,22 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-gentoo || bundle exec kitchen create py3-stable-2019-2-gentoo
+          bundle exec kitchen create py3-git-3002-fedora-32 || bundle exec kitchen create py3-git-3002-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-gentoo
+          bundle exec kitchen verify py3-git-3002-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-gentoo
+          bundle exec kitchen destroy py3-git-3002-fedora-32
 
 
-  py3-git-2019-2-gentoo:
-    name: Gentoo v2019.2 Py3 Git
+  py3-git-master-fedora-32:
+    name: Fedora 32 Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 20
 
     needs: lint
 
@@ -3344,22 +3390,22 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-gentoo || bundle exec kitchen create py3-git-2019-2-gentoo
+          bundle exec kitchen create py3-git-master-fedora-32 || bundle exec kitchen create py3-git-master-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-gentoo
+          bundle exec kitchen verify py3-git-master-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-gentoo
+          bundle exec kitchen destroy py3-git-master-fedora-32
 
 
-  py3-stable-3000-gentoo:
-    name: Gentoo v3000 Py3 Stable
+  latest-fedora-32:
+    name: Fedora 32 Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 20
 
     needs: lint
 
@@ -3390,22 +3436,22 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-gentoo || bundle exec kitchen create py3-stable-3000-gentoo
+          bundle exec kitchen create latest-fedora-32 || bundle exec kitchen create latest-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-gentoo
+          bundle exec kitchen verify latest-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-gentoo
+          bundle exec kitchen destroy latest-fedora-32
 
 
-  py3-git-3000-gentoo:
-    name: Gentoo v3000 Py3 Git
+  py3-git-3001-fedora-33:
+    name: Fedora 33 v3001 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 20
 
     needs: lint
 
@@ -3436,22 +3482,22 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-gentoo || bundle exec kitchen create py3-git-3000-gentoo
+          bundle exec kitchen create py3-git-3001-fedora-33 || bundle exec kitchen create py3-git-3001-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-gentoo
+          bundle exec kitchen verify py3-git-3001-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-gentoo
+          bundle exec kitchen destroy py3-git-3001-fedora-33
 
 
-  py3-stable-3001-gentoo:
-    name: Gentoo v3001 Py3 Stable
+  py3-git-3002-fedora-33:
+    name: Fedora 33 v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 20
 
     needs: lint
 
@@ -3482,22 +3528,22 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-gentoo || bundle exec kitchen create py3-stable-3001-gentoo
+          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-gentoo
+          bundle exec kitchen verify py3-git-3002-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-gentoo
+          bundle exec kitchen destroy py3-git-3002-fedora-33
 
 
-  py3-git-3001-gentoo:
-    name: Gentoo v3001 Py3 Git
+  py3-git-master-fedora-33:
+    name: Fedora 33 Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 20
 
     needs: lint
 
@@ -3528,22 +3574,22 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-gentoo || bundle exec kitchen create py3-git-3001-gentoo
+          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-gentoo
+          bundle exec kitchen verify py3-git-master-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-gentoo
+          bundle exec kitchen destroy py3-git-master-fedora-33
 
 
-  py3-stable-3001-0-gentoo:
-    name: Gentoo v3001.0 Py3 Stable
+  latest-fedora-33:
+    name: Fedora 33 Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 20
 
     needs: lint
 
@@ -3574,20 +3620,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-gentoo || bundle exec kitchen create py3-stable-3001-0-gentoo
+          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-gentoo
+          bundle exec kitchen verify latest-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-gentoo
+          bundle exec kitchen destroy latest-fedora-33
 
 
-  py3-git-master-gentoo:
-    name: Gentoo Master Py3 Git
+  py3-stable-2019-2-gentoo:
+    name: Gentoo v2019.2 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3620,20 +3666,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-gentoo || bundle exec kitchen create py3-git-master-gentoo
+          bundle exec kitchen create py3-stable-2019-2-gentoo || bundle exec kitchen create py3-stable-2019-2-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-gentoo
+          bundle exec kitchen verify py3-stable-2019-2-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-gentoo
+          bundle exec kitchen destroy py3-stable-2019-2-gentoo
 
 
-  latest-gentoo:
-    name: Gentoo Latest packaged release
+  py3-git-2019-2-gentoo:
+    name: Gentoo v2019.2 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3666,20 +3712,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-gentoo || bundle exec kitchen create latest-gentoo
+          bundle exec kitchen create py3-git-2019-2-gentoo || bundle exec kitchen create py3-git-2019-2-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-gentoo
+          bundle exec kitchen verify py3-git-2019-2-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-gentoo
+          bundle exec kitchen destroy py3-git-2019-2-gentoo
 
 
-  py3-stable-2019-2-gentoo-systemd:
-    name: Gentoo (systemd) v2019.2 Py3 Stable
+  py3-stable-3000-gentoo:
+    name: Gentoo v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3712,20 +3758,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-gentoo-systemd || bundle exec kitchen create py3-stable-2019-2-gentoo-systemd
+          bundle exec kitchen create py3-stable-3000-gentoo || bundle exec kitchen create py3-stable-3000-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-gentoo-systemd
+          bundle exec kitchen verify py3-stable-3000-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-gentoo-systemd
+          bundle exec kitchen destroy py3-stable-3000-gentoo
 
 
-  py3-git-2019-2-gentoo-systemd:
-    name: Gentoo (systemd) v2019.2 Py3 Git
+  py3-git-3000-gentoo:
+    name: Gentoo v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3758,20 +3804,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-gentoo-systemd || bundle exec kitchen create py3-git-2019-2-gentoo-systemd
+          bundle exec kitchen create py3-git-3000-gentoo || bundle exec kitchen create py3-git-3000-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-gentoo-systemd
+          bundle exec kitchen verify py3-git-3000-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-gentoo-systemd
+          bundle exec kitchen destroy py3-git-3000-gentoo
 
 
-  py3-stable-3000-gentoo-systemd:
-    name: Gentoo (systemd) v3000 Py3 Stable
+  py3-stable-3001-gentoo:
+    name: Gentoo v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3804,20 +3850,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-gentoo-systemd || bundle exec kitchen create py3-stable-3000-gentoo-systemd
+          bundle exec kitchen create py3-stable-3001-gentoo || bundle exec kitchen create py3-stable-3001-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-gentoo-systemd
+          bundle exec kitchen verify py3-stable-3001-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-gentoo-systemd
+          bundle exec kitchen destroy py3-stable-3001-gentoo
 
 
-  py3-git-3000-gentoo-systemd:
-    name: Gentoo (systemd) v3000 Py3 Git
+  py3-git-3001-gentoo:
+    name: Gentoo v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3850,20 +3896,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-gentoo-systemd || bundle exec kitchen create py3-git-3000-gentoo-systemd
+          bundle exec kitchen create py3-git-3001-gentoo || bundle exec kitchen create py3-git-3001-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-gentoo-systemd
+          bundle exec kitchen verify py3-git-3001-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-gentoo-systemd
+          bundle exec kitchen destroy py3-git-3001-gentoo
 
 
-  py3-stable-3001-gentoo-systemd:
-    name: Gentoo (systemd) v3001 Py3 Stable
+  py3-stable-3001-0-gentoo:
+    name: Gentoo v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3896,20 +3942,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-gentoo-systemd || bundle exec kitchen create py3-stable-3001-gentoo-systemd
+          bundle exec kitchen create py3-stable-3001-0-gentoo || bundle exec kitchen create py3-stable-3001-0-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-gentoo-systemd
+          bundle exec kitchen verify py3-stable-3001-0-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-gentoo-systemd
+          bundle exec kitchen destroy py3-stable-3001-0-gentoo
 
 
-  py3-git-3001-gentoo-systemd:
-    name: Gentoo (systemd) v3001 Py3 Git
+  py3-stable-3002-gentoo:
+    name: Gentoo v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3942,20 +3988,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-gentoo-systemd || bundle exec kitchen create py3-git-3001-gentoo-systemd
+          bundle exec kitchen create py3-stable-3002-gentoo || bundle exec kitchen create py3-stable-3002-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-gentoo-systemd
+          bundle exec kitchen verify py3-stable-3002-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-gentoo-systemd
+          bundle exec kitchen destroy py3-stable-3002-gentoo
 
 
-  py3-stable-3001-0-gentoo-systemd:
-    name: Gentoo (systemd) v3001.0 Py3 Stable
+  py3-git-3002-gentoo:
+    name: Gentoo v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -3988,20 +4034,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-gentoo-systemd || bundle exec kitchen create py3-stable-3001-0-gentoo-systemd
+          bundle exec kitchen create py3-git-3002-gentoo || bundle exec kitchen create py3-git-3002-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-gentoo-systemd
+          bundle exec kitchen verify py3-git-3002-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-gentoo-systemd
+          bundle exec kitchen destroy py3-git-3002-gentoo
 
 
-  py3-git-master-gentoo-systemd:
-    name: Gentoo (systemd) Master Py3 Git
+  py3-stable-3002-0-gentoo:
+    name: Gentoo v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -4034,20 +4080,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-gentoo-systemd || bundle exec kitchen create py3-git-master-gentoo-systemd
+          bundle exec kitchen create py3-stable-3002-0-gentoo || bundle exec kitchen create py3-stable-3002-0-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-gentoo-systemd
+          bundle exec kitchen verify py3-stable-3002-0-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-gentoo-systemd
+          bundle exec kitchen destroy py3-stable-3002-0-gentoo
 
 
-  latest-gentoo-systemd:
-    name: Gentoo (systemd) Latest packaged release
+  py3-git-master-gentoo:
+    name: Gentoo Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 50
 
@@ -4080,20 +4126,1078 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-gentoo-systemd || bundle exec kitchen create latest-gentoo-systemd
+          bundle exec kitchen create py3-git-master-gentoo || bundle exec kitchen create py3-git-master-gentoo
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-gentoo-systemd
+          bundle exec kitchen verify py3-git-master-gentoo
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-gentoo-systemd
+          bundle exec kitchen destroy py3-git-master-gentoo
+
+
+  latest-gentoo:
+    name: Gentoo Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-gentoo || bundle exec kitchen create latest-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-gentoo
+
+
+  py3-stable-2019-2-gentoo-systemd:
+    name: Gentoo (systemd) v2019.2 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-2019-2-gentoo-systemd || bundle exec kitchen create py3-stable-2019-2-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-2019-2-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-2019-2-gentoo-systemd
+
+
+  py3-git-2019-2-gentoo-systemd:
+    name: Gentoo (systemd) v2019.2 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-2019-2-gentoo-systemd || bundle exec kitchen create py3-git-2019-2-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-2019-2-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-2019-2-gentoo-systemd
+
+
+  py3-stable-3000-gentoo-systemd:
+    name: Gentoo (systemd) v3000 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3000-gentoo-systemd || bundle exec kitchen create py3-stable-3000-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3000-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3000-gentoo-systemd
+
+
+  py3-git-3000-gentoo-systemd:
+    name: Gentoo (systemd) v3000 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3000-gentoo-systemd || bundle exec kitchen create py3-git-3000-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3000-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3000-gentoo-systemd
+
+
+  py3-stable-3001-gentoo-systemd:
+    name: Gentoo (systemd) v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-gentoo-systemd || bundle exec kitchen create py3-stable-3001-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-gentoo-systemd
+
+
+  py3-git-3001-gentoo-systemd:
+    name: Gentoo (systemd) v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-gentoo-systemd || bundle exec kitchen create py3-git-3001-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-gentoo-systemd
+
+
+  py3-stable-3001-0-gentoo-systemd:
+    name: Gentoo (systemd) v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-gentoo-systemd || bundle exec kitchen create py3-stable-3001-0-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-gentoo-systemd
+
+
+  py3-stable-3002-gentoo-systemd:
+    name: Gentoo (systemd) v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-gentoo-systemd || bundle exec kitchen create py3-stable-3002-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-gentoo-systemd
+
+
+  py3-git-3002-gentoo-systemd:
+    name: Gentoo (systemd) v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-gentoo-systemd || bundle exec kitchen create py3-git-3002-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-gentoo-systemd
+
+
+  py3-stable-3002-0-gentoo-systemd:
+    name: Gentoo (systemd) v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-gentoo-systemd || bundle exec kitchen create py3-stable-3002-0-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-gentoo-systemd
+
+
+  py3-git-master-gentoo-systemd:
+    name: Gentoo (systemd) Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-gentoo-systemd || bundle exec kitchen create py3-git-master-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-gentoo-systemd
+
+
+  latest-gentoo-systemd:
+    name: Gentoo (systemd) Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-gentoo-systemd || bundle exec kitchen create latest-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-gentoo-systemd
+
+
+  py3-git-2019-2-opensuse-15:
+    name: Opensuse 15 v2019.2 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-2019-2-opensuse-15 || bundle exec kitchen create py3-git-2019-2-opensuse-15
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-2019-2-opensuse-15
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-2019-2-opensuse-15
+
+
+  py3-git-3000-opensuse-15:
+    name: Opensuse 15 v3000 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3000-opensuse-15 || bundle exec kitchen create py3-git-3000-opensuse-15
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3000-opensuse-15
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3000-opensuse-15
+
+
+  py3-git-3001-opensuse-15:
+    name: Opensuse 15 v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-opensuse-15 || bundle exec kitchen create py3-git-3001-opensuse-15
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-opensuse-15
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-opensuse-15
+
+
+  py3-git-3002-opensuse-15:
+    name: Opensuse 15 v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-opensuse-15
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-opensuse-15
+
+
+  py3-git-master-opensuse-15:
+    name: Opensuse 15 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-opensuse-15
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-opensuse-15
+
+
+  latest-opensuse-15:
+    name: Opensuse 15 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-opensuse-15
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-opensuse-15
+
+
+  py2-stable-2019-2-ubuntu-1604:
+    name: Ubuntu 16.04 v2019.2 Py2 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py2-stable-2019-2-ubuntu-1604 || bundle exec kitchen create py2-stable-2019-2-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py2-stable-2019-2-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py2-stable-2019-2-ubuntu-1604
+
+
+  py2-git-2019-2-ubuntu-1604:
+    name: Ubuntu 16.04 v2019.2 Py2 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py2-git-2019-2-ubuntu-1604 || bundle exec kitchen create py2-git-2019-2-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py2-git-2019-2-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py2-git-2019-2-ubuntu-1604
+
+
+  py3-stable-2019-2-ubuntu-1604:
+    name: Ubuntu 16.04 v2019.2 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-2019-2-ubuntu-1604 || bundle exec kitchen create py3-stable-2019-2-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-2019-2-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-2019-2-ubuntu-1604
+
+
+  py3-git-2019-2-ubuntu-1604:
+    name: Ubuntu 16.04 v2019.2 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-2019-2-ubuntu-1604 || bundle exec kitchen create py3-git-2019-2-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-2019-2-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-2019-2-ubuntu-1604
 
 
-  py3-git-2019-2-opensuse-15:
-    name: Opensuse 15 v2019.2 Py3 Git
+  py3-stable-3000-ubuntu-1604:
+    name: Ubuntu 16.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4126,20 +5230,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-opensuse-15 || bundle exec kitchen create py3-git-2019-2-opensuse-15
+          bundle exec kitchen create py3-stable-3000-ubuntu-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-opensuse-15
+          bundle exec kitchen verify py3-stable-3000-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-opensuse-15
+          bundle exec kitchen destroy py3-stable-3000-ubuntu-1604
 
 
-  py3-git-3000-opensuse-15:
-    name: Opensuse 15 v3000 Py3 Git
+  py3-git-3000-ubuntu-1604:
+    name: Ubuntu 16.04 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4172,20 +5276,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-opensuse-15 || bundle exec kitchen create py3-git-3000-opensuse-15
+          bundle exec kitchen create py3-git-3000-ubuntu-1604 || bundle exec kitchen create py3-git-3000-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-opensuse-15
+          bundle exec kitchen verify py3-git-3000-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-opensuse-15
+          bundle exec kitchen destroy py3-git-3000-ubuntu-1604
 
 
-  py3-git-3001-opensuse-15:
-    name: Opensuse 15 v3001 Py3 Git
+  py3-stable-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4218,20 +5322,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-opensuse-15 || bundle exec kitchen create py3-git-3001-opensuse-15
+          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-opensuse-15
+          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-opensuse-15
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
 
 
-  py3-git-master-opensuse-15:
-    name: Opensuse 15 Master Py3 Git
+  py3-git-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4264,20 +5368,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
+          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-opensuse-15
+          bundle exec kitchen verify py3-git-3001-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-15
+          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
 
 
-  latest-opensuse-15:
-    name: Opensuse 15 Latest packaged release
+  py3-stable-3001-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4310,20 +5414,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-opensuse-15
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-opensuse-15
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
 
 
-  py2-stable-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py2 Stable
+  py3-stable-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4356,20 +5460,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-ubuntu-1604 || bundle exec kitchen create py2-stable-2019-2-ubuntu-1604
+          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
 
 
-  py2-git-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py2 Git
+  py3-git-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4402,20 +5506,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-ubuntu-1604 || bundle exec kitchen create py2-git-2019-2-ubuntu-1604
+          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-ubuntu-1604
+          bundle exec kitchen verify py3-git-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
 
 
-  py3-stable-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py3 Stable
+  py3-stable-3002-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4448,20 +5552,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-ubuntu-1604 || bundle exec kitchen create py3-stable-2019-2-ubuntu-1604
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
 
 
-  py3-git-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py3 Git
+  py3-git-master-ubuntu-1604:
+    name: Ubuntu 16.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4494,20 +5598,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-ubuntu-1604 || bundle exec kitchen create py3-git-2019-2-ubuntu-1604
+          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-ubuntu-1604
+          bundle exec kitchen verify py3-git-master-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-ubuntu-1604
+          bundle exec kitchen destroy py3-git-master-ubuntu-1604
 
 
-  py3-stable-3000-ubuntu-1604:
-    name: Ubuntu 16.04 v3000 Py3 Stable
+  latest-ubuntu-1604:
+    name: Ubuntu 16.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4540,20 +5644,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-ubuntu-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604
+          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-ubuntu-1604
+          bundle exec kitchen verify latest-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-ubuntu-1604
+          bundle exec kitchen destroy latest-ubuntu-1604
 
 
-  py3-git-3000-ubuntu-1604:
-    name: Ubuntu 16.04 v3000 Py3 Git
+  py2-stable-2019-2-ubuntu-1804:
+    name: Ubuntu 18.04 v2019.2 Py2 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4586,20 +5690,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-ubuntu-1604 || bundle exec kitchen create py3-git-3000-ubuntu-1604
+          bundle exec kitchen create py2-stable-2019-2-ubuntu-1804 || bundle exec kitchen create py2-stable-2019-2-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-ubuntu-1604
+          bundle exec kitchen verify py2-stable-2019-2-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-ubuntu-1604
+          bundle exec kitchen destroy py2-stable-2019-2-ubuntu-1804
 
 
-  py3-stable-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Stable
+  py2-git-2019-2-ubuntu-1804:
+    name: Ubuntu 18.04 v2019.2 Py2 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4632,20 +5736,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
+          bundle exec kitchen create py2-git-2019-2-ubuntu-1804 || bundle exec kitchen create py2-git-2019-2-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
+          bundle exec kitchen verify py2-git-2019-2-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
+          bundle exec kitchen destroy py2-git-2019-2-ubuntu-1804
 
 
-  py3-git-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Git
+  py3-stable-2019-2-ubuntu-1804:
+    name: Ubuntu 18.04 v2019.2 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4678,20 +5782,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
+          bundle exec kitchen create py3-stable-2019-2-ubuntu-1804 || bundle exec kitchen create py3-stable-2019-2-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-1604
+          bundle exec kitchen verify py3-stable-2019-2-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-2019-2-ubuntu-1804
 
 
-  py3-stable-3001-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3001.0 Py3 Stable
+  py3-git-2019-2-ubuntu-1804:
+    name: Ubuntu 18.04 v2019.2 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4724,20 +5828,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen create py3-git-2019-2-ubuntu-1804 || bundle exec kitchen create py3-git-2019-2-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen verify py3-git-2019-2-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen destroy py3-git-2019-2-ubuntu-1804
 
 
-  py3-git-master-ubuntu-1604:
-    name: Ubuntu 16.04 Master Py3 Git
+  py3-stable-3000-ubuntu-1804:
+    name: Ubuntu 18.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4770,20 +5874,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
+          bundle exec kitchen create py3-stable-3000-ubuntu-1804 || bundle exec kitchen create py3-stable-3000-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3000-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3000-ubuntu-1804
 
 
-  latest-ubuntu-1604:
-    name: Ubuntu 16.04 Latest packaged release
+  py3-git-3000-ubuntu-1804:
+    name: Ubuntu 18.04 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4816,20 +5920,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
+          bundle exec kitchen create py3-git-3000-ubuntu-1804 || bundle exec kitchen create py3-git-3000-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1604
+          bundle exec kitchen verify py3-git-3000-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3000-ubuntu-1804
 
 
-  py2-stable-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py2 Stable
+  py3-stable-3001-ubuntu-1804:
+    name: Ubuntu 18.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4862,20 +5966,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-ubuntu-1804 || bundle exec kitchen create py2-stable-2019-2-ubuntu-1804
+          bundle exec kitchen create py3-stable-3001-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3001-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-1804
 
 
-  py2-git-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py2 Git
+  py3-git-3001-ubuntu-1804:
+    name: Ubuntu 18.04 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4908,20 +6012,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-ubuntu-1804 || bundle exec kitchen create py2-git-2019-2-ubuntu-1804
+          bundle exec kitchen create py3-git-3001-ubuntu-1804 || bundle exec kitchen create py3-git-3001-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-ubuntu-1804
+          bundle exec kitchen verify py3-git-3001-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3001-ubuntu-1804
 
 
-  py3-stable-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py3 Stable
+  py3-stable-3001-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4954,20 +6058,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-ubuntu-1804 || bundle exec kitchen create py3-stable-2019-2-ubuntu-1804
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1804
 
 
-  py3-git-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py3 Git
+  py3-stable-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5000,20 +6104,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-ubuntu-1804 || bundle exec kitchen create py3-git-2019-2-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
 
 
-  py3-stable-3000-ubuntu-1804:
-    name: Ubuntu 18.04 v3000 Py3 Stable
+  py3-git-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5046,20 +6150,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-ubuntu-1804 || bundle exec kitchen create py3-stable-3000-ubuntu-1804
+          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-ubuntu-1804
+          bundle exec kitchen verify py3-git-3002-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
 
 
-  py3-git-3000-ubuntu-1804:
-    name: Ubuntu 18.04 v3000 Py3 Git
+  py3-stable-3002-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5092,20 +6196,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-ubuntu-1804 || bundle exec kitchen create py3-git-3000-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804
 
 
-  py3-stable-3001-ubuntu-1804:
-    name: Ubuntu 18.04 v3001 Py3 Stable
+  py3-git-master-ubuntu-1804:
+    name: Ubuntu 18.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5138,20 +6242,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-ubuntu-1804
+          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-1804
+          bundle exec kitchen verify py3-git-master-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-1804
+          bundle exec kitchen destroy py3-git-master-ubuntu-1804
 
 
-  py3-git-3001-ubuntu-1804:
-    name: Ubuntu 18.04 v3001 Py3 Git
+  latest-ubuntu-1804:
+    name: Ubuntu 18.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5184,20 +6288,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-1804 || bundle exec kitchen create py3-git-3001-ubuntu-1804
+          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-1804
+          bundle exec kitchen verify latest-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-1804
+          bundle exec kitchen destroy latest-ubuntu-1804
 
 
-  py3-stable-3001-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3001.0 Py3 Stable
+  py3-stable-3001-ubuntu-2004:
+    name: Ubuntu 20.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5230,20 +6334,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen create py3-stable-3001-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3001-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-2004
 
 
-  py3-git-master-ubuntu-1804:
-    name: Ubuntu 18.04 Master Py3 Git
+  py3-git-3001-ubuntu-2004:
+    name: Ubuntu 20.04 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5276,20 +6380,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
+          bundle exec kitchen create py3-git-3001-ubuntu-2004 || bundle exec kitchen create py3-git-3001-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1804
+          bundle exec kitchen verify py3-git-3001-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3001-ubuntu-2004
 
 
-  latest-ubuntu-1804:
-    name: Ubuntu 18.04 Latest packaged release
+  py3-stable-3001-0-ubuntu-2004:
+    name: Ubuntu 20.04 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5322,20 +6426,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-0-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-2004
 
 
-  py3-stable-3001-ubuntu-2004:
-    name: Ubuntu 20.04 v3001 Py3 Stable
+  py3-stable-3002-ubuntu-2004:
+    name: Ubuntu 20.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5368,20 +6472,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-ubuntu-2004
+          bundle exec kitchen create py3-stable-3002-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2004
 
 
-  py3-git-3001-ubuntu-2004:
-    name: Ubuntu 20.04 v3001 Py3 Git
+  py3-git-3002-ubuntu-2004:
+    name: Ubuntu 20.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5414,20 +6518,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-2004 || bundle exec kitchen create py3-git-3001-ubuntu-2004
+          bundle exec kitchen create py3-git-3002-ubuntu-2004 || bundle exec kitchen create py3-git-3002-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-2004
+          bundle exec kitchen verify py3-git-3002-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-2004
+          bundle exec kitchen destroy py3-git-3002-ubuntu-2004
 
 
-  py3-stable-3001-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3001.0 Py3 Stable
+  py3-stable-3002-0-ubuntu-2004:
+    name: Ubuntu 20.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5460,16 +6564,16 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-0-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-2004
 
 
   py3-git-master-ubuntu-2004:
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 422dbb3ff..695ff3b3c 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -9,15 +9,12 @@
 #    'amazon-1',
     'amazon-2',
     'arch',
-    'centos-6',
     'centos-7',
     'centos-8',
     'debian-10',
-    'debian-8',
     'debian-9',
-    'fedora-30',
-    'fedora-31',
     'fedora-32',
+    'fedora-33',
     'gentoo',
     'gentoo-systemd',
     'opensuse-15',
@@ -30,15 +27,12 @@
 STABLE_DISTROS = [
     'amazon-1',
     'amazon-2',
-    'centos-6',
     'centos-7',
     'centos-8',
     'debian-10',
-    'debian-8',
     'debian-9',
-    'fedora-30',
-    'fedora-31',
     'fedora-32',
+    'fedora-33',
     'gentoo',
     'gentoo-systemd',
     'ubuntu-1604',
@@ -49,9 +43,8 @@
 PY2_BLACKLIST = [
     'centos-8',
     'debian-10',
-    'fedora-30',
-    'fedora-31',
     'fedora-32',
+    'fedora-33',
     'gentoo',
     'gentoo-systemd',
     'opensuse-15',
@@ -60,15 +53,15 @@
 
 PY3_BLACKLIST = [
     'amazon-1',
-    'centos-6',
-    'debian-8',
 ]
 
 BLACKLIST_2019 = [
+    'fedora-33',
     'ubuntu-2004',
 ]
 
 BLACKLIST_3000 = [
+    'fedora-33',
     'ubuntu-2004',
 ]
 
@@ -77,21 +70,19 @@
     '3000',
     '3001',
     '3001-0',
+    '3002',
+    '3002-0',
     'master',
     'latest'
 ]
 
-SALT_POST_3000_BLACKLIST = [
-    'centos-6',
-    'debian-8',
-    'fedora-30',
-]
-
 BRANCH_DISPLAY_NAMES = {
     '2019-2': 'v2019.2',
     '3000': 'v3000',
     '3001': 'v3001',
     '3001-0': 'v3001.0',
+    '3002': 'v3002',
+    '3002-0': 'v3002.0',
     'master': 'Master',
     'latest': 'Latest'
 }
@@ -107,15 +98,12 @@
     'amazon-1': 'Amazon 1',
     'amazon-2': 'Amazon 2',
     'arch': 'Arch',
-    'centos-6': 'CentOS 6',
     'centos-7': 'CentOS 7',
     'centos-8': 'CentOS 8',
     'debian-10': 'Debian 10',
-    'debian-8': 'Debian 8',
     'debian-9': 'Debian 9',
-    'fedora-30': 'Fedora 30',
-    'fedora-31': 'Fedora 31',
     'fedora-32': 'Fedora 32',
+    'fedora-33': 'Fedora 33',
     'gentoo': 'Gentoo',
     'gentoo-systemd': 'Gentoo (systemd)',
     'opensuse-15': 'Opensuse 15',
@@ -138,14 +126,6 @@ def generate_test_jobs():
 
         for branch in SALT_BRANCHES:
 
-            if branch == 'master' and distro in SALT_POST_3000_BLACKLIST:
-                continue
-            try:
-                if int(branch) >= 3000 and distro in SALT_POST_3000_BLACKLIST:
-                    continue
-            except ValueError:
-                pass
-
             if branch == 'latest':
                 if distro in LATEST_PKG_BLACKLIST:
                     continue
diff --git a/.kitchen.yml b/.kitchen.yml
index 37fd74989..a12ae12f7 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -57,42 +57,25 @@ platforms:
   - name: centos-7
     driver_config:
       run_command: /usr/lib/systemd/systemd
-  - name: centos-6
-    driver_config:
-      run_command: /sbin/init
-      provision_command:
-        - yum install -y upstart
-    provisioner:
-      salt_bootstrap_options: -MPfq -y -x python2.7 git %s
-  - name: debian-8
-    driver_config:
-      run_command: /lib/systemd/systemd
-      provision_command:
-        - apt-get install -y dbus
   - name: debian-9
     driver_config:
       run_command: /lib/systemd/systemd
   - name: debian-10
     driver_config:
       run_command: /lib/systemd/systemd
-  - name: fedora-30
-    driver_config:
-      image: fedora:30
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
-        - dnf -y install procps-ng
-  - name: fedora-31
+  - name: fedora-32
     driver_config:
-      image: fedora:31
+      image: fedora:32
       run_command: /usr/lib/systemd/systemd
       provision_command:
         - dnf -y install procps-ng
-  - name: fedora-32
+  - name: fedora-33
     driver_config:
-      image: fedora:32
+      image: fedora:33
       run_command: /usr/lib/systemd/systemd
       provision_command:
         - dnf -y install procps-ng
+        - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
   - name: gentoo
     driver_config:
       image: gentoo/stage3:latest
@@ -151,9 +134,8 @@ suites:
     excludes:
       - arch
       - opensuse-15
-      - fedora-30
-      - fedora-31
       - fedora-32
+      - fedora-33
       - gentoo
       - gentoo-systemd
       - ubuntu-2004
@@ -164,9 +146,8 @@ suites:
     excludes:
       - arch
       - opensuse-15
-      - fedora-30
-      - fedora-31
       - fedora-32
+      - fedora-33
       - gentoo
       - gentoo-systemd
       - ubuntu-2004
@@ -177,8 +158,6 @@ suites:
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
       - ubuntu-2004
   - name: py3-git-2019-2
     provisioner:
@@ -186,8 +165,6 @@ suites:
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
       - ubuntu-2004
   - name: py3-git-3001
     provisioner:
@@ -195,16 +172,18 @@ suites:
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
+  - name: py3-git-3002
+    provisioner:
+      salt_version: 3002
+      salt_bootstrap_options: -x python3 -MPfq git %s
+    excludes:
+      - amazon-1
   - name: py3-stable-2019-2
     provisioner:
       salt_version: 2019.2
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
       - opensuse-15
       - arch
       - ubuntu-2004
@@ -214,8 +193,6 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
       - opensuse-15
       - arch
       - ubuntu-2004
@@ -225,12 +202,9 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable 3001.0
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
       - opensuse-15
-      - fedora-30
-      - fedora-31
       - fedora-32
+      - fedora-33
       - arch
   - name: py3-stable-3001
     provisioner:
@@ -238,8 +212,24 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
+      - opensuse-15
+      - arch
+  - name: py3-stable-3002-0
+    provisioner:
+      salt_version: 3002
+      salt_bootstrap_options: -x python3 -MP stable 3002.0
+    excludes:
+      - amazon-1
+      - opensuse-15
+      - fedora-32
+      - fedora-33
+      - arch
+  - name: py3-stable-3002
+    provisioner:
+      salt_version: 3002
+      salt_bootstrap_options: -x python3 -MP stable %s
+    excludes:
+      - amazon-1
       - opensuse-15
       - arch
   - name: py3-git-master
@@ -248,8 +238,6 @@ suites:
       salt_bootstrap_options: -x python3 -MPfq -D git %s
     excludes:
       - amazon-1
-      - centos-6
-      - debian-8
 
   - name: latest
     provisioner:

From c291d741f55119377c046b0d6b9c5b863c72d4eb Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Tue, 8 Dec 2020 22:22:46 +0000
Subject: [PATCH 018/135] only run gentoo on branch, black everything

---
 .github/workflows/main-branch-only.yml        | 1112 +++++++++++++++++
 .github/workflows/main.yml                    | 1104 ----------------
 .../scripts/update-release-shasum.py          |    2 +-
 .github/workflows/templates/generate.py       |  283 +++--
 .github/workflows/templates/linux.yml         |    2 +-
 .github/workflows/templates/main.yml          |    4 +-
 .kitchen.yml                                  |    2 +
 .pre-commit-config.yaml                       |    5 +
 tests/conftest.py                             |   32 +-
 tests/integration/test_installation.py        |    6 +-
 10 files changed, 1307 insertions(+), 1245 deletions(-)
 create mode 100644 .github/workflows/main-branch-only.yml

diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
new file mode 100644
index 000000000..d04e1bcba
--- /dev/null
+++ b/.github/workflows/main-branch-only.yml
@@ -0,0 +1,1112 @@
+# DO NOT EDIT THIS FILE DIRECTLY!
+#
+# This file was generated by .github/workflows/templates/generate.py
+
+name: Branch Testing
+
+on: [push]
+
+jobs:
+
+  py3-stable-2019-2-gentoo:
+    name: Gentoo v2019.2 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-2019-2-gentoo || bundle exec kitchen create py3-stable-2019-2-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-2019-2-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-2019-2-gentoo
+
+
+  py3-git-2019-2-gentoo:
+    name: Gentoo v2019.2 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-2019-2-gentoo || bundle exec kitchen create py3-git-2019-2-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-2019-2-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-2019-2-gentoo
+
+
+  py3-stable-3000-gentoo:
+    name: Gentoo v3000 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3000-gentoo || bundle exec kitchen create py3-stable-3000-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3000-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3000-gentoo
+
+
+  py3-git-3000-gentoo:
+    name: Gentoo v3000 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3000-gentoo || bundle exec kitchen create py3-git-3000-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3000-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3000-gentoo
+
+
+  py3-stable-3001-gentoo:
+    name: Gentoo v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-gentoo || bundle exec kitchen create py3-stable-3001-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-gentoo
+
+
+  py3-git-3001-gentoo:
+    name: Gentoo v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-gentoo || bundle exec kitchen create py3-git-3001-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-gentoo
+
+
+  py3-stable-3001-0-gentoo:
+    name: Gentoo v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-gentoo || bundle exec kitchen create py3-stable-3001-0-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-gentoo
+
+
+  py3-stable-3002-gentoo:
+    name: Gentoo v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-gentoo || bundle exec kitchen create py3-stable-3002-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-gentoo
+
+
+  py3-git-3002-gentoo:
+    name: Gentoo v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-gentoo || bundle exec kitchen create py3-git-3002-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-gentoo
+
+
+  py3-stable-3002-0-gentoo:
+    name: Gentoo v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-gentoo || bundle exec kitchen create py3-stable-3002-0-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-gentoo
+
+
+  py3-git-master-gentoo:
+    name: Gentoo Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-gentoo || bundle exec kitchen create py3-git-master-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-gentoo
+
+
+  latest-gentoo:
+    name: Gentoo Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-gentoo || bundle exec kitchen create latest-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-gentoo
+
+
+  py3-stable-2019-2-gentoo-systemd:
+    name: Gentoo (systemd) v2019.2 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-2019-2-gentoo-systemd || bundle exec kitchen create py3-stable-2019-2-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-2019-2-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-2019-2-gentoo-systemd
+
+
+  py3-git-2019-2-gentoo-systemd:
+    name: Gentoo (systemd) v2019.2 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-2019-2-gentoo-systemd || bundle exec kitchen create py3-git-2019-2-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-2019-2-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-2019-2-gentoo-systemd
+
+
+  py3-stable-3000-gentoo-systemd:
+    name: Gentoo (systemd) v3000 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3000-gentoo-systemd || bundle exec kitchen create py3-stable-3000-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3000-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3000-gentoo-systemd
+
+
+  py3-git-3000-gentoo-systemd:
+    name: Gentoo (systemd) v3000 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3000-gentoo-systemd || bundle exec kitchen create py3-git-3000-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3000-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3000-gentoo-systemd
+
+
+  py3-stable-3001-gentoo-systemd:
+    name: Gentoo (systemd) v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-gentoo-systemd || bundle exec kitchen create py3-stable-3001-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-gentoo-systemd
+
+
+  py3-git-3001-gentoo-systemd:
+    name: Gentoo (systemd) v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-gentoo-systemd || bundle exec kitchen create py3-git-3001-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-gentoo-systemd
+
+
+  py3-stable-3001-0-gentoo-systemd:
+    name: Gentoo (systemd) v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-gentoo-systemd || bundle exec kitchen create py3-stable-3001-0-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-gentoo-systemd
+
+
+  py3-stable-3002-gentoo-systemd:
+    name: Gentoo (systemd) v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-gentoo-systemd || bundle exec kitchen create py3-stable-3002-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-gentoo-systemd
+
+
+  py3-git-3002-gentoo-systemd:
+    name: Gentoo (systemd) v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-gentoo-systemd || bundle exec kitchen create py3-git-3002-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-gentoo-systemd
+
+
+  py3-stable-3002-0-gentoo-systemd:
+    name: Gentoo (systemd) v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-gentoo-systemd || bundle exec kitchen create py3-stable-3002-0-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-gentoo-systemd
+
+
+  py3-git-master-gentoo-systemd:
+    name: Gentoo (systemd) Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-gentoo-systemd || bundle exec kitchen create py3-git-master-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-gentoo-systemd
+
+
+  latest-gentoo-systemd:
+    name: Gentoo (systemd) Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-gentoo-systemd || bundle exec kitchen create latest-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-gentoo-systemd
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3f7b379f..2a26233ef 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3632,1110 +3632,6 @@ jobs:
           bundle exec kitchen destroy latest-fedora-33
 
 
-  py3-stable-2019-2-gentoo:
-    name: Gentoo v2019.2 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-2019-2-gentoo || bundle exec kitchen create py3-stable-2019-2-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-gentoo
-
-
-  py3-git-2019-2-gentoo:
-    name: Gentoo v2019.2 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-2019-2-gentoo || bundle exec kitchen create py3-git-2019-2-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-gentoo
-
-
-  py3-stable-3000-gentoo:
-    name: Gentoo v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-gentoo || bundle exec kitchen create py3-stable-3000-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-gentoo
-
-
-  py3-git-3000-gentoo:
-    name: Gentoo v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-gentoo || bundle exec kitchen create py3-git-3000-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-gentoo
-
-
-  py3-stable-3001-gentoo:
-    name: Gentoo v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-gentoo || bundle exec kitchen create py3-stable-3001-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-gentoo
-
-
-  py3-git-3001-gentoo:
-    name: Gentoo v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-gentoo || bundle exec kitchen create py3-git-3001-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-gentoo
-
-
-  py3-stable-3001-0-gentoo:
-    name: Gentoo v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-gentoo || bundle exec kitchen create py3-stable-3001-0-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-gentoo
-
-
-  py3-stable-3002-gentoo:
-    name: Gentoo v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-gentoo || bundle exec kitchen create py3-stable-3002-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-gentoo
-
-
-  py3-git-3002-gentoo:
-    name: Gentoo v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-gentoo || bundle exec kitchen create py3-git-3002-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-gentoo
-
-
-  py3-stable-3002-0-gentoo:
-    name: Gentoo v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-gentoo || bundle exec kitchen create py3-stable-3002-0-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-gentoo
-
-
-  py3-git-master-gentoo:
-    name: Gentoo Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-gentoo || bundle exec kitchen create py3-git-master-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-gentoo
-
-
-  latest-gentoo:
-    name: Gentoo Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-gentoo || bundle exec kitchen create latest-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-gentoo
-
-
-  py3-stable-2019-2-gentoo-systemd:
-    name: Gentoo (systemd) v2019.2 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-2019-2-gentoo-systemd || bundle exec kitchen create py3-stable-2019-2-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-gentoo-systemd
-
-
-  py3-git-2019-2-gentoo-systemd:
-    name: Gentoo (systemd) v2019.2 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-2019-2-gentoo-systemd || bundle exec kitchen create py3-git-2019-2-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-gentoo-systemd
-
-
-  py3-stable-3000-gentoo-systemd:
-    name: Gentoo (systemd) v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-gentoo-systemd || bundle exec kitchen create py3-stable-3000-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-gentoo-systemd
-
-
-  py3-git-3000-gentoo-systemd:
-    name: Gentoo (systemd) v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-gentoo-systemd || bundle exec kitchen create py3-git-3000-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-gentoo-systemd
-
-
-  py3-stable-3001-gentoo-systemd:
-    name: Gentoo (systemd) v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-gentoo-systemd || bundle exec kitchen create py3-stable-3001-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-gentoo-systemd
-
-
-  py3-git-3001-gentoo-systemd:
-    name: Gentoo (systemd) v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-gentoo-systemd || bundle exec kitchen create py3-git-3001-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-gentoo-systemd
-
-
-  py3-stable-3001-0-gentoo-systemd:
-    name: Gentoo (systemd) v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-gentoo-systemd || bundle exec kitchen create py3-stable-3001-0-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-gentoo-systemd
-
-
-  py3-stable-3002-gentoo-systemd:
-    name: Gentoo (systemd) v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-gentoo-systemd || bundle exec kitchen create py3-stable-3002-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-gentoo-systemd
-
-
-  py3-git-3002-gentoo-systemd:
-    name: Gentoo (systemd) v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-gentoo-systemd || bundle exec kitchen create py3-git-3002-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-gentoo-systemd
-
-
-  py3-stable-3002-0-gentoo-systemd:
-    name: Gentoo (systemd) v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-gentoo-systemd || bundle exec kitchen create py3-stable-3002-0-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-gentoo-systemd
-
-
-  py3-git-master-gentoo-systemd:
-    name: Gentoo (systemd) Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-gentoo-systemd || bundle exec kitchen create py3-git-master-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-gentoo-systemd
-
-
-  latest-gentoo-systemd:
-    name: Gentoo (systemd) Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-gentoo-systemd || bundle exec kitchen create latest-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-gentoo-systemd
-
-
   py3-git-2019-2-opensuse-15:
     name: Opensuse 15 v2019.2 Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/scripts/update-release-shasum.py b/.github/workflows/scripts/update-release-shasum.py
index fefde6466..60a6600e5 100644
--- a/.github/workflows/scripts/update-release-shasum.py
+++ b/.github/workflows/scripts/update-release-shasum.py
@@ -33,5 +33,5 @@ def main(version, sha256sum):
         README_PATH.write_text(out_contents)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main(sys.argv[1], sys.argv[2])
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 695ff3b3c..96d1caa4e 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -6,170 +6,186 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 LINUX_DISTROS = [
-#    'amazon-1',
-    'amazon-2',
-    'arch',
-    'centos-7',
-    'centos-8',
-    'debian-10',
-    'debian-9',
-    'fedora-32',
-    'fedora-33',
-    'gentoo',
-    'gentoo-systemd',
-    'opensuse-15',
-    'ubuntu-1604',
-    'ubuntu-1804',
-    'ubuntu-2004',
+    #'amazon-1',
+    "amazon-2",
+    "arch",
+    "centos-7",
+    "centos-8",
+    "debian-10",
+    "debian-9",
+    "fedora-32",
+    "fedora-33",
+    "gentoo",
+    "gentoo-systemd",
+    "opensuse-15",
+    "ubuntu-1604",
+    "ubuntu-1804",
+    "ubuntu-2004",
 ]
 OSX = WINDOWS = []
 
 STABLE_DISTROS = [
-    'amazon-1',
-    'amazon-2',
-    'centos-7',
-    'centos-8',
-    'debian-10',
-    'debian-9',
-    'fedora-32',
-    'fedora-33',
-    'gentoo',
-    'gentoo-systemd',
-    'ubuntu-1604',
-    'ubuntu-1804',
-    'ubuntu-2004',
+    "amazon-1",
+    "amazon-2",
+    "centos-7",
+    "centos-8",
+    "debian-10",
+    "debian-9",
+    "fedora-32",
+    "fedora-33",
+    "gentoo",
+    "gentoo-systemd",
+    "ubuntu-1604",
+    "ubuntu-1804",
+    "ubuntu-2004",
 ]
 
 PY2_BLACKLIST = [
-    'centos-8',
-    'debian-10',
-    'fedora-32',
-    'fedora-33',
-    'gentoo',
-    'gentoo-systemd',
-    'opensuse-15',
-    'ubuntu-2004',
+    "centos-8",
+    "debian-10",
+    "fedora-32",
+    "fedora-33",
+    "gentoo",
+    "gentoo-systemd",
+    "opensuse-15",
+    "ubuntu-2004",
 ]
 
 PY3_BLACKLIST = [
-    'amazon-1',
+    "amazon-1",
 ]
 
 BLACKLIST_2019 = [
-    'fedora-33',
-    'ubuntu-2004',
+    "fedora-33",
+    "ubuntu-2004",
 ]
 
 BLACKLIST_3000 = [
-    'fedora-33',
-    'ubuntu-2004',
+    "fedora-33",
+    "ubuntu-2004",
 ]
 
 SALT_BRANCHES = [
-    '2019-2',
-    '3000',
-    '3001',
-    '3001-0',
-    '3002',
-    '3002-0',
-    'master',
-    'latest'
+    "2019-2",
+    "3000",
+    "3001",
+    "3001-0",
+    "3002",
+    "3002-0",
+    "master",
+    "latest",
 ]
 
 BRANCH_DISPLAY_NAMES = {
-    '2019-2': 'v2019.2',
-    '3000': 'v3000',
-    '3001': 'v3001',
-    '3001-0': 'v3001.0',
-    '3002': 'v3002',
-    '3002-0': 'v3002.0',
-    'master': 'Master',
-    'latest': 'Latest'
+    "2019-2": "v2019.2",
+    "3000": "v3000",
+    "3001": "v3001",
+    "3001-0": "v3001.0",
+    "3002": "v3002",
+    "3002-0": "v3002.0",
+    "master": "Master",
+    "latest": "Latest",
 }
 
-STABLE_BRANCH_BLACKLIST = [
-]
+STABLE_BRANCH_BLACKLIST = []
 
 LATEST_PKG_BLACKLIST = [
-    'arch',         # No packages are built
+    "arch",  # No packages are built
 ]
 
 DISTRO_DISPLAY_NAMES = {
-    'amazon-1': 'Amazon 1',
-    'amazon-2': 'Amazon 2',
-    'arch': 'Arch',
-    'centos-7': 'CentOS 7',
-    'centos-8': 'CentOS 8',
-    'debian-10': 'Debian 10',
-    'debian-9': 'Debian 9',
-    'fedora-32': 'Fedora 32',
-    'fedora-33': 'Fedora 33',
-    'gentoo': 'Gentoo',
-    'gentoo-systemd': 'Gentoo (systemd)',
-    'opensuse-15': 'Opensuse 15',
-    'ubuntu-1604': 'Ubuntu 16.04',
-    'ubuntu-1804': 'Ubuntu 18.04',
-    'ubuntu-2004': 'Ubuntu 20.04',
+    "amazon-1": "Amazon 1",
+    "amazon-2": "Amazon 2",
+    "arch": "Arch",
+    "centos-7": "CentOS 7",
+    "centos-8": "CentOS 8",
+    "debian-10": "Debian 10",
+    "debian-9": "Debian 9",
+    "fedora-32": "Fedora 32",
+    "fedora-33": "Fedora 33",
+    "gentoo": "Gentoo",
+    "gentoo-systemd": "Gentoo (systemd)",
+    "opensuse-15": "Opensuse 15",
+    "ubuntu-1604": "Ubuntu 16.04",
+    "ubuntu-1804": "Ubuntu 18.04",
+    "ubuntu-2004": "Ubuntu 20.04",
 }
 
 TIMEOUT_DEFAULT = 20
 TIMEOUT_OVERRIDES = {
-    'gentoo': 50,
-    'gentoo-systemd': 50,
+    "gentoo": 50,
+    "gentoo-systemd": 50,
 }
+BRANCH_ONLY_OVERRIDES = [
+    "gentoo",
+    "gentoo-systemd",
+]
+
 
 def generate_test_jobs():
-    test_jobs = ''
+    test_jobs = ""
+    branch_only_test_jobs = ""
 
     for distro in LINUX_DISTROS + OSX + WINDOWS:
-        timeout_minutes = TIMEOUT_OVERRIDES[distro] if distro in TIMEOUT_OVERRIDES else TIMEOUT_DEFAULT
+        timeout_minutes = (
+            TIMEOUT_OVERRIDES[distro]
+            if distro in TIMEOUT_OVERRIDES
+            else TIMEOUT_DEFAULT
+        )
+        needs = "    needs: lint"
+        if distro in BRANCH_ONLY_OVERRIDES:
+            needs = ""
+        current_test_jobs = ""
 
         for branch in SALT_BRANCHES:
 
-            if branch == 'latest':
+            if branch == "latest":
                 if distro in LATEST_PKG_BLACKLIST:
                     continue
                 if distro in LINUX_DISTROS:
-                    template = 'linux.yml'
+                    template = "linux.yml"
                 elif distro in OSX:
-                    template = 'osx.yml'
+                    template = "osx.yml"
                 elif distro in WINDOWS:
-                    template = 'windows.yml'
+                    template = "windows.yml"
                 else:
                     print("Don't know how to handle {}".format(distro))
 
                 with open(template) as rfh:
-                    test_jobs += '\n{}\n'.format(
-                        rfh.read().replace(
-                            '{python_version}-{bootstrap_type}-{branch}-{distro}',
-                            '{branch}-{distro}'
-                        ).format(
+                    current_test_jobs += "\n{}\n".format(
+                        rfh.read()
+                        .replace(
+                            "{python_version}-{bootstrap_type}-{branch}-{distro}",
+                            "{branch}-{distro}",
+                        )
+                        .format(
                             distro=distro,
                             branch=branch,
-                            display_name='{} Latest packaged release'.format(
+                            display_name="{} Latest packaged release".format(
                                 DISTRO_DISPLAY_NAMES[distro],
                             ),
-                            timeout_minutes=timeout_minutes
+                            timeout_minutes=timeout_minutes,
+                            needs=needs,
                         )
                     )
                 continue
 
-            for python_version in ('py2', 'py3'):
+            for python_version in ("py2", "py3"):
 
-                if branch == 'master' and python_version == 'py2':
+                if branch == "master" and python_version == "py2":
                     # Salt's master branch no longer supports Python 2
                     continue
 
                 try:
-                    if int(branch.split('-')[0]) >= 3000 and python_version == 'py2':
+                    if int(branch.split("-")[0]) >= 3000 and python_version == "py2":
                         # Salt's 300X versions no longer supports Python 2
                         continue
                 except ValueError:
                     pass
 
-                for bootstrap_type in ('stable', 'git'):
-                    if bootstrap_type == 'stable':
-                        if branch == 'master':
+                for bootstrap_type in ("stable", "git"):
+                    if bootstrap_type == "stable":
+                        if branch == "master":
                             # For the master branch there's no stable build
                             continue
                         if distro not in STABLE_DISTROS:
@@ -184,7 +200,7 @@ def generate_test_jobs():
 
                     if bootstrap_type == "git":
                         # .0 versions are a virtual version for pinning to the first point release of a major release, such as 3001, there is no git version.
-                        if branch.endswith('-0'):
+                        if branch.endswith("-0"):
                             continue
 
                         if python_version == "py3":
@@ -199,64 +215,85 @@ def generate_test_jobs():
                                 if branch not in allowed_branches:
                                     # Arch and Fedora default to py3.8
                                     continue
-                    if branch == '2019-2' and distro in BLACKLIST_2019:
+                    if branch == "2019-2" and distro in BLACKLIST_2019:
                         continue
 
-                    if branch == '3000' and distro in BLACKLIST_3000:
+                    if branch == "3000" and distro in BLACKLIST_3000:
                         continue
 
-                    if python_version == 'py2' and distro in PY2_BLACKLIST:
+                    if python_version == "py2" and distro in PY2_BLACKLIST:
                         continue
 
-                    if python_version == 'py3' and distro in PY3_BLACKLIST:
+                    if python_version == "py3" and distro in PY3_BLACKLIST:
                         continue
 
                     if distro in LINUX_DISTROS:
-                        template = 'linux.yml'
+                        template = "linux.yml"
                     elif distro in OSX:
-                        template = 'osx.yml'
+                        template = "osx.yml"
                     elif distro in WINDOWS:
-                        template = 'windows.yml'
+                        template = "windows.yml"
                     else:
                         print("Don't know how to handle {}".format(distro))
 
                     with open(template) as rfh:
-                        test_jobs += '\n{}\n'.format(
+                        current_test_jobs += "\n{}\n".format(
                             rfh.read().format(
                                 distro=distro,
                                 branch=branch,
                                 python_version=python_version,
                                 bootstrap_type=bootstrap_type,
-                                display_name='{} {} {} {}'.format(
+                                display_name="{} {} {} {}".format(
                                     DISTRO_DISPLAY_NAMES[distro],
                                     BRANCH_DISPLAY_NAMES[branch],
                                     python_version.capitalize(),
-                                    bootstrap_type.capitalize()
+                                    bootstrap_type.capitalize(),
                                 ),
-                                timeout_minutes=timeout_minutes
+                                timeout_minutes=timeout_minutes,
+                                needs=needs,
                             )
                         )
+        if distro in BRANCH_ONLY_OVERRIDES:
+            branch_only_test_jobs += current_test_jobs
+        else:
+            test_jobs += current_test_jobs
 
-    with open('lint.yml') as rfh:
-        lint_job = '\n{}\n'.format(rfh.read())
+    with open("lint.yml") as rfh:
+        lint_job = "\n{}\n".format(rfh.read())
 
-    with open('pre-commit.yml') as rfh:
-        pre_commit_job = '\n{}\n'.format(rfh.read())
+    with open("pre-commit.yml") as rfh:
+        pre_commit_job = "\n{}\n".format(rfh.read())
 
-    with open('../main.yml', 'w') as wfh:
-        with open('main.yml') as rfh:
+    with open("../main.yml", "w") as wfh:
+        with open("main.yml") as rfh:
             wfh.write(
-                '{}\n'.format(
-                    rfh.read().format(
-                        jobs='{pre_commit}{lint}{test}'.format(
-                            lint=lint_job,
-                            test=test_jobs,
-                            pre_commit=pre_commit_job,
-                        )
-                    ).strip()
+                "{}\n".format(
+                    rfh.read()
+                    .format(
+                        jobs="{pre_commit}{lint}{test}".format(
+                            lint=lint_job, test=test_jobs, pre_commit=pre_commit_job,
+                        ),
+                        on="push, pull_request",
+                        name="Testing",
+                    )
+                    .strip()
+                )
+            )
+
+    with open("../main-branch-only.yml", "w") as wfh:
+        with open("main.yml") as rfh:
+            wfh.write(
+                "{}\n".format(
+                    rfh.read()
+                    .format(
+                        jobs="{test}".format(test=branch_only_test_jobs,),
+                        on="push",
+                        name="Branch Testing",
+                    )
+                    .strip()
                 )
             )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     generate_test_jobs()
diff --git a/.github/workflows/templates/linux.yml b/.github/workflows/templates/linux.yml
index 51e000d9b..e956676c4 100644
--- a/.github/workflows/templates/linux.yml
+++ b/.github/workflows/templates/linux.yml
@@ -3,7 +3,7 @@
     runs-on: ubuntu-latest
     timeout-minutes: {timeout_minutes}
 
-    needs: lint
+{needs}
 
     steps:
       - uses: actions/checkout@v1
diff --git a/.github/workflows/templates/main.yml b/.github/workflows/templates/main.yml
index 1ad20c3ab..327536c29 100644
--- a/.github/workflows/templates/main.yml
+++ b/.github/workflows/templates/main.yml
@@ -2,9 +2,9 @@
 #
 # This file was generated by .github/workflows/templates/generate.py
 
-name: Testing
+name: {name}
 
-on: [push, pull_request]
+on: [{on}]
 
 jobs:
 {jobs}
diff --git a/.kitchen.yml b/.kitchen.yml
index a12ae12f7..a95aff06b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -82,12 +82,14 @@ platforms:
       run_command: /sbin/init
       provision_command:
         - rc-update add sshd default
+        - emerge --update --deep --with-bdeps=y --newuse @world
   - name: gentoo-systemd
     driver_config:
       image: gentoo/stage3:systemd
       run_command: /lib/systemd/systemd
       provision_command:
         - systemctl enable sshd.service
+        - emerge --update --deep --with-bdeps=y --newuse @world
   - name: opensuse-15
     driver_config:
       image: opensuse/leap:15.1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d285259c7..c48dae6a0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,6 +11,11 @@ repos:
         args: [--fix=lf]
       - id: end-of-file-fixer     # Makes sure files end in a newline and only a newline.
 
+  - repo: https://github.com/psf/black
+    rev: 19.10b0
+    hooks:
+      - id: black
+
   - repo: local
     hooks:
       - id: generate-actions-workflow
diff --git a/tests/conftest.py b/tests/conftest.py
index a5e262f3b..5f0e1b6ad 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -7,28 +7,38 @@
 log = logging.getLogger(__name__)
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope="session")
 def host():
-    if os.environ.get('KITCHEN_USERNAME') == 'vagrant':
-        if 'windows' in os.environ.get('KITCHEN_INSTANCE'):
+    if os.environ.get("KITCHEN_USERNAME") == "vagrant":
+        if "windows" in os.environ.get("KITCHEN_INSTANCE"):
             return testinfra.get_host(
-                'winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}'.format(**os.environ),
-                no_ssl=True)
+                "winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format(
+                    **os.environ
+                ),
+                no_ssl=True,
+            )
         return testinfra.get_host(
-            'paramiko://{KITCHEN_USERNAME}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}'.format(**os.environ),
-            ssh_identity_file=os.environ.get('KITCHEN_SSH_KEY'))
-    return testinfra.get_host('docker://{KITCHEN_USERNAME}@{KITCHEN_CONTAINER_ID}'.format(**os.environ))
+            "paramiko://{KITCHEN_USERNAME}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format(
+                **os.environ
+            ),
+            ssh_identity_file=os.environ.get("KITCHEN_SSH_KEY"),
+        )
+    return testinfra.get_host(
+        "docker://{KITCHEN_USERNAME}@{KITCHEN_CONTAINER_ID}".format(**os.environ)
+    )
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope="session")
 def target_python_version():
     target_python = os.environ["KITCHEN_SUITE"].split("-", 1)[0]
     if target_python == "latest":
-        pytest.skip("Unable to get target python from {}".format(os.environ["KITCHEN_SUITE"]))
+        pytest.skip(
+            "Unable to get target python from {}".format(os.environ["KITCHEN_SUITE"])
+        )
     return int(target_python.replace("py", ""))
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope="session")
 def target_salt_version():
     target_salt = os.environ["KITCHEN_SUITE"].split("-", 2)[-1].replace("-", ".")
     if target_salt.endswith(".0") and float(target_salt) >= 3000:
diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py
index 07112e07a..81ed135af 100644
--- a/tests/integration/test_installation.py
+++ b/tests/integration/test_installation.py
@@ -9,16 +9,16 @@
 
 def test_ping(host):
     with host.sudo():
-        assert host.salt('test.ping', '--timeout=120')
+        assert host.salt("test.ping", "--timeout=120")
 
 
 def test_target_python_version(host, target_python_version):
     with host.sudo():
-        ret = host.salt('grains.item', 'pythonversion', '--timeout=120')
+        ret = host.salt("grains.item", "pythonversion", "--timeout=120")
         assert ret["pythonversion"][0] == target_python_version
 
 
 def test_target_salt_version(host, target_salt_version):
     with host.sudo():
-        ret = host.salt('grains.item', 'saltversion', '--timeout=120')
+        ret = host.salt("grains.item", "saltversion", "--timeout=120")
         assert ret["saltversion"].startswith(target_salt_version)

From 11a0c6fee0bad49a1d189c087e8dcc4387988ed2 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 9 Dec 2020 05:20:25 +0000
Subject: [PATCH 019/135] fix .0 tests

---
 tests/conftest.py                      | 2 --
 tests/integration/test_installation.py | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 5f0e1b6ad..090131b12 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -41,8 +41,6 @@ def target_python_version():
 @pytest.fixture(scope="session")
 def target_salt_version():
     target_salt = os.environ["KITCHEN_SUITE"].split("-", 2)[-1].replace("-", ".")
-    if target_salt.endswith(".0") and float(target_salt) >= 3000:
-        target_salt = ".".join(target_salt.split(".")[:-1])
     if target_salt in ("latest", "master"):
         pytest.skip("Don't have a specific salt version to test against")
     return target_salt
diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py
index 81ed135af..a2309c040 100644
--- a/tests/integration/test_installation.py
+++ b/tests/integration/test_installation.py
@@ -21,4 +21,7 @@ def test_target_python_version(host, target_python_version):
 def test_target_salt_version(host, target_salt_version):
     with host.sudo():
         ret = host.salt("grains.item", "saltversion", "--timeout=120")
-        assert ret["saltversion"].startswith(target_salt_version)
+        if target_salt_version.endswith(".0"):
+            assert ret["saltversion"] == ".".join(target_salt_version.split(".")[:-1])
+        else:
+            assert ret["saltversion"].startswith(target_salt_version)

From 4c1903f0043909a182c1cb226cb18ab67ac0987f Mon Sep 17 00:00:00 2001
From: Joseph Pacura <jpacura96@gmail.com>
Date: Fri, 4 Dec 2020 17:15:02 -0500
Subject: [PATCH 020/135] Debian 11 (bullseye/testing) support using Debian 10
 packages

---
 README.rst        |  6 +++---
 bootstrap-salt.sh | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 903ecb02a..d188a799e 100644
--- a/README.rst
+++ b/README.rst
@@ -300,9 +300,9 @@ repositories are not provided on `SaltStack's Debian repository`_ for Debian tes
 However, the bootstrap script will attempt to install the packages for the current stable
 version of Debian.
 
-For example, when installing Salt on Debian 10 (Buster), the bootstrap script will setup the
-repository for Debian 9 (Stretch) from `SaltStack's Debian repository`_ and install the
-Debian 9 packages.
+For example, when installing Salt on Debian 11 (Bullseye), the bootstrap script will setup the
+repository for Debian 10 (Buster) from `SaltStack's Debian repository`_ and install the
+Debian 10 packages.
 
 
 Red Hat family
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 9730cefb9..113873bbc 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -900,6 +900,8 @@ __derive_debian_numeric_version() {
             NUMERIC_VERSION=$(__parse_version_string "9.0")
         elif [ "$INPUT_VERSION" = "buster/sid" ]; then
             NUMERIC_VERSION=$(__parse_version_string "10.0")
+        elif [ "$INPUT_VERSION" = "bullseye/sid" ]; then
+            NUMERIC_VERSION=$(__parse_version_string "11.0")
         else
             echowarn "Unable to parse the Debian Version (codename: '$INPUT_VERSION')"
         fi
@@ -1555,6 +1557,9 @@ __debian_codename_translation() {
         "10")
             DISTRO_CODENAME="buster"
             ;;
+        "11")
+            DISTRO_CODENAME="bullseye"
+            ;;
         *)
             DISTRO_CODENAME="jessie"
             ;;
@@ -3339,8 +3344,17 @@ install_ubuntu_check_services() {
 #   Debian Install Functions
 #
 __install_saltstack_debian_repository() {
-    DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
-    DEBIAN_CODENAME="$DISTRO_CODENAME"
+    if [ "$DISTRO_MAJOR_VERSION" -eq 11 ]; then
+        # Packages for Debian 11 at repo.saltstack.com are not yet available
+        # Set up repository for Debian 10 for Debian 11 for now until support
+        # is available at repo.saltstack.com for Debian 11.
+        echowarn "Debian 11 distribution detected, but stable packages requested. Trying packages from Debian 10. You may experience problems."
+        DEBIAN_RELEASE="10"
+        DEBIAN_CODENAME="buster"
+    else
+        DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
+        DEBIAN_CODENAME="$DISTRO_CODENAME"
+    fi
 
     __PY_VERSION_REPO="apt"
     if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then

From 8275732c6cc3e0341974763525f62a2aa6573c74 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 9 Dec 2020 05:19:06 +0000
Subject: [PATCH 021/135] add debian-11 tests

---
 .github/workflows/main.yml              | 184 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |  27 ++++
 .kitchen.yml                            |  21 +++
 3 files changed, 232 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2a26233ef..6ff62563e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2620,6 +2620,190 @@ jobs:
           bundle exec kitchen destroy latest-debian-10
 
 
+  py3-stable-3002-debian-11:
+    name: Debian 11 v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-debian-11
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-debian-11
+
+
+  py3-git-3002-debian-11:
+    name: Debian 11 v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-debian-11
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-debian-11
+
+
+  py3-git-master-debian-11:
+    name: Debian 11 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-debian-11
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-debian-11
+
+
+  latest-debian-11:
+    name: Debian 11 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-debian-11
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-debian-11
+
+
   py2-stable-2019-2-debian-9:
     name: Debian 9 v2019.2 Py2 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 96d1caa4e..803633639 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -12,6 +12,7 @@
     "centos-7",
     "centos-8",
     "debian-10",
+    "debian-11",
     "debian-9",
     "fedora-32",
     "fedora-33",
@@ -30,6 +31,7 @@
     "centos-7",
     "centos-8",
     "debian-10",
+    "debian-11",
     "debian-9",
     "fedora-32",
     "fedora-33",
@@ -43,6 +45,7 @@
 PY2_BLACKLIST = [
     "centos-8",
     "debian-10",
+    "debian-11",
     "fedora-32",
     "fedora-33",
     "gentoo",
@@ -56,15 +59,29 @@
 ]
 
 BLACKLIST_2019 = [
+    "debian-11",
     "fedora-33",
     "ubuntu-2004",
 ]
 
 BLACKLIST_3000 = [
+    "debian-11",
     "fedora-33",
     "ubuntu-2004",
 ]
 
+BLACKLIST_3001 = [
+    "debian-11",
+]
+
+BLACKLIST_3001_0 = [
+    "debian-11",
+]
+
+BLACKLIST_3002_0 = [
+    "debian-11",
+]
+
 SALT_BRANCHES = [
     "2019-2",
     "3000",
@@ -100,6 +117,7 @@
     "centos-7": "CentOS 7",
     "centos-8": "CentOS 8",
     "debian-10": "Debian 10",
+    "debian-11": "Debian 11",
     "debian-9": "Debian 9",
     "fedora-32": "Fedora 32",
     "fedora-33": "Fedora 33",
@@ -221,6 +239,15 @@ def generate_test_jobs():
                     if branch == "3000" and distro in BLACKLIST_3000:
                         continue
 
+                    if branch == "3001" and distro in BLACKLIST_3001:
+                        continue
+
+                    if branch == "3001-0" and distro in BLACKLIST_3001_0:
+                        continue
+
+                    if branch == "3002-0" and distro in BLACKLIST_3002_0:
+                        continue
+
                     if python_version == "py2" and distro in PY2_BLACKLIST:
                         continue
 
diff --git a/.kitchen.yml b/.kitchen.yml
index a95aff06b..55c85791f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -63,6 +63,10 @@ platforms:
   - name: debian-10
     driver_config:
       run_command: /lib/systemd/systemd
+  - name: debian-11
+    driver_config:
+      image: debian:bullseye
+      run_command: /lib/systemd/systemd
   - name: fedora-32
     driver_config:
       image: fedora:32
@@ -115,18 +119,24 @@ suites:
     provisioner:
       salt_version: 2019.2
     excludes:
+      - debian-10
+      - debian-11
       - gentoo
       - gentoo-systemd
   - name: py2-git-3000
     provisioner:
       salt_version: 3000
     excludes:
+      - debian-10
+      - debian-11
       - gentoo
       - gentoo-systemd
   - name: py2-git-master
     provisioner:
       salt_version: master
     excludes:
+      - debian-10
+      - debian-11
       - gentoo
       - gentoo-systemd
   - name: py2-stable-2019-2
@@ -138,6 +148,8 @@ suites:
       - opensuse-15
       - fedora-32
       - fedora-33
+      - debian-10
+      - debian-11
       - gentoo
       - gentoo-systemd
       - ubuntu-2004
@@ -148,6 +160,8 @@ suites:
     excludes:
       - arch
       - opensuse-15
+      - debian-10
+      - debian-11
       - fedora-32
       - fedora-33
       - gentoo
@@ -160,6 +174,7 @@ suites:
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
       - amazon-1
+      - debian-11
       - ubuntu-2004
   - name: py3-git-2019-2
     provisioner:
@@ -167,6 +182,7 @@ suites:
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
       - amazon-1
+      - debian-11
       - ubuntu-2004
   - name: py3-git-3001
     provisioner:
@@ -186,6 +202,7 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
       - amazon-1
+      - debian-11
       - opensuse-15
       - arch
       - ubuntu-2004
@@ -195,6 +212,7 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
       - amazon-1
+      - debian-11
       - opensuse-15
       - arch
       - ubuntu-2004
@@ -205,6 +223,7 @@ suites:
     excludes:
       - amazon-1
       - opensuse-15
+      - debian-11
       - fedora-32
       - fedora-33
       - arch
@@ -214,6 +233,7 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
       - amazon-1
+      - debian-11
       - opensuse-15
       - arch
   - name: py3-stable-3002-0
@@ -223,6 +243,7 @@ suites:
     excludes:
       - amazon-1
       - opensuse-15
+      - debian-11
       - fedora-32
       - fedora-33
       - arch

From 6ddf62a3f0aa42d33df9b835dbd4ae5fc1a40f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= <ivo.jansky@gmail.com>
Date: Fri, 11 Dec 2020 16:54:21 +0100
Subject: [PATCH 022/135] Gentoo - install Salt 3000 (GIT) with Python 3.7.

---
 .kitchen.yml      |  8 +++++--
 bootstrap-salt.sh | 54 +++++++++++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index 55c85791f..7bf537b95 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -86,14 +86,18 @@ platforms:
       run_command: /sbin/init
       provision_command:
         - rc-update add sshd default
-        - emerge --update --deep --with-bdeps=y --newuse @world
+        - emerge --update --deep --with-bdeps=y --newuse --quiet @world
+        - emerge --depclean --quiet
+        - eselect python set python3.8
   - name: gentoo-systemd
     driver_config:
       image: gentoo/stage3:systemd
       run_command: /lib/systemd/systemd
       provision_command:
         - systemctl enable sshd.service
-        - emerge --update --deep --with-bdeps=y --newuse @world
+        - emerge --update --deep --with-bdeps=y --newuse --quiet @world
+        - emerge --depclean --quiet
+        - eselect python set python3.8
   - name: opensuse-15
     driver_config:
       image: opensuse/leap:15.1
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 113873bbc..3f88bb41b 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -7070,10 +7070,20 @@ __gentoo_pre_dep() {
         mkdir /etc/portage
     fi
 
-    # Enable python 3.6 if installing pre Neon Salt release
+    # Enable Python 3.6 target for pre Neon Salt release
     if echo "${STABLE_REV}" | grep -q "2019" || [ "${ITYPE}" = "git" ] && [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
-        if ! emerge --info | sed 's/.*\(PYTHON_TARGETS="[^"]*"\).*/\1/' | grep -q 'python3_6' ; then
-            echo "PYTHON_TARGETS=\"\${PYTHON_TARGETS} python3_6\"" >> /etc/portage/make.conf
+        EXTRA_PYTHON_TARGET=python3_6
+    fi
+
+    # Enable Python 3.7 target for Salt Neon using GIT
+    if [ "${ITYPE}" = "git" ] && [ "${GIT_REV}" = "v3000" ]; then
+        EXTRA_PYTHON_TARGET=python3_7
+    fi
+
+    if [ -n "${EXTRA_PYTHON_TARGET:-}" ]; then
+        if ! emerge --info | sed 's/.*\(PYTHON_TARGETS="[^"]*"\).*/\1/' | grep -q "${EXTRA_PYTHON_TARGET}" ; then
+            echo "PYTHON_TARGETS=\"\${PYTHON_TARGETS} ${EXTRA_PYTHON_TARGET}\"" >> /etc/portage/make.conf
+            emerge --update --deep --with-bdeps=y --newuse --quiet @world
         fi
     fi
 }
@@ -7117,26 +7127,19 @@ install_gentoo_deps() {
 install_gentoo_git_deps() {
     __gentoo_pre_dep || return 1
 
-    GENTOO_GIT_PACKAGES=""
-
     # Install pip if it does not exist
     if ! __check_command_exists pip ; then
-        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES} dev-python/pip"
+        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES:-} dev-python/pip"
     fi
 
     # Install GIT if it does not exist
     if ! __check_command_exists git ; then
-        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES} dev-vcs/git"
+        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES:-} dev-vcs/git"
     fi
 
     # Salt <3000 does not automatically install dependencies. It has to be done manually.
     if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
-        # Install Python 3.6 if it does not exist
-        if ! __check_command_exists python3.6 ; then
-            GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES} dev-lang/python:3.6"
-        fi
-
-        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES}
+        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES:-}
             sys-apps/pciutils
             dev-python/pyyaml
             dev-python/pyzmq
@@ -7157,10 +7160,10 @@ install_gentoo_git_deps() {
 
     # Install libcloud when Salt Cloud support was requested
     if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
-        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES} dev-python/libcloud"
+        GENTOO_GIT_PACKAGES="${GENTOO_GIT_PACKAGES:-} dev-python/libcloud"
     fi
 
-    if [ -n "${GENTOO_GIT_PACKAGES}" ]; then
+    if [ -n "${GENTOO_GIT_PACKAGES:-}" ]; then
         # shellcheck disable=SC2086
         __autounmask ${GENTOO_GIT_PACKAGES} || return 1
         # shellcheck disable=SC2086
@@ -7186,16 +7189,21 @@ install_gentoo_stable() {
 }
 
 install_gentoo_git() {
-    if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then
-        __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1
-        return 0
-    fi
+    _PYEXE=${_PY_EXE}
 
-    # Tornado 4.3 ebuild supports only Python 3.6, use Python 3.6 as the default Python 3 interpreter
     if [ "$_PY_EXE" = "python3" ] || [ -z "$_PY_EXE" ]; then
-        _PYEXE=python3.6
-    else
-        _PYEXE=${_PY_EXE}
+        if [ "${GIT_REV}" = "v3000" ]; then
+            # Salt Neon does not support Python 3.8 and greater
+            _PYEXE=python3.7
+        elif [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
+            # Tornado 4.3 ebuild supports only Python 3.6, use Python 3.6 as the default Python 3 interpreter
+            _PYEXE=python3.6
+        fi
+    fi
+
+    if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then
+        __install_salt_from_repo_post_neon "${_PYEXE}" || return 1
+        return 0
     fi
 
     if [ -f "${_SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then

From 49351b08d5fd3a333c7cf32cfbf4f50ee84c50f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= <ivo.jansky@gmail.com>
Date: Fri, 11 Dec 2020 16:55:28 +0100
Subject: [PATCH 023/135] Gentoo - disable x.0 version tests.

---
 .github/workflows/main-branch-only.yml  | 224 +++---------------------
 .github/workflows/templates/generate.py |   8 +-
 .kitchen.yml                            |   4 +
 3 files changed, 30 insertions(+), 206 deletions(-)

diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index d04e1bcba..b1e95641a 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -11,7 +11,7 @@ jobs:
   py3-stable-2019-2-gentoo:
     name: Gentoo v2019.2 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -57,7 +57,7 @@ jobs:
   py3-git-2019-2-gentoo:
     name: Gentoo v2019.2 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -103,7 +103,7 @@ jobs:
   py3-stable-3000-gentoo:
     name: Gentoo v3000 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -149,7 +149,7 @@ jobs:
   py3-git-3000-gentoo:
     name: Gentoo v3000 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -195,7 +195,7 @@ jobs:
   py3-stable-3001-gentoo:
     name: Gentoo v3001 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -241,7 +241,7 @@ jobs:
   py3-git-3001-gentoo:
     name: Gentoo v3001 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -284,56 +284,10 @@ jobs:
           bundle exec kitchen destroy py3-git-3001-gentoo
 
 
-  py3-stable-3001-0-gentoo:
-    name: Gentoo v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-gentoo || bundle exec kitchen create py3-stable-3001-0-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-gentoo
-
-
   py3-stable-3002-gentoo:
     name: Gentoo v3002 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -379,7 +333,7 @@ jobs:
   py3-git-3002-gentoo:
     name: Gentoo v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -422,56 +376,10 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-gentoo
 
 
-  py3-stable-3002-0-gentoo:
-    name: Gentoo v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-gentoo || bundle exec kitchen create py3-stable-3002-0-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-gentoo
-
-
   py3-git-master-gentoo:
     name: Gentoo Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -517,7 +425,7 @@ jobs:
   latest-gentoo:
     name: Gentoo Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -563,7 +471,7 @@ jobs:
   py3-stable-2019-2-gentoo-systemd:
     name: Gentoo (systemd) v2019.2 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -609,7 +517,7 @@ jobs:
   py3-git-2019-2-gentoo-systemd:
     name: Gentoo (systemd) v2019.2 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -655,7 +563,7 @@ jobs:
   py3-stable-3000-gentoo-systemd:
     name: Gentoo (systemd) v3000 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -701,7 +609,7 @@ jobs:
   py3-git-3000-gentoo-systemd:
     name: Gentoo (systemd) v3000 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -747,7 +655,7 @@ jobs:
   py3-stable-3001-gentoo-systemd:
     name: Gentoo (systemd) v3001 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -793,7 +701,7 @@ jobs:
   py3-git-3001-gentoo-systemd:
     name: Gentoo (systemd) v3001 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -836,56 +744,10 @@ jobs:
           bundle exec kitchen destroy py3-git-3001-gentoo-systemd
 
 
-  py3-stable-3001-0-gentoo-systemd:
-    name: Gentoo (systemd) v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-gentoo-systemd || bundle exec kitchen create py3-stable-3001-0-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-gentoo-systemd
-
-
   py3-stable-3002-gentoo-systemd:
     name: Gentoo (systemd) v3002 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -931,7 +793,7 @@ jobs:
   py3-git-3002-gentoo-systemd:
     name: Gentoo (systemd) v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -974,56 +836,10 @@ jobs:
           bundle exec kitchen destroy py3-git-3002-gentoo-systemd
 
 
-  py3-stable-3002-0-gentoo-systemd:
-    name: Gentoo (systemd) v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 50
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-gentoo-systemd || bundle exec kitchen create py3-stable-3002-0-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-gentoo-systemd
-
-
   py3-git-master-gentoo-systemd:
     name: Gentoo (systemd) Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
@@ -1069,7 +885,7 @@ jobs:
   latest-gentoo-systemd:
     name: Gentoo (systemd) Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 70
 
 
 
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 803633639..f3bb1b42a 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -76,10 +76,14 @@
 
 BLACKLIST_3001_0 = [
     "debian-11",
+    "gentoo",
+    "gentoo-systemd",
 ]
 
 BLACKLIST_3002_0 = [
     "debian-11",
+    "gentoo",
+    "gentoo-systemd",
 ]
 
 SALT_BRANCHES = [
@@ -131,8 +135,8 @@
 
 TIMEOUT_DEFAULT = 20
 TIMEOUT_OVERRIDES = {
-    "gentoo": 50,
-    "gentoo-systemd": 50,
+    "gentoo": 70,
+    "gentoo-systemd": 70,
 }
 BRANCH_ONLY_OVERRIDES = [
     "gentoo",
diff --git a/.kitchen.yml b/.kitchen.yml
index 7bf537b95..ef18b9aa1 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -231,6 +231,8 @@ suites:
       - fedora-32
       - fedora-33
       - arch
+      - gentoo
+      - gentoo-systemd
   - name: py3-stable-3001
     provisioner:
       salt_version: 3001
@@ -251,6 +253,8 @@ suites:
       - fedora-32
       - fedora-33
       - arch
+      - gentoo
+      - gentoo-systemd
   - name: py3-stable-3002
     provisioner:
       salt_version: 3002

From 6dbdbcbe348ac7d31626cf54618a7672b95d70b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= <ivo.jansky@gmail.com>
Date: Sat, 12 Dec 2020 14:48:49 +0100
Subject: [PATCH 024/135] Gentoo - install Salt 2019 (GIT) with msgpack <1.0.

---
 .github/workflows/main-branch-only.yml  | 40 ++++++++++++-------------
 .github/workflows/templates/generate.py |  4 +--
 bootstrap-salt.sh                       |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index b1e95641a..fa471b62d 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -11,7 +11,7 @@ jobs:
   py3-stable-2019-2-gentoo:
     name: Gentoo v2019.2 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -57,7 +57,7 @@ jobs:
   py3-git-2019-2-gentoo:
     name: Gentoo v2019.2 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -103,7 +103,7 @@ jobs:
   py3-stable-3000-gentoo:
     name: Gentoo v3000 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -149,7 +149,7 @@ jobs:
   py3-git-3000-gentoo:
     name: Gentoo v3000 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -195,7 +195,7 @@ jobs:
   py3-stable-3001-gentoo:
     name: Gentoo v3001 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -241,7 +241,7 @@ jobs:
   py3-git-3001-gentoo:
     name: Gentoo v3001 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -287,7 +287,7 @@ jobs:
   py3-stable-3002-gentoo:
     name: Gentoo v3002 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -333,7 +333,7 @@ jobs:
   py3-git-3002-gentoo:
     name: Gentoo v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -379,7 +379,7 @@ jobs:
   py3-git-master-gentoo:
     name: Gentoo Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -425,7 +425,7 @@ jobs:
   latest-gentoo:
     name: Gentoo Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -471,7 +471,7 @@ jobs:
   py3-stable-2019-2-gentoo-systemd:
     name: Gentoo (systemd) v2019.2 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -517,7 +517,7 @@ jobs:
   py3-git-2019-2-gentoo-systemd:
     name: Gentoo (systemd) v2019.2 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -563,7 +563,7 @@ jobs:
   py3-stable-3000-gentoo-systemd:
     name: Gentoo (systemd) v3000 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -609,7 +609,7 @@ jobs:
   py3-git-3000-gentoo-systemd:
     name: Gentoo (systemd) v3000 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -655,7 +655,7 @@ jobs:
   py3-stable-3001-gentoo-systemd:
     name: Gentoo (systemd) v3001 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -701,7 +701,7 @@ jobs:
   py3-git-3001-gentoo-systemd:
     name: Gentoo (systemd) v3001 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -747,7 +747,7 @@ jobs:
   py3-stable-3002-gentoo-systemd:
     name: Gentoo (systemd) v3002 Py3 Stable
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -793,7 +793,7 @@ jobs:
   py3-git-3002-gentoo-systemd:
     name: Gentoo (systemd) v3002 Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -839,7 +839,7 @@ jobs:
   py3-git-master-gentoo-systemd:
     name: Gentoo (systemd) Master Py3 Git
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
@@ -885,7 +885,7 @@ jobs:
   latest-gentoo-systemd:
     name: Gentoo (systemd) Latest packaged release
     runs-on: ubuntu-latest
-    timeout-minutes: 70
+    timeout-minutes: 90
 
 
 
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index f3bb1b42a..0010c232c 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -135,8 +135,8 @@
 
 TIMEOUT_DEFAULT = 20
 TIMEOUT_OVERRIDES = {
-    "gentoo": 70,
-    "gentoo-systemd": 70,
+    "gentoo": 90,
+    "gentoo-systemd": 90,
 }
 BRANCH_ONLY_OVERRIDES = [
     "gentoo",
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 3f88bb41b..67b0cfc05 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -7147,7 +7147,7 @@ install_gentoo_git_deps() {
             dev-python/pycryptodome
             dev-python/py
             dev-python/requests
-            dev-python/msgpack
+            <dev-python/msgpack-1.0
             dev-python/jinja
             dev-python/pyasn1
             dev-python/markupsafe

From 9a5a318d7ad274eba3af9272ed99e55b931b0c2c Mon Sep 17 00:00:00 2001
From: ScriptAutomate <derek@icanteven.io>
Date: Tue, 15 Dec 2020 17:34:01 -0600
Subject: [PATCH 025/135] Adding examples using stable; adding help output

---
 README.rst | 169 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 159 insertions(+), 10 deletions(-)

diff --git a/README.rst b/README.rst
index d188a799e..be62e573a 100644
--- a/README.rst
+++ b/README.rst
@@ -71,6 +71,127 @@ process.
 Examples
 --------
 
+To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` and the terminal:
+
+.. code:: console
+
+  ./salt-bootstrap.sh -h
+
+  Usage :  bootstrap-salt.sh [options] <install-type> [install-type-args]
+
+  Installation types:
+    - stable              Install latest stable release. This is the default
+                          install type
+    - stable [branch]     Install latest version on a branch. Only supported
+                          for packages available at repo.saltstack.com
+    - stable [version]    Install a specific version. Only supported for
+                          packages available at repo.saltstack.com
+                          To pin a 3xxx minor version, specify it as 3xxx.0
+    - testing             RHEL-family specific: configure EPEL testing repo
+    - git                 Install from the head of the master branch
+    - git [ref]           Install from any git ref (such as a branch, tag, or
+                          commit)
+
+  Examples:
+    - bootstrap-salt.sh
+    - bootstrap-salt.sh stable
+    - bootstrap-salt.sh stable 2017.7
+    - bootstrap-salt.sh stable 2017.7.2
+    - bootstrap-salt.sh testing
+    - bootstrap-salt.sh git
+    - bootstrap-salt.sh git 2017.7
+    - bootstrap-salt.sh git v2017.7.2
+    - bootstrap-salt.sh git 06f249901a2e2f1ed310d58ea3921a129f214358
+
+  Options:
+    -h  Display this message
+    -v  Display script version
+    -n  No colours
+    -D  Show debug output
+    -c  Temporary configuration directory
+    -g  Salt Git repository URL. Default: https://github.com/saltstack/salt.git
+    -w  Install packages from downstream package repository rather than
+        upstream, saltstack package repository. This is currently only
+        implemented for SUSE.
+    -k  Temporary directory holding the minion keys which will pre-seed
+        the master.
+    -s  Sleep time used when waiting for daemons to start, restart and when
+        checking for the services running. Default: 3
+    -L  Also install salt-cloud and required python-libcloud package
+    -M  Also install salt-master
+    -S  Also install salt-syndic
+    -N  Do not install salt-minion
+    -X  Do not start daemons after installation
+    -d  Disables checking if Salt services are enabled to start on system boot.
+        You can also do this by touching /tmp/disable_salt_checks on the target
+        host. Default: ${BS_FALSE}
+    -P  Allow pip based installations. On some distributions the required salt
+        packages or its dependencies are not available as a package for that
+        distribution. Using this flag allows the script to use pip as a last
+        resort method. NOTE: This only works for functions which actually
+        implement pip based installations.
+    -U  If set, fully upgrade the system prior to bootstrapping Salt
+    -I  If set, allow insecure connections while downloading any files. For
+        example, pass '--no-check-certificate' to 'wget' or '--insecure' to
+        'curl'. On Debian and Ubuntu, using this option with -U allows obtaining
+        GnuPG archive keys insecurely if distro has changed release signatures.
+    -F  Allow copied files to overwrite existing (config, init.d, etc)
+    -K  If set, keep the temporary files in the temporary directories specified
+        with -c and -k
+    -C  Only run the configuration function. Implies -F (forced overwrite).
+        To overwrite Master or Syndic configs, -M or -S, respectively, must
+        also be specified. Salt installation will be ommitted, but some of the
+        dependencies could be installed to write configuration with -j or -J.
+    -A  Pass the salt-master DNS name or IP. This will be stored under
+        ${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf
+    -i  Pass the salt-minion id. This will be stored under
+        ${BS_SALT_ETC_DIR}/minion_id
+    -p  Extra-package to install while installing Salt dependencies. One package
+        per -p flag. You are responsible for providing the proper package name.
+    -H  Use the specified HTTP proxy for all download URLs (including https://).
+        For example: http://myproxy.example.com:3128
+    -b  Assume that dependencies are already installed and software sources are
+        set up. If git is selected, git tree is still checked out as dependency
+        step.
+    -f  Force shallow cloning for git installations.
+        This may result in an "n/a" in the version number.
+    -l  Disable ssl checks. When passed, switches "https" calls to "http" where
+        possible.
+    -V  Install Salt into virtualenv
+        (only available for Ubuntu based distributions)
+    -a  Pip install all Python pkg dependencies for Salt. Requires -V to install
+        all pip pkgs into the virtualenv.
+        (Only available for Ubuntu based distributions)
+    -r  Disable all repository configuration performed by this script. This
+        option assumes all necessary repository configuration is already present
+        on the system.
+    -R  Specify a custom repository URL. Assumes the custom repository URL
+        points to a repository that mirrors Salt packages located at
+        repo.saltstack.com. The option passed with -R replaces the
+        "repo.saltstack.com". If -R is passed, -r is also set. Currently only
+        works on CentOS/RHEL and Debian based distributions.
+    -J  Replace the Master config file with data passed in as a JSON string. If
+        a Master config file is found, a reasonable effort will be made to save
+        the file with a ".bak" extension. If used in conjunction with -C or -F,
+        no ".bak" file will be created as either of those options will force
+        a complete overwrite of the file.
+    -j  Replace the Minion config file with data passed in as a JSON string. If
+        a Minion config file is found, a reasonable effort will be made to save
+        the file with a ".bak" extension. If used in conjunction with -C or -F,
+        no ".bak" file will be created as either of those options will force
+        a complete overwrite of the file.
+    -q  Quiet salt installation from git (setup.py install -q)
+    -x  Changes the Python version used to install Salt.
+        For CentOS 6 git installations python2.7 is supported.
+        Fedora git installation, CentOS 7, Debian 9, Ubuntu 16.04 and 18.04 support python3.
+    -y  Installs a different python version on host. Currently this has only been
+        tested with CentOS 6 and is considered experimental. This will install the
+        ius repo on the box if disable repo is false. This must be used in conjunction
+        with -x <pythonversion>.  For example:
+            sh bootstrap.sh -P -y -x python2.7 git v2017.7.2
+        The above will install python27 and install the git version of salt using the
+        python2.7 executable. This only works for git and pip installations.
+
 The Salt Bootstrap script has a wide variety of options that can be passed as
 well as several ways of obtaining the bootstrap script itself. Note that the use of ``sudo``
 is not needed when running these commands as the ``root`` user.
@@ -85,19 +206,26 @@ Run the script without any parameters to get latest stable Salt packages for you
 Install using curl
 ~~~~~~~~~~~~~~~~~~
 
-Using ``curl`` to install latest development version from GitHub:
+If you want to install a package of a specific release version, from the SaltStack repo:
 
 .. code:: console
 
   curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-  sudo sh bootstrap-salt.sh git master
+  sudo sh bootstrap-salt.sh -P stable 3002.2
 
-If you want to install a specific release version (based on the Git tags):
+If you want to install a specific release version, based on the Git tags:
 
 .. code:: console
 
   curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
-  sudo sh bootstrap-salt.sh git v2016.11.5
+  sudo sh bootstrap-salt.sh git v3002.2
+
+Using ``curl`` to install latest development version from GitHub:
+
+.. code:: console
+
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh git master
 
 To install a specific branch from a Git fork:
 
@@ -113,7 +241,15 @@ If all you want is to install a ``salt-master`` using latest Git:
   curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
   sudo sh bootstrap-salt.sh -M -N git master
 
-If your host has Internet access only via HTTP proxy:
+If your host has Internet access only via HTTP proxy, from the SaltStack repo:
+
+.. code:: console
+
+  PROXY='http://user:password@myproxy.example.com:3128'
+  curl -o bootstrap-salt.sh -L -x "$PROXY" https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh -P -H "$PROXY" stable
+
+If your host has Internet access only via HTTP proxy, installing via Git:
 
 .. code:: console
 
@@ -137,11 +273,18 @@ Installing a specific version from git using ``wget``:
 .. code:: console
 
   wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
-  sudo sh bootstrap-salt.sh -P git v2016.11.5
+  sudo sh bootstrap-salt.sh git v3002.2
+
+Installing a specific version package from the SaltStack repo using ``wget``:
+
+.. code:: console
+
+  wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh -P stable 3002.2
 
 **NOTE**
 
-On the above example we added ``-P`` which will allow PIP packages to be installed if required.
+On the above examples we added ``-P`` which will allow PIP packages to be installed if required.
 However, the ``-P`` flag is not necessary for Git-based bootstraps.
 
 
@@ -153,7 +296,7 @@ If you already have Python installed, ``python 2.7``, then it's as easy as:
 .. code:: console
 
   python -m urllib "https://bootstrap.saltstack.com" > bootstrap-salt.sh
-  sudo sh bootstrap-salt.sh git master
+  sudo sh bootstrap-salt.sh -P stable 3002.2
 
 With python version 2, the following in-line code should always work:
 
@@ -167,7 +310,7 @@ With python version 3:
 .. code:: console
 
   python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read().decode("ascii"))' > bootstrap-salt.sh
-  sudo sh bootstrap-salt.sh git develop
+  sudo sh bootstrap-salt.sh git v3002.2
 
 Install using fetch
 ~~~~~~~~~~~~~~~~~~~
@@ -224,7 +367,13 @@ Using ``wget`` to install your distribution's stable packages:
 
   wget -O - https://bootstrap.saltstack.com | sudo sh
 
-Installing the latest master branch of Salt:
+Installing a target version package of Salt from the SaltStack repo:
+
+.. code:: console
+
+  curl -L https://bootstrap.saltstack.com | sudo sh -s -- stable 3002.2
+
+Installing the latest master branch of Salt from git:
 
 .. code:: console
 

From bd2d410e3c5db1a69c633f8cbd1a18b085627086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= <ivo.jansky@gmail.com>
Date: Sat, 19 Dec 2020 08:43:42 +0100
Subject: [PATCH 026/135] Gentoo - use ksmanis/stage3 image

Use an alternative image until gentoo/stage3 gets pushed to Docker Hub again.
---
 .kitchen.yml      | 10 ++--------
 bootstrap-salt.sh |  4 +++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index ef18b9aa1..56a0716d2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -82,22 +82,16 @@ platforms:
         - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
   - name: gentoo
     driver_config:
-      image: gentoo/stage3:latest
+      image: ksmanis/stage3:latest
       run_command: /sbin/init
       provision_command:
         - rc-update add sshd default
-        - emerge --update --deep --with-bdeps=y --newuse --quiet @world
-        - emerge --depclean --quiet
-        - eselect python set python3.8
   - name: gentoo-systemd
     driver_config:
-      image: gentoo/stage3:systemd
+      image: ksmanis/stage3:systemd
       run_command: /lib/systemd/systemd
       provision_command:
         - systemctl enable sshd.service
-        - emerge --update --deep --with-bdeps=y --newuse --quiet @world
-        - emerge --depclean --quiet
-        - eselect python set python3.8
   - name: opensuse-15
     driver_config:
       image: opensuse/leap:15.1
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 67b0cfc05..12308b36f 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -7083,7 +7083,7 @@ __gentoo_pre_dep() {
     if [ -n "${EXTRA_PYTHON_TARGET:-}" ]; then
         if ! emerge --info | sed 's/.*\(PYTHON_TARGETS="[^"]*"\).*/\1/' | grep -q "${EXTRA_PYTHON_TARGET}" ; then
             echo "PYTHON_TARGETS=\"\${PYTHON_TARGETS} ${EXTRA_PYTHON_TARGET}\"" >> /etc/portage/make.conf
-            emerge --update --deep --with-bdeps=y --newuse --quiet @world
+            emerge --deep --with-bdeps=y --newuse --quiet @world
         fi
     fi
 }
@@ -7198,6 +7198,8 @@ install_gentoo_git() {
         elif [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
             # Tornado 4.3 ebuild supports only Python 3.6, use Python 3.6 as the default Python 3 interpreter
             _PYEXE=python3.6
+        else
+            _PYEXE=$(emerge --info | grep -oE 'PYTHON_SINGLE_TARGET="[^"]*"' | sed -e 's/"//g' -e 's/_/./g' | cut -d= -f2)
         fi
     fi
 

From 2d68b299f8a48f403cae7cb491c0b43a2d9bcdd0 Mon Sep 17 00:00:00 2001
From: Marek Knappe <marek.knappe@gmail.com>
Date: Mon, 11 Jan 2021 15:15:28 +1000
Subject: [PATCH 027/135] Added www/py-tornado4 package as requirment for
 freebsd #1521

---
 bootstrap-salt.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 12308b36f..e0743d79d 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5835,6 +5835,8 @@ install_freebsd_git_deps() {
         /usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} python || return 1
 
         /usr/local/sbin/pkg install -y py37-requests || return 1
+        /usr/local/sbin/pkg install -y py37-tornado4 || return 1
+
     else
         /usr/local/sbin/pkg install -y python py37-pip py37-setuptools libzmq4 libunwind || return 1
     fi

From 18554748529a17c8acd41fd791eae71d943ab3c8 Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 12 Jan 2021 08:33:51 -0700
Subject: [PATCH 028/135] FreeBSD also needs the _PKI_DIR reset

---
 bootstrap-salt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index e0743d79d..83ba10702 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5812,6 +5812,7 @@ install_arch_check_services() {
 # Using a separate conf step to head for idempotent install...
 __configure_freebsd_pkg_details() {
     _SALT_ETC_DIR="/usr/local/etc/salt"
+    _PKI_DIR=${_SALT_ETC_DIR}/pki
     _POST_NEON_PIP_INSTALL_ARGS="--prefix=/usr/local"
 }
 

From 2aac4774a27afdddab5c56dfa8c27d46e3390089 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Thu, 21 Jan 2021 22:44:46 +0000
Subject: [PATCH 029/135] move everything to point at saltproject.io urls

---
 AUTHORS.rst        |  2 +-
 CONTRIBUTING.md    |  2 +-
 LICENSE            |  2 +-
 README.rst         | 64 +++++++++++++++++++++++-----------------------
 bootstrap-salt.ps1 |  6 ++---
 bootstrap-salt.sh  | 24 ++++++++---------
 6 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index c9c70bbb1..365e122dd 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -30,7 +30,7 @@ Brandon Clifford            brandon099             brandon.clifford@vivint.com
 Bret Fisher                 BretFisher             bret@fishbrains.com
 Brian Kruger                bkruger99              brian.kruger@elliemae.com
 bruce-one                   bruce-one
-Bryce Larson                bryceml                blarson@saltstack.com
+Bryce Larson                bryceml                brycel@vmware.com
 C. R. Oldham                cro                    cr@saltstack.com
 Cam                         camereonsparr
 Charles McLaughlin          cmclaughlin
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ee7b0a8b..259448d52 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -166,7 +166,7 @@ The release process consists of the following steps:
 1. Update the version number in the bootstrap script. The version number is date-based, `<year.month.day>`.
    For example, version `2018.08.15` was released on August 15, 2018.
 1. Merge the `develop` branch into the `stable` branch.
-1. Update `bootstrap.saltstack.com` with the new stable release. The checksum on the
+1. Update `bootstrap.saltproject.io` with the new stable release. The checksum on the
    [README page](https://github.com/saltstack/salt-bootstrap/blob/develop/README.rst)
    should also be updated.
 1. Merge the new stable release into [Salt](https://github.com/saltstack/salt).
diff --git a/LICENSE b/LICENSE
index 31ccb1480..1dd656bc8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
    Salt Bootstrap - Generic Salt Bootstrap Script
 
-   Copyright 2012-2019 SaltStack (saltstack.com)
+   Copyright 2012-2021 SaltStack (saltproject.io)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.rst b/README.rst
index be62e573a..10ea3861c 100644
--- a/README.rst
+++ b/README.rst
@@ -56,8 +56,8 @@ If you're looking for a *one-liner* to install Salt, please scroll to the bottom
 instructions for `Installing via an Insecure One-Liner`_.
 
 There are also .sha256 files for verifying against in the repo for the stable branch.  You can also
-get the correct sha256 sum for the stable release from https://bootstrap.saltstack.com/sha256 and
-https://winbootstrap.saltstack.com/sha256
+get the correct sha256 sum for the stable release from https://bootstrap.saltproject.io/sha256 and
+https://winbootstrap.saltproject.io/sha256
 
 Contributing
 ------------
@@ -83,9 +83,9 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a
     - stable              Install latest stable release. This is the default
                           install type
     - stable [branch]     Install latest version on a branch. Only supported
-                          for packages available at repo.saltstack.com
+                          for packages available at repo.saltproject.io
     - stable [version]    Install a specific version. Only supported for
-                          packages available at repo.saltstack.com
+                          packages available at repo.saltproject.io
                           To pin a 3xxx minor version, specify it as 3xxx.0
     - testing             RHEL-family specific: configure EPEL testing repo
     - git                 Install from the head of the master branch
@@ -167,8 +167,8 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a
         on the system.
     -R  Specify a custom repository URL. Assumes the custom repository URL
         points to a repository that mirrors Salt packages located at
-        repo.saltstack.com. The option passed with -R replaces the
-        "repo.saltstack.com". If -R is passed, -r is also set. Currently only
+        repo.saltproject.io. The option passed with -R replaces the
+        "repo.saltproject.io". If -R is passed, -r is also set. Currently only
         works on CentOS/RHEL and Debian based distributions.
     -J  Replace the Master config file with data passed in as a JSON string. If
         a Master config file is found, a reasonable effort will be made to save
@@ -210,35 +210,35 @@ If you want to install a package of a specific release version, from the SaltSta
 
 .. code:: console
 
-  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh -P stable 3002.2
 
 If you want to install a specific release version, based on the Git tags:
 
 .. code:: console
 
-  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh git v3002.2
 
 Using ``curl`` to install latest development version from GitHub:
 
 .. code:: console
 
-  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh git master
 
 To install a specific branch from a Git fork:
 
 .. code:: console
 
-  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh -g https://github.com/myuser/salt.git git mybranch
 
 If all you want is to install a ``salt-master`` using latest Git:
 
 .. code:: console
 
-  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh -M -N git master
 
 If your host has Internet access only via HTTP proxy, from the SaltStack repo:
@@ -246,7 +246,7 @@ If your host has Internet access only via HTTP proxy, from the SaltStack repo:
 .. code:: console
 
   PROXY='http://user:password@myproxy.example.com:3128'
-  curl -o bootstrap-salt.sh -L -x "$PROXY" https://bootstrap.saltstack.com
+  curl -o bootstrap-salt.sh -L -x "$PROXY" https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh -P -H "$PROXY" stable
 
 If your host has Internet access only via HTTP proxy, installing via Git:
@@ -254,7 +254,7 @@ If your host has Internet access only via HTTP proxy, installing via Git:
 .. code:: console
 
   PROXY='http://user:password@myproxy.example.com:3128'
-  curl -o bootstrap-salt.sh -L -x "$PROXY" https://bootstrap.saltstack.com
+  curl -o bootstrap-salt.sh -L -x "$PROXY" https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh -H "$PROXY" git
 
 
@@ -265,21 +265,21 @@ Using ``wget`` to install your distribution's stable packages:
 
 .. code:: console
 
-  wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
+  wget -O bootstrap-salt.sh https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh
 
 Installing a specific version from git using ``wget``:
 
 .. code:: console
 
-  wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
+  wget -O bootstrap-salt.sh https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh git v3002.2
 
 Installing a specific version package from the SaltStack repo using ``wget``:
 
 .. code:: console
 
-  wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
+  wget -O bootstrap-salt.sh https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh -P stable 3002.2
 
 **NOTE**
@@ -295,21 +295,21 @@ If you already have Python installed, ``python 2.7``, then it's as easy as:
 
 .. code:: console
 
-  python -m urllib "https://bootstrap.saltstack.com" > bootstrap-salt.sh
+  python -m urllib "https://bootstrap.saltproject.io" > bootstrap-salt.sh
   sudo sh bootstrap-salt.sh -P stable 3002.2
 
 With python version 2, the following in-line code should always work:
 
 .. code:: console
 
-  python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > bootstrap-salt.sh
+  python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltproject.io").read()' > bootstrap-salt.sh
   sudo sh bootstrap-salt.sh git master
 
 With python version 3:
 
 .. code:: console
 
-  python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read().decode("ascii"))' > bootstrap-salt.sh
+  python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltproject.io").read().decode("ascii"))' > bootstrap-salt.sh
   sudo sh bootstrap-salt.sh git v3002.2
 
 Install using fetch
@@ -320,7 +320,7 @@ have ``fetch`` available though:
 
 .. code:: console
 
-  fetch -o bootstrap-salt.sh https://bootstrap.saltstack.com
+  fetch -o bootstrap-salt.sh https://bootstrap.saltproject.io
   sudo sh bootstrap-salt.sh
 
 If you have any SSL issues install ``ca_root_nss``:
@@ -359,25 +359,25 @@ Installing the latest stable release of Salt (default):
 
 .. code:: console
 
-  curl -L https://bootstrap.saltstack.com | sudo sh
+  curl -L https://bootstrap.saltproject.io | sudo sh
 
 Using ``wget`` to install your distribution's stable packages:
 
 .. code:: console
 
-  wget -O - https://bootstrap.saltstack.com | sudo sh
+  wget -O - https://bootstrap.saltproject.io | sudo sh
 
 Installing a target version package of Salt from the SaltStack repo:
 
 .. code:: console
 
-  curl -L https://bootstrap.saltstack.com | sudo sh -s -- stable 3002.2
+  curl -L https://bootstrap.saltproject.io | sudo sh -s -- stable 3002.2
 
 Installing the latest master branch of Salt from git:
 
 .. code:: console
 
-  curl -L https://bootstrap.saltstack.com | sudo sh -s -- git master
+  curl -L https://bootstrap.saltproject.io | sudo sh -s -- git master
 
 
 Install on Windows
@@ -387,7 +387,7 @@ Using ``PowerShell`` to install latest stable version:
 
 .. code:: console
 
-  Invoke-WebRequest -Uri https://winbootstrap.saltstack.com -OutFile C:\Temp\bootstrap-salt.ps1
+  Invoke-WebRequest -Uri https://winbootstrap.saltproject.io -OutFile C:\Temp\bootstrap-salt.ps1
   Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser
   C:\Temp\bootstrap-salt.ps1
   Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser
@@ -397,7 +397,7 @@ Using ``cygwin`` to install latest stable version:
 
 .. code:: console
 
-  curl -o bootstrap-salt.ps1 -L https://winbootstrap.saltstack.com
+  curl -o bootstrap-salt.ps1 -L https://winbootstrap.saltproject.io
   "/cygdrive/c/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ./bootstrap-salt.ps1"
 
 
@@ -640,16 +640,16 @@ Make edits to .drone.jsonnet and then save them into the .drone.yml by doing the
 
 .. _Contributing Guidelines: https://github.com/saltstack/salt-bootstrap/blob/develop/CONTRIBUTING.md
 .. _Docker: https://www.docker.com/
-.. _`pre-accepted Minion keys`: https://docs.saltstack.com/en/latest/topics/tutorials/preseed_key.html
+.. _`pre-accepted Minion keys`: https://docs.saltproject.io/en/latest/topics/tutorials/preseed_key.html
 .. _`read the source`: https://github.com/saltstack/salt-bootstrap/blob/develop/bootstrap-salt.sh
-.. _`Salt`: https://saltstack.com/community/
+.. _`Salt`: https://saltproject.io/
 .. _`Salt's Supported Operating Systems`: http://get.saltstack.com/rs/304-PHQ-615/images/SaltStack-Supported-Operating-Systems.pdf
-.. _`SaltStack's corporate repository`: https://repo.saltstack.com/
-.. _`SaltStack's Debian repository`: http://repo.saltstack.com/#debian
-.. _`SaltStack's Ubuntu repository`: http://repo.saltstack.com/#ubuntu
+.. _`SaltStack's corporate repository`: https://repo.saltproject.io/
+.. _`SaltStack's Debian repository`: http://repo.saltproject.io/#debian
+.. _`SaltStack's Ubuntu repository`: http://repo.saltproject.io/#ubuntu
 .. _`Ubuntu's release schedule`: https://wiki.ubuntu.com/Releases
 .. _Vagrant: http://www.vagrantup.com
-.. _hardening salt: https://docs.saltstack.com/en/latest/topics/hardening.html
+.. _hardening salt: https://docs.saltproject.io/en/latest/topics/hardening.html
 
 .. |build|  image:: https://github.com/saltstack/salt-bootstrap/workflows/Testing/badge.svg?branch=develop
     :target: https://github.com/saltstack/salt-bootstrap/actions?query=branch%3Adevelop
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index ffd39120c..826b701ab 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -57,7 +57,7 @@
     Name or IP of the master server. Installer defaults to "salt".
 
 .PARAMETER repourl
-    URL to the windows packages. Default is "https://repo.saltstack.com/windows"
+    URL to the windows packages. Default is "https://repo.saltproject.io/windows"
 
 .NOTES
     All of the parameters are optional. The default should be the latest
@@ -67,7 +67,7 @@
     Bootstrap GitHub Project (script home) - https://github.com/saltstack/salt-windows-bootstrap
     Original Vagrant Provisioner Project -https://github.com/saltstack/salty-vagrant
     Vagrant Project (utilizes this script) - https://github.com/mitchellh/vagrant
-    SaltStack Download Location - https://repo.saltstack.com/windows/
+    SaltStack Download Location - https://repo.saltproject.io/windows/
 #>
 
 #===============================================================================
@@ -98,7 +98,7 @@ Param(
     [string]$master = "not-specified",
 
     [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
-    [string]$repourl= "https://repo.saltstack.com/windows"
+    [string]$repourl= "https://repo.saltproject.io/windows"
 )
 
 # Powershell supports only TLS 1.0 by default. Add support for TLS 1.2
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 83ba10702..bf0c3dfc1 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -14,11 +14,11 @@
 #
 #          BUGS: https://github.com/saltstack/salt-bootstrap/issues
 #
-#     COPYRIGHT: (c) 2012-2018 by the SaltStack Team, see AUTHORS.rst for more
+#     COPYRIGHT: (c) 2012-2021 by the SaltStack Team, see AUTHORS.rst for more
 #                details.
 #
 #       LICENSE: Apache 2.0
-#  ORGANIZATION: SaltStack (saltstack.com)
+#  ORGANIZATION: SaltStack (saltproject.io)
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
@@ -267,7 +267,7 @@ _CUSTOM_REPO_URL="null"
 _CUSTOM_MASTER_CONFIG="null"
 _CUSTOM_MINION_CONFIG="null"
 _QUIET_GIT_INSTALLATION=$BS_FALSE
-_REPO_URL="repo.saltstack.com"
+_REPO_URL="repo.saltproject.io"
 _PY_EXE=""
 _INSTALL_PY="$BS_FALSE"
 _TORNADO_MAX_PY3_VERSION="5.0"
@@ -293,9 +293,9 @@ __usage() {
     - stable              Install latest stable release. This is the default
                           install type
     - stable [branch]     Install latest version on a branch. Only supported
-                          for packages available at repo.saltstack.com
+                          for packages available at repo.saltproject.io
     - stable [version]    Install a specific version. Only supported for
-                          packages available at repo.saltstack.com
+                          packages available at repo.saltproject.io
                           To pin a 3xxx minor version, specify it as 3xxx.0
     - testing             RHEL-family specific: configure EPEL testing repo
     - git                 Install from the head of the master branch
@@ -377,8 +377,8 @@ __usage() {
         on the system.
     -R  Specify a custom repository URL. Assumes the custom repository URL
         points to a repository that mirrors Salt packages located at
-        repo.saltstack.com. The option passed with -R replaces the
-        "repo.saltstack.com". If -R is passed, -r is also set. Currently only
+        repo.saltproject.io. The option passed with -R replaces the
+        "repo.saltproject.io". If -R is passed, -r is also set. Currently only
         works on CentOS/RHEL and Debian based distributions.
     -J  Replace the Master config file with data passed in as a JSON string. If
         a Master config file is found, a reasonable effort will be made to save
@@ -721,7 +721,7 @@ if [ "$ITYPE" != "git" ]; then
     fi
 fi
 
-# Set the _REPO_URL value based on if -R was passed or not. Defaults to repo.saltstack.com.
+# Set the _REPO_URL value based on if -R was passed or not. Defaults to repo.saltproject.io.
 if [ "$_CUSTOM_REPO_URL" != "null" ]; then
     _REPO_URL="$_CUSTOM_REPO_URL"
 
@@ -3345,9 +3345,9 @@ install_ubuntu_check_services() {
 #
 __install_saltstack_debian_repository() {
     if [ "$DISTRO_MAJOR_VERSION" -eq 11 ]; then
-        # Packages for Debian 11 at repo.saltstack.com are not yet available
+        # Packages for Debian 11 at repo.saltproject.io are not yet available
         # Set up repository for Debian 10 for Debian 11 for now until support
-        # is available at repo.saltstack.com for Debian 11.
+        # is available at repo.saltproject.io for Debian 11.
         echowarn "Debian 11 distribution detected, but stable packages requested. Trying packages from Debian 10. You may experience problems."
         DEBIAN_RELEASE="10"
         DEBIAN_CODENAME="buster"
@@ -6321,7 +6321,7 @@ __set_suse_pkg_repo() {
         suse_pkg_url_base="https://download.opensuse.org/repositories/systemsmanagement:/saltstack"
         suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack.repo"
     else
-        suse_pkg_url_base="${HTTP_VAL}://repo.saltstack.com/opensuse"
+        suse_pkg_url_base="${HTTP_VAL}://repo.saltproject.io/opensuse"
         suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack:products.repo"
     fi
     SUSE_PKG_URL="$suse_pkg_url_base/$suse_pkg_url_path"
@@ -7453,7 +7453,7 @@ __macosx_get_packagesite() {
     fi
 
     PKG="salt-${STABLE_REV}-${__PY_VERSION_REPO}-${DARWIN_ARCH}.pkg"
-    SALTPKGCONFURL="https://repo.saltstack.com/osx/${PKG}"
+    SALTPKGCONFURL="https://repo.saltproject.io/osx/${PKG}"
 }
 
 # Using a separate conf step to head for idempotent install...

From 4e067acf82873ac6bad663523813d134cffa17ac Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Thu, 21 Jan 2021 23:19:34 +0000
Subject: [PATCH 030/135] update supported oses

---
 .github/workflows/main-branch-only.yml  |  184 ---
 .github/workflows/main.yml              | 1996 +++++------------------
 .github/workflows/templates/generate.py |   21 -
 .kitchen.yml                            |   59 -
 4 files changed, 400 insertions(+), 1860 deletions(-)

diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index fa471b62d..8134361ea 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -8,98 +8,6 @@ on: [push]
 
 jobs:
 
-  py3-stable-2019-2-gentoo:
-    name: Gentoo v2019.2 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-2019-2-gentoo || bundle exec kitchen create py3-stable-2019-2-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-gentoo
-
-
-  py3-git-2019-2-gentoo:
-    name: Gentoo v2019.2 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-2019-2-gentoo || bundle exec kitchen create py3-git-2019-2-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-gentoo
-
-
   py3-stable-3000-gentoo:
     name: Gentoo v3000 Py3 Stable
     runs-on: ubuntu-latest
@@ -468,98 +376,6 @@ jobs:
           bundle exec kitchen destroy latest-gentoo
 
 
-  py3-stable-2019-2-gentoo-systemd:
-    name: Gentoo (systemd) v2019.2 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-2019-2-gentoo-systemd || bundle exec kitchen create py3-stable-2019-2-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-gentoo-systemd
-
-
-  py3-git-2019-2-gentoo-systemd:
-    name: Gentoo (systemd) v2019.2 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-2019-2-gentoo-systemd || bundle exec kitchen create py3-git-2019-2-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-gentoo-systemd
-
-
   py3-stable-3000-gentoo-systemd:
     name: Gentoo (systemd) v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6ff62563e..b4dce5532 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,8 +44,8 @@ jobs:
           shellcheck -s sh -f tty bootstrap-salt.sh
 
 
-  py2-stable-2019-2-amazon-2:
-    name: Amazon 2 v2019.2 Py2 Stable
+  py3-stable-3000-amazon-2:
+    name: Amazon 2 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -78,20 +78,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-amazon-2 || bundle exec kitchen create py2-stable-2019-2-amazon-2
+          bundle exec kitchen create py3-stable-3000-amazon-2 || bundle exec kitchen create py3-stable-3000-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-amazon-2
+          bundle exec kitchen verify py3-stable-3000-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-amazon-2
+          bundle exec kitchen destroy py3-stable-3000-amazon-2
 
 
-  py2-git-2019-2-amazon-2:
-    name: Amazon 2 v2019.2 Py2 Git
+  py3-git-3000-amazon-2:
+    name: Amazon 2 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -124,20 +124,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-amazon-2 || bundle exec kitchen create py2-git-2019-2-amazon-2
+          bundle exec kitchen create py3-git-3000-amazon-2 || bundle exec kitchen create py3-git-3000-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-amazon-2
+          bundle exec kitchen verify py3-git-3000-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-amazon-2
+          bundle exec kitchen destroy py3-git-3000-amazon-2
 
 
-  py3-stable-2019-2-amazon-2:
-    name: Amazon 2 v2019.2 Py3 Stable
+  py3-stable-3001-amazon-2:
+    name: Amazon 2 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -170,20 +170,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-amazon-2 || bundle exec kitchen create py3-stable-2019-2-amazon-2
+          bundle exec kitchen create py3-stable-3001-amazon-2 || bundle exec kitchen create py3-stable-3001-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-amazon-2
+          bundle exec kitchen verify py3-stable-3001-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-amazon-2
+          bundle exec kitchen destroy py3-stable-3001-amazon-2
 
 
-  py3-git-2019-2-amazon-2:
-    name: Amazon 2 v2019.2 Py3 Git
+  py3-git-3001-amazon-2:
+    name: Amazon 2 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -216,20 +216,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-amazon-2 || bundle exec kitchen create py3-git-2019-2-amazon-2
+          bundle exec kitchen create py3-git-3001-amazon-2 || bundle exec kitchen create py3-git-3001-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-amazon-2
+          bundle exec kitchen verify py3-git-3001-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-amazon-2
+          bundle exec kitchen destroy py3-git-3001-amazon-2
 
 
-  py3-stable-3000-amazon-2:
-    name: Amazon 2 v3000 Py3 Stable
+  py3-stable-3001-0-amazon-2:
+    name: Amazon 2 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -262,20 +262,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-amazon-2 || bundle exec kitchen create py3-stable-3000-amazon-2
+          bundle exec kitchen create py3-stable-3001-0-amazon-2 || bundle exec kitchen create py3-stable-3001-0-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-amazon-2
+          bundle exec kitchen verify py3-stable-3001-0-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-amazon-2
+          bundle exec kitchen destroy py3-stable-3001-0-amazon-2
 
 
-  py3-git-3000-amazon-2:
-    name: Amazon 2 v3000 Py3 Git
+  py3-stable-3002-amazon-2:
+    name: Amazon 2 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -308,20 +308,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-amazon-2 || bundle exec kitchen create py3-git-3000-amazon-2
+          bundle exec kitchen create py3-stable-3002-amazon-2 || bundle exec kitchen create py3-stable-3002-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-amazon-2
+          bundle exec kitchen verify py3-stable-3002-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-amazon-2
+          bundle exec kitchen destroy py3-stable-3002-amazon-2
 
 
-  py3-stable-3001-amazon-2:
-    name: Amazon 2 v3001 Py3 Stable
+  py3-git-3002-amazon-2:
+    name: Amazon 2 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -354,20 +354,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-amazon-2 || bundle exec kitchen create py3-stable-3001-amazon-2
+          bundle exec kitchen create py3-git-3002-amazon-2 || bundle exec kitchen create py3-git-3002-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-amazon-2
+          bundle exec kitchen verify py3-git-3002-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-amazon-2
+          bundle exec kitchen destroy py3-git-3002-amazon-2
 
 
-  py3-git-3001-amazon-2:
-    name: Amazon 2 v3001 Py3 Git
+  py3-stable-3002-0-amazon-2:
+    name: Amazon 2 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -400,20 +400,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-amazon-2 || bundle exec kitchen create py3-git-3001-amazon-2
+          bundle exec kitchen create py3-stable-3002-0-amazon-2 || bundle exec kitchen create py3-stable-3002-0-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-amazon-2
+          bundle exec kitchen verify py3-stable-3002-0-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-amazon-2
+          bundle exec kitchen destroy py3-stable-3002-0-amazon-2
 
 
-  py3-stable-3001-0-amazon-2:
-    name: Amazon 2 v3001.0 Py3 Stable
+  py3-git-master-amazon-2:
+    name: Amazon 2 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -446,20 +446,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-amazon-2 || bundle exec kitchen create py3-stable-3001-0-amazon-2
+          bundle exec kitchen create py3-git-master-amazon-2 || bundle exec kitchen create py3-git-master-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-amazon-2
+          bundle exec kitchen verify py3-git-master-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-amazon-2
+          bundle exec kitchen destroy py3-git-master-amazon-2
 
 
-  py3-stable-3002-amazon-2:
-    name: Amazon 2 v3002 Py3 Stable
+  latest-amazon-2:
+    name: Amazon 2 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -492,20 +492,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-amazon-2 || bundle exec kitchen create py3-stable-3002-amazon-2
+          bundle exec kitchen create latest-amazon-2 || bundle exec kitchen create latest-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-amazon-2
+          bundle exec kitchen verify latest-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-amazon-2
+          bundle exec kitchen destroy latest-amazon-2
 
 
-  py3-git-3002-amazon-2:
-    name: Amazon 2 v3002 Py3 Git
+  py3-git-3001-arch:
+    name: Arch v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -538,20 +538,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-amazon-2 || bundle exec kitchen create py3-git-3002-amazon-2
+          bundle exec kitchen create py3-git-3001-arch || bundle exec kitchen create py3-git-3001-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-amazon-2
+          bundle exec kitchen verify py3-git-3001-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-amazon-2
+          bundle exec kitchen destroy py3-git-3001-arch
 
 
-  py3-stable-3002-0-amazon-2:
-    name: Amazon 2 v3002.0 Py3 Stable
+  py3-git-3002-arch:
+    name: Arch v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -584,20 +584,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-amazon-2 || bundle exec kitchen create py3-stable-3002-0-amazon-2
+          bundle exec kitchen create py3-git-3002-arch || bundle exec kitchen create py3-git-3002-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-amazon-2
+          bundle exec kitchen verify py3-git-3002-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-amazon-2
+          bundle exec kitchen destroy py3-git-3002-arch
 
 
-  py3-git-master-amazon-2:
-    name: Amazon 2 Master Py3 Git
+  py3-git-master-arch:
+    name: Arch Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -630,20 +630,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-amazon-2 || bundle exec kitchen create py3-git-master-amazon-2
+          bundle exec kitchen create py3-git-master-arch || bundle exec kitchen create py3-git-master-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-amazon-2
+          bundle exec kitchen verify py3-git-master-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-amazon-2
+          bundle exec kitchen destroy py3-git-master-arch
 
 
-  latest-amazon-2:
-    name: Amazon 2 Latest packaged release
+  py3-stable-3000-centos-7:
+    name: CentOS 7 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -676,20 +676,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-amazon-2 || bundle exec kitchen create latest-amazon-2
+          bundle exec kitchen create py3-stable-3000-centos-7 || bundle exec kitchen create py3-stable-3000-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-amazon-2
+          bundle exec kitchen verify py3-stable-3000-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-amazon-2
+          bundle exec kitchen destroy py3-stable-3000-centos-7
 
 
-  py2-git-2019-2-arch:
-    name: Arch v2019.2 Py2 Git
+  py3-git-3000-centos-7:
+    name: CentOS 7 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -722,20 +722,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-arch || bundle exec kitchen create py2-git-2019-2-arch
+          bundle exec kitchen create py3-git-3000-centos-7 || bundle exec kitchen create py3-git-3000-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-arch
+          bundle exec kitchen verify py3-git-3000-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-arch
+          bundle exec kitchen destroy py3-git-3000-centos-7
 
 
-  py3-git-3001-arch:
-    name: Arch v3001 Py3 Git
+  py3-stable-3001-centos-7:
+    name: CentOS 7 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -768,20 +768,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-arch || bundle exec kitchen create py3-git-3001-arch
+          bundle exec kitchen create py3-stable-3001-centos-7 || bundle exec kitchen create py3-stable-3001-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-arch
+          bundle exec kitchen verify py3-stable-3001-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-arch
+          bundle exec kitchen destroy py3-stable-3001-centos-7
 
 
-  py3-git-3002-arch:
-    name: Arch v3002 Py3 Git
+  py3-git-3001-centos-7:
+    name: CentOS 7 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -814,20 +814,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-arch || bundle exec kitchen create py3-git-3002-arch
+          bundle exec kitchen create py3-git-3001-centos-7 || bundle exec kitchen create py3-git-3001-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-arch
+          bundle exec kitchen verify py3-git-3001-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-arch
+          bundle exec kitchen destroy py3-git-3001-centos-7
 
 
-  py3-git-master-arch:
-    name: Arch Master Py3 Git
+  py3-stable-3001-0-centos-7:
+    name: CentOS 7 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -860,20 +860,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-arch || bundle exec kitchen create py3-git-master-arch
+          bundle exec kitchen create py3-stable-3001-0-centos-7 || bundle exec kitchen create py3-stable-3001-0-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-arch
+          bundle exec kitchen verify py3-stable-3001-0-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-arch
+          bundle exec kitchen destroy py3-stable-3001-0-centos-7
 
 
-  py2-stable-2019-2-centos-7:
-    name: CentOS 7 v2019.2 Py2 Stable
+  py3-stable-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -906,20 +906,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-centos-7 || bundle exec kitchen create py2-stable-2019-2-centos-7
+          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-centos-7
+          bundle exec kitchen verify py3-stable-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-centos-7
+          bundle exec kitchen destroy py3-stable-3002-centos-7
 
 
-  py2-git-2019-2-centos-7:
-    name: CentOS 7 v2019.2 Py2 Git
+  py3-git-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -952,20 +952,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-centos-7 || bundle exec kitchen create py2-git-2019-2-centos-7
+          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-centos-7
+          bundle exec kitchen verify py3-git-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-centos-7
+          bundle exec kitchen destroy py3-git-3002-centos-7
 
 
-  py3-stable-2019-2-centos-7:
-    name: CentOS 7 v2019.2 Py3 Stable
+  py3-stable-3002-0-centos-7:
+    name: CentOS 7 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -998,20 +998,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-centos-7 || bundle exec kitchen create py3-stable-2019-2-centos-7
+          bundle exec kitchen create py3-stable-3002-0-centos-7 || bundle exec kitchen create py3-stable-3002-0-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-centos-7
+          bundle exec kitchen verify py3-stable-3002-0-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-centos-7
+          bundle exec kitchen destroy py3-stable-3002-0-centos-7
 
 
-  py3-git-2019-2-centos-7:
-    name: CentOS 7 v2019.2 Py3 Git
+  py3-git-master-centos-7:
+    name: CentOS 7 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1044,20 +1044,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-centos-7 || bundle exec kitchen create py3-git-2019-2-centos-7
+          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-centos-7
+          bundle exec kitchen verify py3-git-master-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-centos-7
+          bundle exec kitchen destroy py3-git-master-centos-7
 
 
-  py3-stable-3000-centos-7:
-    name: CentOS 7 v3000 Py3 Stable
+  latest-centos-7:
+    name: CentOS 7 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1090,20 +1090,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-centos-7 || bundle exec kitchen create py3-stable-3000-centos-7
+          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-centos-7
+          bundle exec kitchen verify latest-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-centos-7
+          bundle exec kitchen destroy latest-centos-7
 
 
-  py3-git-3000-centos-7:
-    name: CentOS 7 v3000 Py3 Git
+  py3-stable-3000-centos-8:
+    name: CentOS 8 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1136,20 +1136,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-centos-7 || bundle exec kitchen create py3-git-3000-centos-7
+          bundle exec kitchen create py3-stable-3000-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-centos-7
+          bundle exec kitchen verify py3-stable-3000-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-centos-7
+          bundle exec kitchen destroy py3-stable-3000-centos-8
 
 
-  py3-stable-3001-centos-7:
-    name: CentOS 7 v3001 Py3 Stable
+  py3-git-3000-centos-8:
+    name: CentOS 8 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1182,20 +1182,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-centos-7 || bundle exec kitchen create py3-stable-3001-centos-7
+          bundle exec kitchen create py3-git-3000-centos-8 || bundle exec kitchen create py3-git-3000-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-centos-7
+          bundle exec kitchen verify py3-git-3000-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-centos-7
+          bundle exec kitchen destroy py3-git-3000-centos-8
 
 
-  py3-git-3001-centos-7:
-    name: CentOS 7 v3001 Py3 Git
+  py3-stable-3001-centos-8:
+    name: CentOS 8 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1228,20 +1228,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-centos-7 || bundle exec kitchen create py3-git-3001-centos-7
+          bundle exec kitchen create py3-stable-3001-centos-8 || bundle exec kitchen create py3-stable-3001-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-centos-7
+          bundle exec kitchen verify py3-stable-3001-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-centos-7
+          bundle exec kitchen destroy py3-stable-3001-centos-8
 
 
-  py3-stable-3001-0-centos-7:
-    name: CentOS 7 v3001.0 Py3 Stable
+  py3-git-3001-centos-8:
+    name: CentOS 8 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1274,20 +1274,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-centos-7 || bundle exec kitchen create py3-stable-3001-0-centos-7
+          bundle exec kitchen create py3-git-3001-centos-8 || bundle exec kitchen create py3-git-3001-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-centos-7
+          bundle exec kitchen verify py3-git-3001-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-centos-7
+          bundle exec kitchen destroy py3-git-3001-centos-8
 
 
-  py3-stable-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Stable
+  py3-stable-3001-0-centos-8:
+    name: CentOS 8 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1320,20 +1320,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
+          bundle exec kitchen create py3-stable-3001-0-centos-8 || bundle exec kitchen create py3-stable-3001-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-centos-7
+          bundle exec kitchen verify py3-stable-3001-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-7
+          bundle exec kitchen destroy py3-stable-3001-0-centos-8
 
 
-  py3-git-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Git
+  py3-stable-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1366,20 +1366,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
+          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-centos-7
+          bundle exec kitchen verify py3-stable-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-centos-7
+          bundle exec kitchen destroy py3-stable-3002-centos-8
 
 
-  py3-stable-3002-0-centos-7:
-    name: CentOS 7 v3002.0 Py3 Stable
+  py3-git-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1412,1216 +1412,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-centos-7 || bundle exec kitchen create py3-stable-3002-0-centos-7
+          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-centos-7
+          bundle exec kitchen verify py3-git-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-centos-7
+          bundle exec kitchen destroy py3-git-3002-centos-8
 
 
-  py3-git-master-centos-7:
-    name: CentOS 7 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-7
-
-
-  latest-centos-7:
-    name: CentOS 7 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-7
-
-
-  py3-stable-2019-2-centos-8:
-    name: CentOS 8 v2019.2 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-2019-2-centos-8 || bundle exec kitchen create py3-stable-2019-2-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-centos-8
-
-
-  py3-git-2019-2-centos-8:
-    name: CentOS 8 v2019.2 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-2019-2-centos-8 || bundle exec kitchen create py3-git-2019-2-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-centos-8
-
-
-  py3-stable-3000-centos-8:
-    name: CentOS 8 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-centos-8
-
-
-  py3-git-3000-centos-8:
-    name: CentOS 8 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-centos-8 || bundle exec kitchen create py3-git-3000-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-centos-8
-
-
-  py3-stable-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-centos-8 || bundle exec kitchen create py3-stable-3001-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-centos-8
-
-
-  py3-git-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-centos-8 || bundle exec kitchen create py3-git-3001-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-centos-8
-
-
-  py3-stable-3001-0-centos-8:
-    name: CentOS 8 v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-centos-8 || bundle exec kitchen create py3-stable-3001-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-centos-8
-
-
-  py3-stable-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-8
-
-
-  py3-git-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-centos-8
-
-
-  py3-stable-3002-0-centos-8:
-    name: CentOS 8 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-centos-8
-
-
-  py3-git-master-centos-8:
-    name: CentOS 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-8
-
-
-  latest-centos-8:
-    name: CentOS 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-8
-
-
-  py3-stable-2019-2-debian-10:
-    name: Debian 10 v2019.2 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-2019-2-debian-10 || bundle exec kitchen create py3-stable-2019-2-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-debian-10
-
-
-  py3-git-2019-2-debian-10:
-    name: Debian 10 v2019.2 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-2019-2-debian-10 || bundle exec kitchen create py3-git-2019-2-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-debian-10
-
-
-  py3-stable-3000-debian-10:
-    name: Debian 10 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-debian-10
-
-
-  py3-git-3000-debian-10:
-    name: Debian 10 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-debian-10 || bundle exec kitchen create py3-git-3000-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-debian-10
-
-
-  py3-stable-3001-debian-10:
-    name: Debian 10 v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-10
-
-
-  py3-git-3001-debian-10:
-    name: Debian 10 v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-debian-10
-
-
-  py3-stable-3001-0-debian-10:
-    name: Debian 10 v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-10 || bundle exec kitchen create py3-stable-3001-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-10
-
-
-  py3-stable-3002-debian-10:
-    name: Debian 10 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-10
-
-
-  py3-git-3002-debian-10:
-    name: Debian 10 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-debian-10
-
-
-  py3-stable-3002-0-debian-10:
-    name: Debian 10 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-10
-
-
-  py3-git-master-debian-10:
-    name: Debian 10 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-debian-10
-
-
-  latest-debian-10:
-    name: Debian 10 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-10
-
-
-  py3-stable-3002-debian-11:
-    name: Debian 11 v3002 Py3 Stable
+  py3-stable-3002-0-centos-8:
+    name: CentOS 8 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2654,20 +1458,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
+          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-debian-11
+          bundle exec kitchen verify py3-stable-3002-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-11
+          bundle exec kitchen destroy py3-stable-3002-0-centos-8
 
 
-  py3-git-3002-debian-11:
-    name: Debian 11 v3002 Py3 Git
+  py3-git-master-centos-8:
+    name: CentOS 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2700,20 +1504,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
+          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-debian-11
+          bundle exec kitchen verify py3-git-master-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-debian-11
+          bundle exec kitchen destroy py3-git-master-centos-8
 
 
-  py3-git-master-debian-11:
-    name: Debian 11 Master Py3 Git
+  latest-centos-8:
+    name: CentOS 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2746,20 +1550,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
+          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-11
+          bundle exec kitchen verify latest-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-11
+          bundle exec kitchen destroy latest-centos-8
 
 
-  latest-debian-11:
-    name: Debian 11 Latest packaged release
+  py3-stable-3000-debian-10:
+    name: Debian 10 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2792,20 +1596,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
+          bundle exec kitchen create py3-stable-3000-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-11
+          bundle exec kitchen verify py3-stable-3000-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-11
+          bundle exec kitchen destroy py3-stable-3000-debian-10
 
 
-  py2-stable-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py2 Stable
+  py3-git-3000-debian-10:
+    name: Debian 10 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2838,20 +1642,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-debian-9 || bundle exec kitchen create py2-stable-2019-2-debian-9
+          bundle exec kitchen create py3-git-3000-debian-10 || bundle exec kitchen create py3-git-3000-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-debian-9
+          bundle exec kitchen verify py3-git-3000-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-debian-9
+          bundle exec kitchen destroy py3-git-3000-debian-10
 
 
-  py2-git-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py2 Git
+  py3-stable-3001-debian-10:
+    name: Debian 10 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2884,20 +1688,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-debian-9 || bundle exec kitchen create py2-git-2019-2-debian-9
+          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-debian-9
+          bundle exec kitchen verify py3-stable-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-debian-9
+          bundle exec kitchen destroy py3-stable-3001-debian-10
 
 
-  py3-stable-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py3 Stable
+  py3-git-3001-debian-10:
+    name: Debian 10 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2930,20 +1734,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-debian-9 || bundle exec kitchen create py3-stable-2019-2-debian-9
+          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-debian-9
+          bundle exec kitchen verify py3-git-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-debian-9
+          bundle exec kitchen destroy py3-git-3001-debian-10
 
 
-  py3-git-2019-2-debian-9:
-    name: Debian 9 v2019.2 Py3 Git
+  py3-stable-3001-0-debian-10:
+    name: Debian 10 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2976,20 +1780,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-debian-9 || bundle exec kitchen create py3-git-2019-2-debian-9
+          bundle exec kitchen create py3-stable-3001-0-debian-10 || bundle exec kitchen create py3-stable-3001-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-debian-9
+          bundle exec kitchen verify py3-stable-3001-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-debian-9
+          bundle exec kitchen destroy py3-stable-3001-0-debian-10
 
 
-  py3-stable-3000-debian-9:
-    name: Debian 9 v3000 Py3 Stable
+  py3-stable-3002-debian-10:
+    name: Debian 10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3022,20 +1826,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9
+          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-debian-9
+          bundle exec kitchen verify py3-stable-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-debian-9
+          bundle exec kitchen destroy py3-stable-3002-debian-10
 
 
-  py3-git-3000-debian-9:
-    name: Debian 9 v3000 Py3 Git
+  py3-git-3002-debian-10:
+    name: Debian 10 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3068,20 +1872,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-debian-9 || bundle exec kitchen create py3-git-3000-debian-9
+          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-debian-9
+          bundle exec kitchen verify py3-git-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-debian-9
+          bundle exec kitchen destroy py3-git-3002-debian-10
 
 
-  py3-stable-3001-debian-9:
-    name: Debian 9 v3001 Py3 Stable
+  py3-stable-3002-0-debian-10:
+    name: Debian 10 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3114,20 +1918,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-debian-9 || bundle exec kitchen create py3-stable-3001-debian-9
+          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-debian-9
+          bundle exec kitchen verify py3-stable-3002-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-9
+          bundle exec kitchen destroy py3-stable-3002-0-debian-10
 
 
-  py3-git-3001-debian-9:
-    name: Debian 9 v3001 Py3 Git
+  py3-git-master-debian-10:
+    name: Debian 10 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3160,20 +1964,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-debian-9 || bundle exec kitchen create py3-git-3001-debian-9
+          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-debian-9
+          bundle exec kitchen verify py3-git-master-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-debian-9
+          bundle exec kitchen destroy py3-git-master-debian-10
 
 
-  py3-stable-3001-0-debian-9:
-    name: Debian 9 v3001.0 Py3 Stable
+  latest-debian-10:
+    name: Debian 10 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3206,20 +2010,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-9 || bundle exec kitchen create py3-stable-3001-0-debian-9
+          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-9
+          bundle exec kitchen verify latest-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-9
+          bundle exec kitchen destroy latest-debian-10
 
 
-  py3-stable-3002-debian-9:
-    name: Debian 9 v3002 Py3 Stable
+  py3-stable-3002-debian-11:
+    name: Debian 11 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3252,20 +2056,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
+          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-debian-9
+          bundle exec kitchen verify py3-stable-3002-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-9
+          bundle exec kitchen destroy py3-stable-3002-debian-11
 
 
-  py3-git-3002-debian-9:
-    name: Debian 9 v3002 Py3 Git
+  py3-git-3002-debian-11:
+    name: Debian 11 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3298,20 +2102,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
+          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-debian-9
+          bundle exec kitchen verify py3-git-3002-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-debian-9
+          bundle exec kitchen destroy py3-git-3002-debian-11
 
 
-  py3-stable-3002-0-debian-9:
-    name: Debian 9 v3002.0 Py3 Stable
+  py3-git-master-debian-11:
+    name: Debian 11 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3344,20 +2148,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
+          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-9
+          bundle exec kitchen verify py3-git-master-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-9
+          bundle exec kitchen destroy py3-git-master-debian-11
 
 
-  py3-git-master-debian-9:
-    name: Debian 9 Master Py3 Git
+  latest-debian-11:
+    name: Debian 11 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3390,20 +2194,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
+          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-9
+          bundle exec kitchen verify latest-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-9
+          bundle exec kitchen destroy latest-debian-11
 
 
-  latest-debian-9:
-    name: Debian 9 Latest packaged release
+  py3-stable-3000-debian-9:
+    name: Debian 9 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3436,20 +2240,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
+          bundle exec kitchen create py3-stable-3000-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-9
+          bundle exec kitchen verify py3-stable-3000-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-9
+          bundle exec kitchen destroy py3-stable-3000-debian-9
 
 
-  py3-git-3001-fedora-32:
-    name: Fedora 32 v3001 Py3 Git
+  py3-git-3000-debian-9:
+    name: Debian 9 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3482,20 +2286,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-32 || bundle exec kitchen create py3-git-3001-fedora-32
+          bundle exec kitchen create py3-git-3000-debian-9 || bundle exec kitchen create py3-git-3000-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-32
+          bundle exec kitchen verify py3-git-3000-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-32
+          bundle exec kitchen destroy py3-git-3000-debian-9
 
 
-  py3-git-3002-fedora-32:
-    name: Fedora 32 v3002 Py3 Git
+  py3-stable-3001-debian-9:
+    name: Debian 9 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3528,20 +2332,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-32 || bundle exec kitchen create py3-git-3002-fedora-32
+          bundle exec kitchen create py3-stable-3001-debian-9 || bundle exec kitchen create py3-stable-3001-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-32
+          bundle exec kitchen verify py3-stable-3001-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-32
+          bundle exec kitchen destroy py3-stable-3001-debian-9
 
 
-  py3-git-master-fedora-32:
-    name: Fedora 32 Master Py3 Git
+  py3-git-3001-debian-9:
+    name: Debian 9 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3574,20 +2378,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-32 || bundle exec kitchen create py3-git-master-fedora-32
+          bundle exec kitchen create py3-git-3001-debian-9 || bundle exec kitchen create py3-git-3001-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-32
+          bundle exec kitchen verify py3-git-3001-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-32
+          bundle exec kitchen destroy py3-git-3001-debian-9
 
 
-  latest-fedora-32:
-    name: Fedora 32 Latest packaged release
+  py3-stable-3001-0-debian-9:
+    name: Debian 9 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3620,20 +2424,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-32 || bundle exec kitchen create latest-fedora-32
+          bundle exec kitchen create py3-stable-3001-0-debian-9 || bundle exec kitchen create py3-stable-3001-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-32
+          bundle exec kitchen verify py3-stable-3001-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-32
+          bundle exec kitchen destroy py3-stable-3001-0-debian-9
 
 
-  py3-git-3001-fedora-33:
-    name: Fedora 33 v3001 Py3 Git
+  py3-stable-3002-debian-9:
+    name: Debian 9 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3666,20 +2470,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-33 || bundle exec kitchen create py3-git-3001-fedora-33
+          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-33
+          bundle exec kitchen verify py3-stable-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-33
+          bundle exec kitchen destroy py3-stable-3002-debian-9
 
 
-  py3-git-3002-fedora-33:
-    name: Fedora 33 v3002 Py3 Git
+  py3-git-3002-debian-9:
+    name: Debian 9 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3712,20 +2516,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
+          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-33
+          bundle exec kitchen verify py3-git-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-33
+          bundle exec kitchen destroy py3-git-3002-debian-9
 
 
-  py3-git-master-fedora-33:
-    name: Fedora 33 Master Py3 Git
+  py3-stable-3002-0-debian-9:
+    name: Debian 9 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3758,20 +2562,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
+          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-33
+          bundle exec kitchen verify py3-stable-3002-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-33
+          bundle exec kitchen destroy py3-stable-3002-0-debian-9
 
 
-  latest-fedora-33:
-    name: Fedora 33 Latest packaged release
+  py3-git-master-debian-9:
+    name: Debian 9 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3804,20 +2608,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
+          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-33
+          bundle exec kitchen verify py3-git-master-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-33
+          bundle exec kitchen destroy py3-git-master-debian-9
 
 
-  py3-git-2019-2-opensuse-15:
-    name: Opensuse 15 v2019.2 Py3 Git
+  latest-debian-9:
+    name: Debian 9 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3850,20 +2654,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-opensuse-15 || bundle exec kitchen create py3-git-2019-2-opensuse-15
+          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-opensuse-15
+          bundle exec kitchen verify latest-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-opensuse-15
+          bundle exec kitchen destroy latest-debian-9
 
 
-  py3-git-3000-opensuse-15:
-    name: Opensuse 15 v3000 Py3 Git
+  py3-git-3001-fedora-32:
+    name: Fedora 32 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3896,20 +2700,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-opensuse-15 || bundle exec kitchen create py3-git-3000-opensuse-15
+          bundle exec kitchen create py3-git-3001-fedora-32 || bundle exec kitchen create py3-git-3001-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-opensuse-15
+          bundle exec kitchen verify py3-git-3001-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-opensuse-15
+          bundle exec kitchen destroy py3-git-3001-fedora-32
 
 
-  py3-git-3001-opensuse-15:
-    name: Opensuse 15 v3001 Py3 Git
+  py3-git-3002-fedora-32:
+    name: Fedora 32 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3942,20 +2746,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-opensuse-15 || bundle exec kitchen create py3-git-3001-opensuse-15
+          bundle exec kitchen create py3-git-3002-fedora-32 || bundle exec kitchen create py3-git-3002-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-opensuse-15
+          bundle exec kitchen verify py3-git-3002-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-opensuse-15
+          bundle exec kitchen destroy py3-git-3002-fedora-32
 
 
-  py3-git-3002-opensuse-15:
-    name: Opensuse 15 v3002 Py3 Git
+  py3-git-master-fedora-32:
+    name: Fedora 32 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3988,20 +2792,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
+          bundle exec kitchen create py3-git-master-fedora-32 || bundle exec kitchen create py3-git-master-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-opensuse-15
+          bundle exec kitchen verify py3-git-master-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-opensuse-15
+          bundle exec kitchen destroy py3-git-master-fedora-32
 
 
-  py3-git-master-opensuse-15:
-    name: Opensuse 15 Master Py3 Git
+  latest-fedora-32:
+    name: Fedora 32 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4034,20 +2838,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
+          bundle exec kitchen create latest-fedora-32 || bundle exec kitchen create latest-fedora-32
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-opensuse-15
+          bundle exec kitchen verify latest-fedora-32
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-15
+          bundle exec kitchen destroy latest-fedora-32
 
 
-  latest-opensuse-15:
-    name: Opensuse 15 Latest packaged release
+  py3-git-3001-fedora-33:
+    name: Fedora 33 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4080,20 +2884,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
+          bundle exec kitchen create py3-git-3001-fedora-33 || bundle exec kitchen create py3-git-3001-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-opensuse-15
+          bundle exec kitchen verify py3-git-3001-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-opensuse-15
+          bundle exec kitchen destroy py3-git-3001-fedora-33
 
 
-  py2-stable-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py2 Stable
+  py3-git-3002-fedora-33:
+    name: Fedora 33 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4126,20 +2930,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-ubuntu-1604 || bundle exec kitchen create py2-stable-2019-2-ubuntu-1604
+          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-ubuntu-1604
+          bundle exec kitchen verify py3-git-3002-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3002-fedora-33
 
 
-  py2-git-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py2 Git
+  py3-git-master-fedora-33:
+    name: Fedora 33 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4172,20 +2976,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-ubuntu-1604 || bundle exec kitchen create py2-git-2019-2-ubuntu-1604
+          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-ubuntu-1604
+          bundle exec kitchen verify py3-git-master-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-ubuntu-1604
+          bundle exec kitchen destroy py3-git-master-fedora-33
 
 
-  py3-stable-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py3 Stable
+  latest-fedora-33:
+    name: Fedora 33 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4218,20 +3022,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-ubuntu-1604 || bundle exec kitchen create py3-stable-2019-2-ubuntu-1604
+          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-ubuntu-1604
+          bundle exec kitchen verify latest-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-ubuntu-1604
+          bundle exec kitchen destroy latest-fedora-33
 
 
-  py3-git-2019-2-ubuntu-1604:
-    name: Ubuntu 16.04 v2019.2 Py3 Git
+  py3-git-3000-opensuse-15:
+    name: Opensuse 15 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4264,20 +3068,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-ubuntu-1604 || bundle exec kitchen create py3-git-2019-2-ubuntu-1604
+          bundle exec kitchen create py3-git-3000-opensuse-15 || bundle exec kitchen create py3-git-3000-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-ubuntu-1604
+          bundle exec kitchen verify py3-git-3000-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3000-opensuse-15
 
 
-  py3-stable-3000-ubuntu-1604:
-    name: Ubuntu 16.04 v3000 Py3 Stable
+  py3-git-3001-opensuse-15:
+    name: Opensuse 15 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4310,20 +3114,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-ubuntu-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604
+          bundle exec kitchen create py3-git-3001-opensuse-15 || bundle exec kitchen create py3-git-3001-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-ubuntu-1604
+          bundle exec kitchen verify py3-git-3001-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3001-opensuse-15
 
 
-  py3-git-3000-ubuntu-1604:
-    name: Ubuntu 16.04 v3000 Py3 Git
+  py3-git-3002-opensuse-15:
+    name: Opensuse 15 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4356,20 +3160,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-ubuntu-1604 || bundle exec kitchen create py3-git-3000-ubuntu-1604
+          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-ubuntu-1604
+          bundle exec kitchen verify py3-git-3002-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3002-opensuse-15
 
 
-  py3-stable-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Stable
+  py3-git-master-opensuse-15:
+    name: Opensuse 15 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4402,20 +3206,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
+          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
+          bundle exec kitchen verify py3-git-master-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
+          bundle exec kitchen destroy py3-git-master-opensuse-15
 
 
-  py3-git-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Git
+  latest-opensuse-15:
+    name: Opensuse 15 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4448,20 +3252,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
+          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-1604
+          bundle exec kitchen verify latest-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
+          bundle exec kitchen destroy latest-opensuse-15
 
 
-  py3-stable-3001-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3001.0 Py3 Stable
+  py3-stable-3000-ubuntu-1604:
+    name: Ubuntu 16.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4494,20 +3298,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen create py3-stable-3000-ubuntu-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3000-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3000-ubuntu-1604
 
 
-  py3-stable-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Stable
+  py3-git-3000-ubuntu-1604:
+    name: Ubuntu 16.04 v3000 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4540,20 +3344,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
+          bundle exec kitchen create py3-git-3000-ubuntu-1604 || bundle exec kitchen create py3-git-3000-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
+          bundle exec kitchen verify py3-git-3000-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3000-ubuntu-1604
 
 
-  py3-git-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Git
+  py3-stable-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4586,20 +3390,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
+          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
 
 
-  py3-stable-3002-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3002.0 Py3 Stable
+  py3-git-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4632,20 +3436,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen verify py3-git-3001-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
 
 
-  py3-git-master-ubuntu-1604:
-    name: Ubuntu 16.04 Master Py3 Git
+  py3-stable-3001-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4678,20 +3482,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
 
 
-  latest-ubuntu-1604:
-    name: Ubuntu 16.04 Latest packaged release
+  py3-stable-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4724,20 +3528,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
+          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
 
 
-  py2-stable-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py2 Stable
+  py3-git-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4770,20 +3574,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-stable-2019-2-ubuntu-1804 || bundle exec kitchen create py2-stable-2019-2-ubuntu-1804
+          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-stable-2019-2-ubuntu-1804
+          bundle exec kitchen verify py3-git-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-stable-2019-2-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
 
 
-  py2-git-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py2 Git
+  py3-stable-3002-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4816,20 +3620,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py2-git-2019-2-ubuntu-1804 || bundle exec kitchen create py2-git-2019-2-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py2-git-2019-2-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py2-git-2019-2-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
 
 
-  py3-stable-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py3 Stable
+  py3-git-master-ubuntu-1604:
+    name: Ubuntu 16.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4862,20 +3666,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-2019-2-ubuntu-1804 || bundle exec kitchen create py3-stable-2019-2-ubuntu-1804
+          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-2019-2-ubuntu-1804
+          bundle exec kitchen verify py3-git-master-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-2019-2-ubuntu-1804
+          bundle exec kitchen destroy py3-git-master-ubuntu-1604
 
 
-  py3-git-2019-2-ubuntu-1804:
-    name: Ubuntu 18.04 v2019.2 Py3 Git
+  latest-ubuntu-1604:
+    name: Ubuntu 16.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4908,16 +3712,16 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-2019-2-ubuntu-1804 || bundle exec kitchen create py3-git-2019-2-ubuntu-1804
+          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-2019-2-ubuntu-1804
+          bundle exec kitchen verify latest-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-2019-2-ubuntu-1804
+          bundle exec kitchen destroy latest-ubuntu-1604
 
 
   py3-stable-3000-ubuntu-1804:
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 0010c232c..ed215cd07 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -6,7 +6,6 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 LINUX_DISTROS = [
-    #'amazon-1',
     "amazon-2",
     "arch",
     "centos-7",
@@ -26,7 +25,6 @@
 OSX = WINDOWS = []
 
 STABLE_DISTROS = [
-    "amazon-1",
     "amazon-2",
     "centos-7",
     "centos-8",
@@ -54,16 +52,6 @@
     "ubuntu-2004",
 ]
 
-PY3_BLACKLIST = [
-    "amazon-1",
-]
-
-BLACKLIST_2019 = [
-    "debian-11",
-    "fedora-33",
-    "ubuntu-2004",
-]
-
 BLACKLIST_3000 = [
     "debian-11",
     "fedora-33",
@@ -87,7 +75,6 @@
 ]
 
 SALT_BRANCHES = [
-    "2019-2",
     "3000",
     "3001",
     "3001-0",
@@ -98,7 +85,6 @@
 ]
 
 BRANCH_DISPLAY_NAMES = {
-    "2019-2": "v2019.2",
     "3000": "v3000",
     "3001": "v3001",
     "3001-0": "v3001.0",
@@ -115,7 +101,6 @@
 ]
 
 DISTRO_DISPLAY_NAMES = {
-    "amazon-1": "Amazon 1",
     "amazon-2": "Amazon 2",
     "arch": "Arch",
     "centos-7": "CentOS 7",
@@ -237,9 +222,6 @@ def generate_test_jobs():
                                 if branch not in allowed_branches:
                                     # Arch and Fedora default to py3.8
                                     continue
-                    if branch == "2019-2" and distro in BLACKLIST_2019:
-                        continue
-
                     if branch == "3000" and distro in BLACKLIST_3000:
                         continue
 
@@ -255,9 +237,6 @@ def generate_test_jobs():
                     if python_version == "py2" and distro in PY2_BLACKLIST:
                         continue
 
-                    if python_version == "py3" and distro in PY3_BLACKLIST:
-                        continue
-
                     if distro in LINUX_DISTROS:
                         template = "linux.yml"
                     elif distro in OSX:
diff --git a/.kitchen.yml b/.kitchen.yml
index 56a0716d2..0b74e527f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -28,13 +28,6 @@ provisioner:
     sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
 
 platforms:
-  - name: amazon-1
-    driver_config:
-      image: amazonlinux:1
-      platform: rhel
-      run_command: /sbin/init
-      provision_command:
-        - yum install -y upstart
   - name: amazon-2
     driver_config:
       image: amazonlinux:2
@@ -113,14 +106,6 @@ platforms:
       run_command: /lib/systemd/systemd
 
 suites:
-  - name: py2-git-2019-2
-    provisioner:
-      salt_version: 2019.2
-    excludes:
-      - debian-10
-      - debian-11
-      - gentoo
-      - gentoo-systemd
   - name: py2-git-3000
     provisioner:
       salt_version: 3000
@@ -137,20 +122,6 @@ suites:
       - debian-11
       - gentoo
       - gentoo-systemd
-  - name: py2-stable-2019-2
-    provisioner:
-      salt_version: 2019.2
-      salt_bootstrap_options: -MP stable %s
-    excludes:
-      - arch
-      - opensuse-15
-      - fedora-32
-      - fedora-33
-      - debian-10
-      - debian-11
-      - gentoo
-      - gentoo-systemd
-      - ubuntu-2004
   - name: py2-stable-3000
     provisioner:
       salt_version: 3000
@@ -171,45 +142,21 @@ suites:
       salt_version: 3000
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
-      - amazon-1
-      - debian-11
-      - ubuntu-2004
-  - name: py3-git-2019-2
-    provisioner:
-      salt_version: 2019.2
-      salt_bootstrap_options: -x python3 -MPfq git %s
-    excludes:
-      - amazon-1
       - debian-11
       - ubuntu-2004
   - name: py3-git-3001
     provisioner:
       salt_version: 3001
       salt_bootstrap_options: -x python3 -MPfq git %s
-    excludes:
-      - amazon-1
   - name: py3-git-3002
     provisioner:
       salt_version: 3002
       salt_bootstrap_options: -x python3 -MPfq git %s
-    excludes:
-      - amazon-1
-  - name: py3-stable-2019-2
-    provisioner:
-      salt_version: 2019.2
-      salt_bootstrap_options: -x python3 -MP stable %s
-    excludes:
-      - amazon-1
-      - debian-11
-      - opensuse-15
-      - arch
-      - ubuntu-2004
   - name: py3-stable-3000
     provisioner:
       salt_version: 3000
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
-      - amazon-1
       - debian-11
       - opensuse-15
       - arch
@@ -219,7 +166,6 @@ suites:
       salt_version: 3001
       salt_bootstrap_options: -x python3 -MP stable 3001.0
     excludes:
-      - amazon-1
       - opensuse-15
       - debian-11
       - fedora-32
@@ -232,7 +178,6 @@ suites:
       salt_version: 3001
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
-      - amazon-1
       - debian-11
       - opensuse-15
       - arch
@@ -241,7 +186,6 @@ suites:
       salt_version: 3002
       salt_bootstrap_options: -x python3 -MP stable 3002.0
     excludes:
-      - amazon-1
       - opensuse-15
       - debian-11
       - fedora-32
@@ -254,15 +198,12 @@ suites:
       salt_version: 3002
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
-      - amazon-1
       - opensuse-15
       - arch
   - name: py3-git-master
     provisioner:
       salt_version: master
       salt_bootstrap_options: -x python3 -MPfq -D git %s
-    excludes:
-      - amazon-1
 
   - name: latest
     provisioner:

From 6ca8b7364e413f950784227e6f42655a6e7be0e0 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Fri, 22 Jan 2021 16:18:35 +0000
Subject: [PATCH 031/135] upgrade the minimum pip version

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index bf0c3dfc1..52b1ace9b 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -272,7 +272,7 @@ _PY_EXE=""
 _INSTALL_PY="$BS_FALSE"
 _TORNADO_MAX_PY3_VERSION="5.0"
 _POST_NEON_INSTALL=$BS_FALSE
-_MINIMUM_PIP_VERSION="8.0.0"
+_MINIMUM_PIP_VERSION="9.0.1"
 _MINIMUM_SETUPTOOLS_VERSION="9.1"
 _POST_NEON_PIP_INSTALL_ARGS="--prefix=/usr"
 

From 672dbe151393b81f072db1bd2ac18f0d303eef58 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Fri, 22 Jan 2021 16:53:10 +0000
Subject: [PATCH 032/135] limit pip to < 21.0 for python 3.5

---
 bootstrap-salt.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 52b1ace9b..c269b32ed 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2719,8 +2719,13 @@ EOM
 )
     if ! ${_py_exe} -c "$CHECK_PIP_VERSION_SCRIPT"; then
         # Upgrade pip to at least 1.2 which is when we can start using "python -m pip"
-        echodebug "Running '${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION}'"
-        ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION}"
+        if [ "${_py_version}" = "3.5" ]; then
+          echodebug "Running '${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION},<21.0'"
+          ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION},<21.0"
+        else
+          echodebug "Running '${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION}'"
+          ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION}"
+        fi
         sleep 1
         echodebug "PATH: ${PATH}"
         _pip_cmd="pip${_py_version}"

From f4e61fe32decf3a7833278f748b4da52f7dece17 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 20 Jan 2021 09:43:08 +0000
Subject: [PATCH 033/135] fix(opensuse): fix & add CI for openSUSE Tumbleweed

When `systemd` is installed on Tumbleweed, `systemctl` is actually
located at `/usr/bin/systemctl`.  It appears that the same applies for
openSUSE Leap except that a symlink is also provided there, i.e.
`/bin/systemctl` => `/usr/bin/systemctl`.

Tumbleweed installs Python 3.8, which was first supported in `3001` (Sodium).
Hence, testing on `2019.2` and `3000` is not possible.

When provisioning in Kitchen, another package is supplied compared to
openSUSE Leap:

* `systemd`: It appears that this is implicitly installed in Leap as a
  dependency of the `openssh` package; this doesn't apply in Tumbleweed,
  so it is installed explicitly.
---
 .github/workflows/main.yml              | 184 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   4 +
 .kitchen.yml                            |  17 +++
 bootstrap-salt.sh                       |   5 +-
 4 files changed, 209 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4dce5532..057d4e52c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3264,6 +3264,190 @@ jobs:
           bundle exec kitchen destroy latest-opensuse-15
 
 
+  py3-git-3001-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-opensuse-tumbleweed || bundle exec kitchen create py3-git-3001-opensuse-tumbleweed
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-opensuse-tumbleweed
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-opensuse-tumbleweed
+
+
+  py3-git-3002-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-opensuse-tumbleweed || bundle exec kitchen create py3-git-3002-opensuse-tumbleweed
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-opensuse-tumbleweed
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed
+
+
+  py3-git-master-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
+
+
+  latest-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-opensuse-tumbleweed
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-opensuse-tumbleweed
+
+
   py3-stable-3000-ubuntu-1604:
     name: Ubuntu 16.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index ed215cd07..d6643dc0b 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -18,6 +18,7 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
+    "opensuse-tumbleweed",
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
@@ -49,12 +50,14 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
+    "opensuse-tumbleweed",
     "ubuntu-2004",
 ]
 
 BLACKLIST_3000 = [
     "debian-11",
     "fedora-33",
+    "opensuse-tumbleweed",
     "ubuntu-2004",
 ]
 
@@ -113,6 +116,7 @@
     "gentoo": "Gentoo",
     "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
+    "opensuse-tumbleweed": "Opensuse Tumbleweed",
     "ubuntu-1604": "Ubuntu 16.04",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
diff --git a/.kitchen.yml b/.kitchen.yml
index 0b74e527f..ffe2d4cc9 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -95,6 +95,16 @@ platforms:
         - systemctl enable sshd.service
     provisioner:
       salt_bootstrap_options: -MPfq -y -x python2 git %s
+  - name: opensuse-tumbleweed
+    driver_config:
+      image: opensuse/tumbleweed:latest
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - zypper --non-interactive install --auto-agree-with-licenses dbus-1
+        - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
+        - systemctl enable sshd.service
+    provisioner:
+      salt_bootstrap_options: -MPfq -y -x python3 git %s
   - name: ubuntu-20.04
     driver_config:
       run_command: /lib/systemd/systemd
@@ -129,6 +139,7 @@ suites:
     excludes:
       - arch
       - opensuse-15
+      - opensuse-tumbleweed
       - debian-10
       - debian-11
       - fedora-32
@@ -143,6 +154,7 @@ suites:
       salt_bootstrap_options: -x python3 -MPfq git %s
     excludes:
       - debian-11
+      - opensuse-tumbleweed
       - ubuntu-2004
   - name: py3-git-3001
     provisioner:
@@ -159,6 +171,7 @@ suites:
     excludes:
       - debian-11
       - opensuse-15
+      - opensuse-tumbleweed
       - arch
       - ubuntu-2004
   - name: py3-stable-3001-0
@@ -167,6 +180,7 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable 3001.0
     excludes:
       - opensuse-15
+      - opensuse-tumbleweed
       - debian-11
       - fedora-32
       - fedora-33
@@ -180,6 +194,7 @@ suites:
     excludes:
       - debian-11
       - opensuse-15
+      - opensuse-tumbleweed
       - arch
   - name: py3-stable-3002-0
     provisioner:
@@ -187,6 +202,7 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable 3002.0
     excludes:
       - opensuse-15
+      - opensuse-tumbleweed
       - debian-11
       - fedora-32
       - fedora-33
@@ -199,6 +215,7 @@ suites:
       salt_bootstrap_options: -x python3 -MP stable %s
     excludes:
       - opensuse-15
+      - opensuse-tumbleweed
       - arch
   - name: py3-git-master
     provisioner:
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index c269b32ed..38df966d8 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -6463,6 +6463,9 @@ install_opensuse_git_deps() {
         if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
             __PACKAGES="${__PACKAGES} python-apache-libcloud"
         fi
+    # Check for Tumbleweed
+    elif [ "${DISTRO_MAJOR_VERSION}" -ge 20210101 ]; then
+        __PACKAGES="python3-pip"
     else
         __PACKAGES="python-pip python-setuptools gcc"
     fi
@@ -6544,7 +6547,7 @@ install_opensuse_git_post() {
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
-        if [ -f /bin/systemctl ]; then
+        if command -v systemctl; then
             use_usr_lib=$BS_FALSE
 
             if [ "${DISTRO_MAJOR_VERSION}" -ge 15 ]; then

From fe832d0eb1a733c78cd1155f53866a47300e66de Mon Sep 17 00:00:00 2001
From: Joseph Pacura <jpacura96@gmail.com>
Date: Fri, 22 Jan 2021 19:33:18 -0500
Subject: [PATCH 034/135] Add Ubuntu 20.10 support using Ubuntu 20.04 packages
 Remove support for Debian 8 Remove support for Ubuntu 14.04, 18.10, 19.04,
 and 19.10

---
 README.rst        |  4 ++--
 bootstrap-salt.sh | 32 +++++++++++++-------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/README.rst b/README.rst
index 10ea3861c..1c80e0d83 100644
--- a/README.rst
+++ b/README.rst
@@ -499,8 +499,8 @@ repositories are not provided on `SaltStack's Ubuntu repository`_ for the non-LT
 bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu
 release instead.
 
-For example, when installing Salt on Ubuntu 18.10, the bootstrap script will setup the repository
-for Ubuntu 18.04 from `SaltStack's Ubuntu repository`_ and install the 18.04 packages.
+For example, when installing Salt on Ubuntu 20.10, the bootstrap script will setup the repository
+for Ubuntu 20.04 from `SaltStack's Ubuntu repository`_ and install the 20.04 packages.
 
 Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by
 `Ubuntu's release schedule`_.
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 38df966d8..3e5e2d305 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1545,12 +1545,6 @@ __debian_derivatives_translation() {
 __debian_codename_translation() {
 
     case $DISTRO_MAJOR_VERSION in
-        "7")
-            DISTRO_CODENAME="wheezy"
-            ;;
-        "8")
-            DISTRO_CODENAME="jessie"
-            ;;
         "9")
             DISTRO_CODENAME="stretch"
             ;;
@@ -1561,7 +1555,7 @@ __debian_codename_translation() {
             DISTRO_CODENAME="bullseye"
             ;;
         *)
-            DISTRO_CODENAME="jessie"
+            DISTRO_CODENAME="stretch"
             ;;
     esac
 }
@@ -1574,8 +1568,8 @@ __debian_codename_translation() {
 __check_end_of_life_versions() {
     case "${DISTRO_NAME_L}" in
         debian)
-            # Debian versions below 7 are not supported
-            if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then
+            # Debian versions below 9 are not supported
+            if [ "$DISTRO_MAJOR_VERSION" -lt 9 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://wiki.debian.org/DebianReleases"
@@ -1586,15 +1580,16 @@ __check_end_of_life_versions() {
         ubuntu)
             # Ubuntu versions not supported
             #
-            #  < 14.04
-            #  = 14.10
-            #  = 15.04, 15.10
+            #  < 16.04
             #  = 16.10
             #  = 17.04, 17.10
-            if [ "$DISTRO_MAJOR_VERSION" -lt 14 ] || \
-                [ "$DISTRO_MAJOR_VERSION" -eq 15 ] || \
+            #  = 18.10
+            #  = 19.04, 19.10
+            if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
                 [ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
-                { [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
+                [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
+                { [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
+                { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://wiki.ubuntu.com/Releases"
@@ -2912,11 +2907,10 @@ __enable_universe_repository() {
 
 __install_saltstack_ubuntu_repository() {
     # Workaround for latest non-LTS ubuntu
-    if [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
-        { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
+    if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
         echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
-        UBUNTU_VERSION=18.04
-        UBUNTU_CODENAME="bionic"
+        UBUNTU_VERSION=20.04
+        UBUNTU_CODENAME="focal"
     else
         UBUNTU_VERSION=${DISTRO_VERSION}
         UBUNTU_CODENAME=${DISTRO_CODENAME}

From 6510a2f44a53968a1243b49453f6efb5bc063559 Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Tue, 19 Jan 2021 20:15:09 +0000
Subject: [PATCH 035/135] feat(ps1): implement configure only option (for
 Vagrant)

---
 bootstrap-salt.ps1 | 142 ++++++++++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 61 deletions(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 826b701ab..2e98e481c 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -99,6 +99,9 @@ Param(
 
     [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
     [string]$repourl= "https://repo.saltproject.io/windows"
+
+    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
+    [switch]$ConfigureOnly
 )
 
 # Powershell supports only TLS 1.0 by default. Add support for TLS 1.2
@@ -181,6 +184,9 @@ Else {
 #===============================================================================
 # Ensure Directories are present, copy Vagrant Configs if found
 #===============================================================================
+
+$ConfiguredAnything = $False
+
 # Create C:\tmp\
 New-Item C:\tmp\ -ItemType directory -Force | Out-Null
 
@@ -192,6 +198,7 @@ If (Test-Path C:\tmp\minion.pem) {
     # Copy minion keys & config to correct location
     cp C:\tmp\minion.pem C:\salt\conf\pki\minion\
     cp C:\tmp\minion.pub C:\salt\conf\pki\minion\
+    $ConfiguredAnything = $True
 }
 
 # Check if minion config has been uploaded
@@ -200,6 +207,12 @@ If (Test-Path C:\tmp\minion.pem) {
 If (Test-Path C:\tmp\minion) {
     New-Item C:\salt\conf\ -ItemType Directory -Force | Out-Null
     Copy-Item -Path C:\tmp\minion -Destination C:\salt\conf\ -Force | Out-Null
+    $ConfiguredAnything = $True
+}
+
+If ($ConfigureOnly -and !$ConfiguredAnything) {
+    Write-Output "No configuration or keys were copied over. No configuration was done!"
+    exit 0
 }
 
 #===============================================================================
@@ -229,74 +242,81 @@ If ((!$version) -or ($version.ToLower() -eq 'latest')){
     }
 }
 
-#===============================================================================
-# Download minion setup file
-#===============================================================================
-$saltExe = "Salt-Minion-$versionSection-$arch-Setup.exe"
-Write-Output "Downloading Salt minion installer $saltExe"
-$webclient = New-Object System.Net.WebClient
-$url = "$repourl/$saltExe"
-$file = "C:\Windows\Temp\$saltExe"
-$webclient.DownloadFile($url, $file)
-
-#===============================================================================
-# Set the parameters for the installer
-#===============================================================================
-# Unless specified, use the installer defaults
-# - id: <hostname>
-# - master: salt
-# - Start the service
-$parameters = ""
-If($minion -ne "not-specified") {$parameters = "/minion-name=$minion"}
-If($master -ne "not-specified") {$parameters = "$parameters /master=$master"}
-If($runservice -eq $false) {$parameters = "$parameters /start-service=0"}
-
-#===============================================================================
-# Install minion silently
-#===============================================================================
-#Wait for process to exit before continuing.
-Write-Output "Installing Salt minion"
-Start-Process C:\Windows\Temp\$saltExe -ArgumentList "/S $parameters" -Wait -NoNewWindow -PassThru | Out-Null
+If (!$ConfigureOnly) {
+    #===============================================================================
+    # Download minion setup file
+    #===============================================================================
+    $saltExe = "Salt-Minion-$versionSection-$arch-Setup.exe"
+    Write-Output "Downloading Salt minion installer $saltExe"
+    $webclient = New-Object System.Net.WebClient
+    $url = "$repourl/$saltExe"
+    $file = "C:\Windows\Temp\$saltExe"
+    $webclient.DownloadFile($url, $file)
+
+    #===============================================================================
+    # Set the parameters for the installer
+    #===============================================================================
+    # Unless specified, use the installer defaults
+    # - id: <hostname>
+    # - master: salt
+    # - Start the service
+    $parameters = ""
+    If($minion -ne "not-specified") {$parameters = "/minion-name=$minion"}
+    If($master -ne "not-specified") {$parameters = "$parameters /master=$master"}
+    If($runservice -eq $false) {$parameters = "$parameters /start-service=0"}
+
+    #===============================================================================
+    # Install minion silently
+    #===============================================================================
+    #Wait for process to exit before continuing.
+    Write-Output "Installing Salt minion"
+    Start-Process C:\Windows\Temp\$saltExe -ArgumentList "/S $parameters" -Wait -NoNewWindow -PassThru | Out-Null
+
+    #===============================================================================
+    # Configure the minion service
+    #===============================================================================
+    # Wait for salt-minion service to be registered before trying to start it
+    $service = Get-Service salt-minion -ErrorAction SilentlyContinue
+    While (!$service) {
+      Start-Sleep -s 2
+      $service = Get-Service salt-minion -ErrorAction SilentlyContinue
+    }
 
-#===============================================================================
-# Configure the minion service
-#===============================================================================
-# Wait for salt-minion service to be registered before trying to start it
-$service = Get-Service salt-minion -ErrorAction SilentlyContinue
-While (!$service) {
-  Start-Sleep -s 2
-  $service = Get-Service salt-minion -ErrorAction SilentlyContinue
-}
+    If($runservice) {
+        # Start service
+        Write-Output "Starting the Salt minion service"
+        Start-Service -Name "salt-minion" -ErrorAction SilentlyContinue
 
-If($runservice) {
-    # Start service
-    Write-Output "Starting the Salt minion service"
-    Start-Service -Name "salt-minion" -ErrorAction SilentlyContinue
+        # Check if service is started, otherwise retry starting the
+        # service 4 times.
+        $try = 0
+        While (($service.Status -ne "Running") -and ($try -ne 4)) {
+            Start-Service -Name "salt-minion" -ErrorAction SilentlyContinue
+            $service = Get-Service salt-minion -ErrorAction SilentlyContinue
+            Start-Sleep -s 2
+            $try += 1
+        }
 
-    # Check if service is started, otherwise retry starting the
-    # service 4 times.
-    $try = 0
-    While (($service.Status -ne "Running") -and ($try -ne 4)) {
-        Start-Service -Name "salt-minion" -ErrorAction SilentlyContinue
-        $service = Get-Service salt-minion -ErrorAction SilentlyContinue
-        Start-Sleep -s 2
-        $try += 1
+        # If the salt-minion service is still not running, something probably
+        # went wrong and user intervention is required - report failure.
+        If ($service.Status -eq "Stopped") {
+            Write-Output -NoNewline "Failed to start salt minion"
+            exit 1
+        }
     }
-
-    # If the salt-minion service is still not running, something probably
-    # went wrong and user intervention is required - report failure.
-    If ($service.Status -eq "Stopped") {
-        Write-Output -NoNewline "Failed to start salt minion"
-        exit 1
+    Else {
+        Write-Output -NoNewline "Stopping salt minion and setting it to 'Manual'"
+        Set-Service "salt-minion" -StartupType "Manual"
+        Stop-Service "salt-minion"
     }
 }
-Else {
-    Write-Output -NoNewline "Stopping salt minion and setting it to 'Manual'"
-    Set-Service "salt-minion" -StartupType "Manual"
-    Stop-Service "salt-minion"
-}
 
 #===============================================================================
 # Script Complete
 #===============================================================================
-Write-Output "Salt minion successfully installed"
+If ($ConfigureOnly) {
+    Write-Output "Salt minion successfully configured"
+}
+Else {
+    Write-Output "Salt minion successfully installed"
+}

From 2bc74e06bc03be34f039d5440ff5fa231f3e3dc4 Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Mon, 4 Jan 2021 16:33:22 +0000
Subject: [PATCH 036/135] feat(ps1): implement Vagrant grains_config option

bootstrap-salt.sh already does this.
---
 bootstrap-salt.ps1 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 2e98e481c..2557e857e 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -210,6 +210,13 @@ If (Test-Path C:\tmp\minion) {
     $ConfiguredAnything = $True
 }
 
+# Check if grains config has been uploaded
+If (Test-Path C:\tmp\grains) {
+    New-Item C:\salt\conf\ -ItemType Directory -Force | Out-Null
+    Copy-Item -Path C:\tmp\grains -Destination C:\salt\conf\ -Force | Out-Null
+    $ConfiguredAnything = $True
+}
+
 If ($ConfigureOnly -and !$ConfiguredAnything) {
     Write-Output "No configuration or keys were copied over. No configuration was done!"
     exit 0

From 721ceacd4c9a58ac9a9ee79d59070816db311a67 Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Mon, 4 Jan 2021 16:41:35 +0000
Subject: [PATCH 037/135] refactor(ps1): use similar copy command for Vagrant
 minion key files

---
 bootstrap-salt.ps1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 2557e857e..33621a89a 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -195,9 +195,8 @@ New-Item C:\tmp\ -ItemType directory -Force | Out-Null
 # Check if minion keys have been uploaded, copy to correct location
 If (Test-Path C:\tmp\minion.pem) {
     New-Item C:\salt\conf\pki\minion\ -ItemType Directory -Force | Out-Null
-    # Copy minion keys & config to correct location
-    cp C:\tmp\minion.pem C:\salt\conf\pki\minion\
-    cp C:\tmp\minion.pub C:\salt\conf\pki\minion\
+    Copy-Item -Path C:\tmp\minion.pem -Destination C:\salt\conf\pki\minion\ -Force | Out-Null
+    Copy-Item -Path C:\tmp\minion.pub -Destination C:\salt\conf\pki\minion\ -Force | Out-Null
     $ConfiguredAnything = $True
 }
 

From c35cbb98049822e81547bfe52902ae929c00d379 Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Wed, 3 Feb 2021 19:48:36 +0000
Subject: [PATCH 038/135] fix(ps1): missing comma

---
 bootstrap-salt.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 33621a89a..a0d704281 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -98,7 +98,7 @@ Param(
     [string]$master = "not-specified",
 
     [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
-    [string]$repourl= "https://repo.saltproject.io/windows"
+    [string]$repourl= "https://repo.saltproject.io/windows",
 
     [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
     [switch]$ConfigureOnly

From 5e7442b37e1ab3c6dd463f2f73b068222f9ca9fa Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 10 Feb 2021 14:26:58 +0000
Subject: [PATCH 039/135] apt-key is deprecated on debian10+ and ubuntu20+

---
 bootstrap-salt.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 3e5e2d305..cfba9e428 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1362,7 +1362,7 @@ __check_dpkg_architecture() {
     fi
 
     __REPO_ARCH="$DPKG_ARCHITECTURE"
-    __REPO_ARCH_DEB='deb'
+    __REPO_ARCH_DEB='deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg]'
     __return_code=0
 
     case $DPKG_ARCHITECTURE in
@@ -1381,7 +1381,7 @@ __check_dpkg_architecture() {
                 # Saltstack official repository does not yet have arm64 metadata,
                 # use amd64 repositories on arm64, since all pkgs are arch-independent
                 __REPO_ARCH="amd64"
-                __REPO_ARCH_DEB="deb [arch=$__REPO_ARCH]"
+                __REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]"
                 warn_msg="Support for arm64 packages is experimental and might rely on architecture-independent packages from the amd64 repository."
             fi
             error_msg=""
@@ -1989,7 +1989,7 @@ __apt_key_fetch() {
     tempfile="$(__temp_gpg_pub)"
 
     __fetch_url "$tempfile" "$url" || return 1
-    apt-key add "$tempfile" || return 1
+    cp -f "$tempfile" /usr/share/keyrings/salt-archive-keyring.gpg && chmod 644 /usr/share/keyrings/salt-archive-keyring.gpg || return 1
     rm -f "$tempfile"
 
     return 0
@@ -2941,7 +2941,7 @@ __install_saltstack_ubuntu_repository() {
     SALTSTACK_UBUNTU_URL="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/ubuntu/${UBUNTU_VERSION}/${__REPO_ARCH}/${STABLE_REV}"
     echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/saltstack.list
 
-    __apt_key_fetch "$SALTSTACK_UBUNTU_URL/SALTSTACK-GPG-KEY.pub" || return 1
+    __apt_key_fetch "$SALTSTACK_UBUNTU_URL/salt-archive-keyring.gpg" || return 1
 
     __wait_for_apt apt-get update || return 1
 }
@@ -3030,8 +3030,12 @@ install_ubuntu_stable_deps() {
 
     if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then
         if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then
-            __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&
-                apt-key update && apt-get update || return 1
+            if [ "$DISTRO_MAJOR_VERSION" -ge 20 ]; then
+                __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1
+            else
+                __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&
+                    apt-key update && apt-get update || return 1
+            fi
         fi
 
         __apt_get_upgrade_noinput || return 1
@@ -3380,7 +3384,7 @@ __install_saltstack_debian_repository() {
     SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/debian/${DEBIAN_RELEASE}/${__REPO_ARCH}/${STABLE_REV}"
     echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/saltstack.list"
 
-    __apt_key_fetch "$SALTSTACK_DEBIAN_URL/SALTSTACK-GPG-KEY.pub" || return 1
+    __apt_key_fetch "$SALTSTACK_DEBIAN_URL/salt-archive-keyring.gpg" || return 1
 
     __wait_for_apt apt-get update || return 1
 }
@@ -3398,8 +3402,12 @@ install_debian_deps() {
     if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then
         # Try to update GPG keys first if allowed
         if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then
-            __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&
-                apt-key update && apt-get update || return 1
+            if [ "$DISTRO_MAJOR_VERSION" -ge 10 ]; then
+                __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1
+            else
+                __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&
+                    apt-key update && apt-get update || return 1
+            fi
         fi
 
         __apt_get_upgrade_noinput || return 1

From 478b28bb3a2dbc0e914eb693357e431d824287c3 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 13 Feb 2021 13:41:20 +0000
Subject: [PATCH 040/135] ci(oraclelinux): add CI for Oracle Linux 7

---
 .github/workflows/main.yml              | 460 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   3 +
 .kitchen.yml                            |   3 +
 3 files changed, 466 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 057d4e52c..1299874b6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3448,6 +3448,466 @@ jobs:
           bundle exec kitchen destroy latest-opensuse-tumbleweed
 
 
+  py3-stable-3000-oraclelinux-7:
+    name: Oracle Linux 7 v3000 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3000-oraclelinux-7 || bundle exec kitchen create py3-stable-3000-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3000-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3000-oraclelinux-7
+
+
+  py3-git-3000-oraclelinux-7:
+    name: Oracle Linux 7 v3000 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3000-oraclelinux-7 || bundle exec kitchen create py3-git-3000-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3000-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3000-oraclelinux-7
+
+
+  py3-stable-3001-oraclelinux-7:
+    name: Oracle Linux 7 v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-oraclelinux-7
+
+
+  py3-git-3001-oraclelinux-7:
+    name: Oracle Linux 7 v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-oraclelinux-7 || bundle exec kitchen create py3-git-3001-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-oraclelinux-7
+
+
+  py3-stable-3001-0-oraclelinux-7:
+    name: Oracle Linux 7 v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-0-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-oraclelinux-7
+
+
+  py3-stable-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
+
+
+  py3-git-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
+
+
+  py3-stable-3002-0-oraclelinux-7:
+    name: Oracle Linux 7 v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7
+
+
+  py3-git-master-oraclelinux-7:
+    name: Oracle Linux 7 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-oraclelinux-7
+
+
+  latest-oraclelinux-7:
+    name: Oracle Linux 7 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-oraclelinux-7
+
+
   py3-stable-3000-ubuntu-1604:
     name: Ubuntu 16.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index d6643dc0b..68cbde949 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -19,6 +19,7 @@
     "gentoo-systemd",
     "opensuse-15",
     "opensuse-tumbleweed",
+    "oraclelinux-7",
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
@@ -36,6 +37,7 @@
     "fedora-33",
     "gentoo",
     "gentoo-systemd",
+    "oraclelinux-7",
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
@@ -117,6 +119,7 @@
     "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
     "opensuse-tumbleweed": "Opensuse Tumbleweed",
+    "oraclelinux-7": "Oracle Linux 7",
     "ubuntu-1604": "Ubuntu 16.04",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
diff --git a/.kitchen.yml b/.kitchen.yml
index ffe2d4cc9..88d252463 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -105,6 +105,9 @@ platforms:
         - systemctl enable sshd.service
     provisioner:
       salt_bootstrap_options: -MPfq -y -x python3 git %s
+  - name: oraclelinux-7
+    driver_config:
+      run_command: /usr/lib/systemd/systemd
   - name: ubuntu-20.04
     driver_config:
       run_command: /lib/systemd/systemd

From 3ef81f56c1874abfb59b74690de1884133464d6b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 13 Feb 2021 13:43:15 +0000
Subject: [PATCH 041/135] refactor(kitchen): prefer `kitchen.yml` to
 `.kitchen.yml`

* Quoting from https://kitchen.ci/docs/getting-started/kitchen-yml/:
  - As of test-kitchen 1.21.0, we now prefer `kitchen.yml` over `.kitchen.yml`.
  - This preference applies to `kitchen.local.yml` as well.
  - This is backward compatible so the dot versions continue to work.
* Mirrors contribution to `saltstack/salt` repo:
  - https://github.com/saltstack/salt/pull/54442
* `.gitignore`:
  - https://github.com/saltstack/salt/blob/46f96e4f37d11743470b82e9f4a98d74feddace1/.gitignore#L112-L116
---
 .gitignore                  | 6 ++++--
 .kitchen.yml => kitchen.yml | 0
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename .kitchen.yml => kitchen.yml (100%)

diff --git a/.gitignore b/.gitignore
index 48d9908ab..bf1876684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 .idea
 
 # test-kitchen
-.kitchen
-.bundle
+.kitchen.local.yml
+kitchen.local.yml
+.kitchen/
+.bundle/
 Gemfile.lock
diff --git a/.kitchen.yml b/kitchen.yml
similarity index 100%
rename from .kitchen.yml
rename to kitchen.yml

From d515d103bc57cf5ed43581250c724c1fd83aed44 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 10 Feb 2021 23:40:06 +0000
Subject: [PATCH 042/135] use https for fetching gem

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 2d4b90b31..1b67396d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem 'test-kitchen', '>= 2.0.1'
 gem 'kitchen-salt', '>= 0.5'
-gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker'
+gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker.git'

From e57528fb6795bbcacf5a774ad048583c55f567c3 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 21 Oct 2020 16:12:53 +0100
Subject: [PATCH 043/135] Just a better name

---
 .github/workflows/checksums.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml
index 1fed5feef..8e985269f 100644
--- a/.github/workflows/checksums.yml
+++ b/.github/workflows/checksums.yml
@@ -1,4 +1,4 @@
-name: Scripts-Checksums
+name: Checksums
 
 on:
   push:

From 1186b0103ff2d4c9a585bfafa304421afd47ba04 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 21 Oct 2020 16:32:32 +0100
Subject: [PATCH 044/135] Additionally, open a PR against Salt

---
 .github/workflows/checksums.yml |  1 +
 .github/workflows/release.yml   | 38 ++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml
index 8e985269f..091e3a6ec 100644
--- a/.github/workflows/checksums.yml
+++ b/.github/workflows/checksums.yml
@@ -32,5 +32,6 @@ jobs:
       - name: Create Pull Request Against Master
         uses: peter-evans/create-pull-request@v3
         with:
+          title: Update sha256 checksums
           commit-message: Update sha256 checksums
           delete-branch: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 248d2bbf7..c00c5cd94 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
       - '*'
 
 jobs:
-  checksums:
+  bootstrap:
     name: Update Release Checksums on Develop
     runs-on: ubuntu-latest
 
@@ -41,5 +41,41 @@ jobs:
       - name: Create Pull Request Against Develop
         uses: peter-evans/create-pull-request@v3
         with:
+          title: Update README.rst with ${{ env.BS_VERSION }} release sha256sum
           commit-message: Update README.rst with ${{ env.BS_VERSION }} release sha256sum
           delete-branch: true
+
+  salt:
+    name: Update Release on Salt Repo
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        if: github.repository == 'saltstack/salt-bootstrap'
+        with:
+          ref: stable
+
+      - name: Get bootstrap version
+        if: github.repository == 'saltstack/salt-bootstrap'
+        run: |
+          echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v2
+        if: github.repository == 'saltstack/salt-bootstrap'
+        with:
+          repository: saltstack/salt
+          ref: master
+          path: salt-checkout
+
+      - name: Update bootstrap script on Salt
+        if: github.repository == 'saltstack/salt-bootstrap'
+        run: |
+          cp bootstrap-salt.sh salt-checkout/salt/cloud/deploy/bootstrap-salt.sh
+
+      - name: Create Pull Request Against Develop
+        uses: peter-evans/create-pull-request@v3
+        with:
+          title: Update the bootstrap script to v${{ env.BS_VERSION }}
+          path: salt-checkout
+          commit-message: Update the bootstrap script to v${{ env.BS_VERSION }}
+          delete-branch: true

From e85c4edc80dd1c819c36f93ce39b60f6d7e19086 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 21 Oct 2020 16:35:57 +0100
Subject: [PATCH 045/135] Update RELEASE.md

---
 RELEASE.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index b182c1ad7..c6b561a5f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -6,6 +6,10 @@
 - If there's a new Salt release(major), update the script to add support for it.
 - Bump version for release
 - Open PR against develop with these changes.
-- Once the above PR is merged, open a PR against master with the changes from develop
-- Open a PR against salt with the new stable release.
-- Open a PR against kitchen-salt with the new stable release.
+- Once the above PR is merged, open a PR against stable with the changes from develop
+- Once the above PR is merged, wait until an automatic PR is opened against master which updates the checksums.
+- Once the above PR is merged, tag the release `v{version-here}` and push the tag.
+- Wait until an automatic PR is opened against the develop branch updating the release informtion. Merge it.
+- Check that an automated PR was opened against the salt repo updating the bootstrap script.
+
+- Victory!

From 3f375cd9389431614326727d290ff574060bd114 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 07:24:38 +0000
Subject: [PATCH 046/135] Update AUTHORS and ChangeLog

---
 AUTHORS.rst |  2 ++
 ChangeLog   | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 365e122dd..0499fccf8 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -78,6 +78,7 @@ gweis                       gweis
 Henrik Holmboe              holmboe
 Howard Mei                  HowardMei              howardleomei@gmail.com
 Ivo Jánský                  ijansky
+Imran Iqbal                 myii
 James Booth                 absolutejam            vvalentine1337@gmail.com
 Jamie Alessio               jalessio               jamie@stoic.net
 Jan Heidbrink               jheidbrink
@@ -90,6 +91,7 @@ Jeff Hui                    jeffh                  jeff@jeffhui.net
 Jeff Strunk                 jstrunk
 John Hubbard                ender8282              ender8282@gmail.com
 Jorge Schrauwen             sjorge                 sjorge@blackdot.be
+Joseph Pacura               jpacura
 Juan A. Moyano              wincus                 wincus.public@gmail.com
 Justin Anderson             justinta               justin.ta@outlook.com
 Justin Findlay              jfindlay               jfindlay@gmail.com
diff --git a/ChangeLog b/ChangeLog
index 33fc2707b..3e6a2c3e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 Version TBD (In Progress on the Develop Branch):
 
+Version 2020.10.20:
+	* Debian 11 (bullseye/testing) support using Debian 10 packages (jpacura, bryceml) #1514
+	* Fix bootstrap on Gentoo (ijansky) #1516 #1518
+	* Fix project URLs (bryceml) #1526
+	* FreeBSD also needs the _PKI_DIR reset (krionbsd) #1523
+	* Fix openSUSE Tumbleweed support. (myii) #1525
+	* Fix Debian and Ubuntu version support. (jpacura) #1529
+	* Powershell: Implement configure only option (for Vagrant). (dafyddj) #1530
+	* Powershell: Handle Vagrant's `grains_config` option. (dafyddj) #1520
+	* apt-key is deprecated on Debian 10+ and Ubuntu 20+ (bryceml) #1533
+	* Fix python Tornado on FreeBSD. (krionbsd) #1522
+
 Version 2020.10.20:
 	* Add support to allow bootstrapping Salt 3002 (s0undt3ch) #1506
 

From cafa1b6dfcdd108e1822c02248fc8dd074c97376 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 07:27:15 +0000
Subject: [PATCH 047/135] Support the upcoming Salt 3003 release

---
 bootstrap-salt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index cfba9e428..fbdf3e011 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -604,7 +604,7 @@ elif [ "$ITYPE" = "stable" ]; then
     if [ "$#" -eq 0 ];then
         STABLE_REV="latest"
     else
-        if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002)$')" != "" ]; then
+        if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002|3003)$')" != "" ]; then
             STABLE_REV="$1"
             shift
         elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
@@ -615,7 +615,7 @@ elif [ "$ITYPE" = "stable" ]; then
             fi
             shift
         else
-            echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001 3002, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
+            echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001, 3002, 3003, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
             exit 1
         fi
     fi

From 13ed3c527ba21ab2da0dac1f1560da05383eeaaa Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 07:25:01 +0000
Subject: [PATCH 048/135] Update version for release

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index fbdf3e011..cc175f142 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2020.10.20"
+__ScriptVersion="2021.03.02"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"

From e04245f6ee7125fc20997fc1eb0552866d9134bd Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 10:56:00 +0000
Subject: [PATCH 049/135] Fix release version in ChangeLog

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3e6a2c3e9..05b738c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Version TBD (In Progress on the Develop Branch):
 
-Version 2020.10.20:
+Version 2020.03.02:
 	* Debian 11 (bullseye/testing) support using Debian 10 packages (jpacura, bryceml) #1514
 	* Fix bootstrap on Gentoo (ijansky) #1516 #1518
 	* Fix project URLs (bryceml) #1526

From 6a058cbd76fa087e1cf8760b06bff872032f0ed9 Mon Sep 17 00:00:00 2001
From: s0undt3ch <s0undt3ch@users.noreply.github.com>
Date: Tue, 2 Mar 2021 13:05:00 +0000
Subject: [PATCH 050/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 010e1cb43..300ee786f 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-1819f33bc96b90762a4e955f05563c402fe03f139a8011a223172861d5158e59
+44fb623bac5b19cc2be01420458d3de8eea2a133dd8f13c135038494476b7f4e
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index db9c747d2..65776a80b 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2
+91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758

From e32bd9f93cbfc76a698ee76f93ef9e8156837ede Mon Sep 17 00:00:00 2001
From: s0undt3ch <s0undt3ch@users.noreply.github.com>
Date: Wed, 30 Jun 2021 09:12:28 +0000
Subject: [PATCH 051/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 65776a80b..4c5ab5876 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758
+35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665

From ea738bd23fcc812f25f7eb87658980fb6cd3f6e7 Mon Sep 17 00:00:00 2001
From: krionbsd <krionbsd@users.noreply.github.com>
Date: Thu, 19 Aug 2021 18:59:34 +0000
Subject: [PATCH 052/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 4c5ab5876..43a4d4feb 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665
+ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806

From 62a2c8bb81a5c9398ebe7ccf6f366df60e0a19a9 Mon Sep 17 00:00:00 2001
From: krionbsd <krionbsd@users.noreply.github.com>
Date: Thu, 19 Aug 2021 19:27:47 +0000
Subject: [PATCH 053/135] Update README.rst with 2021.08.19 release sha256sum

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index 3be7ce223..ceb3b7d8f 100644
--- a/README.rst
+++ b/README.rst
@@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2021.08.19: ``ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806``
 - 2021.06.23: ``35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665``
 - 2021.03.02: ``91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758``
 - 2020.10.20: ``b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2``

From 8f39791c2c969aab1346fb9aa073fc9bcdc6c270 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Thu, 19 Aug 2021 21:27:08 +0200
Subject: [PATCH 054/135] Change master to develop branch

---
 RELEASE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index c6b561a5f..64db0f04c 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,4 +1,4 @@
-# Release process
+[#](#) Release process
 
 - See if there are any PRs worth squeezing into release.
 - Go through the changes since last release, add them to changelog.
@@ -7,7 +7,7 @@
 - Bump version for release
 - Open PR against develop with these changes.
 - Once the above PR is merged, open a PR against stable with the changes from develop
-- Once the above PR is merged, wait until an automatic PR is opened against master which updates the checksums.
+- Once the above PR is merged, wait until an automatic PR is opened against develop which updates the checksums.
 - Once the above PR is merged, tag the release `v{version-here}` and push the tag.
 - Wait until an automatic PR is opened against the develop branch updating the release informtion. Merge it.
 - Check that an automated PR was opened against the salt repo updating the bootstrap script.

From 94ebb80bdbb518a42d5d19a2eb18582531eed932 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 21 Jul 2021 21:44:13 +0000
Subject: [PATCH 055/135] make python3 the default

This should be released to stable at the same time or right before
3000.x releases are moved from repo.saltproject.io to
archive.repo.saltproject.io on 2021-09-15
---
 bootstrap-salt.sh | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4735ad9dc..d01caf13e 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -268,7 +268,7 @@ _CUSTOM_MASTER_CONFIG="null"
 _CUSTOM_MINION_CONFIG="null"
 _QUIET_GIT_INSTALLATION=$BS_FALSE
 _REPO_URL="repo.saltproject.io"
-_PY_EXE=""
+_PY_EXE="python3"
 _INSTALL_PY="$BS_FALSE"
 _TORNADO_MAX_PY3_VERSION="5.0"
 _POST_NEON_INSTALL=$BS_FALSE
@@ -3015,15 +3015,6 @@ install_ubuntu_stable_deps() {
         _SLEEP=10
     fi
 
-    if [ "$DISTRO_MAJOR_VERSION" -ge 20 ]; then
-        # Default Ubuntu 20.04 to Py3
-        if [ "x${_PY_EXE}" = "x" ]; then
-            _PY_EXE=python3
-            _PY_MAJOR_VERSION=3
-            PY_PKG_VER=3
-        fi
-    fi
-
     if [ $_START_DAEMONS -eq $BS_FALSE ]; then
         echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour."
     fi
@@ -3418,15 +3409,6 @@ install_debian_deps() {
         __apt_get_upgrade_noinput || return 1
     fi
 
-    if [ "$DISTRO_MAJOR_VERSION" -ge 10 ]; then
-        # Default Debian 10 to Py3
-        if [ "x${_PY_EXE}" = "x" ]; then
-            _PY_EXE=python3
-            _PY_MAJOR_VERSION=3
-            PY_PKG_VER=3
-        fi
-    fi
-
     if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
         PY_PKG_VER=3
     else
@@ -4163,14 +4145,6 @@ install_centos_stable_deps() {
         yum -y update || return 1
     fi
 
-    if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
-        # CentOS/RHEL 8 Default to Py3
-        if [ "x${_PY_EXE}" = "x" ]; then
-            _PY_EXE=python3
-            _PY_MAJOR_VERSION=3
-        fi
-    fi
-
     if [ "$_DISABLE_REPOS" -eq "$BS_TRUE" ] && [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
         echowarn "Detected -r or -R option while installing Salt packages for Python 3."
         echowarn "Python 3 packages for older Salt releases requires the EPEL repository to be installed."

From 60545e7f426ba095d374dd7601927252b1e9e743 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 21 Jul 2021 22:08:40 +0000
Subject: [PATCH 056/135] remove py2 and 3000 jobs from test suite

---
 .github/workflows/kitchen.vagrant.yml   |   3 -
 .github/workflows/main-branch-only.yml  | 184 ------
 .github/workflows/main.yml              | 802 +-----------------------
 .github/workflows/templates/generate.py |  63 +-
 kitchen.yml                             |  64 --
 5 files changed, 11 insertions(+), 1105 deletions(-)

diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 9dd435abd..a3c6e9b4d 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -41,9 +41,6 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          # - py3-git-3000-freebsd-130
-          # - py3-git-3000-freebsd-122
-          # - py3-git-3000-openbsd-6
           - py3-git-3001-freebsd-130
           - py3-git-3001-freebsd-122
           # - py3-git-3001-openbsd-6
diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index b23b39263..aac06ef59 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -8,98 +8,6 @@ on: [push]
 
 jobs:
 
-  py3-stable-3000-gentoo:
-    name: Gentoo v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-gentoo || bundle exec kitchen create py3-stable-3000-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-gentoo
-
-
-  py3-git-3000-gentoo:
-    name: Gentoo v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-gentoo || bundle exec kitchen create py3-git-3000-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-gentoo
-
-
   py3-stable-3001-gentoo:
     name: Gentoo v3001 Py3 Stable
     runs-on: ubuntu-latest
@@ -468,98 +376,6 @@ jobs:
           bundle exec kitchen destroy latest-gentoo
 
 
-  py3-stable-3000-gentoo-systemd:
-    name: Gentoo (systemd) v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-gentoo-systemd || bundle exec kitchen create py3-stable-3000-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-gentoo-systemd
-
-
-  py3-git-3000-gentoo-systemd:
-    name: Gentoo (systemd) v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-gentoo-systemd || bundle exec kitchen create py3-git-3000-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-gentoo-systemd
-
-
   py3-stable-3001-gentoo-systemd:
     name: Gentoo (systemd) v3001 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1d345a836..6f78804ea 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -274,98 +274,6 @@ jobs:
           bundle exec kitchen destroy latest-almalinux-8
 
 
-  py3-stable-3000-amazon-2:
-    name: Amazon 2 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-amazon-2 || bundle exec kitchen create py3-stable-3000-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-amazon-2
-
-
-  py3-git-3000-amazon-2:
-    name: Amazon 2 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-amazon-2 || bundle exec kitchen create py3-git-3000-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-amazon-2
-
-
   py3-stable-3001-amazon-2:
     name: Amazon 2 v3001 Py3 Stable
     runs-on: ubuntu-latest
@@ -964,98 +872,6 @@ jobs:
           bundle exec kitchen destroy latest-arch
 
 
-  py3-stable-3000-centos-7:
-    name: CentOS 7 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-centos-7 || bundle exec kitchen create py3-stable-3000-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-centos-7
-
-
-  py3-git-3000-centos-7:
-    name: CentOS 7 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-centos-7 || bundle exec kitchen create py3-git-3000-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-centos-7
-
-
   py3-stable-3001-centos-7:
     name: CentOS 7 v3001 Py3 Stable
     runs-on: ubuntu-latest
@@ -1562,98 +1378,6 @@ jobs:
           bundle exec kitchen destroy latest-centos-7
 
 
-  py3-stable-3000-centos-8:
-    name: CentOS 8 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-centos-8
-
-
-  py3-git-3000-centos-8:
-    name: CentOS 8 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-centos-8 || bundle exec kitchen create py3-git-3000-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-centos-8
-
-
   py3-stable-3001-centos-8:
     name: CentOS 8 v3001 Py3 Stable
     runs-on: ubuntu-latest
@@ -2160,8 +1884,8 @@ jobs:
           bundle exec kitchen destroy latest-centos-8
 
 
-  py3-stable-3000-debian-10:
-    name: Debian 10 v3000 Py3 Stable
+  py3-stable-3001-debian-10:
+    name: Debian 10 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2194,20 +1918,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3000-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10
+          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3000-debian-10
+          bundle exec kitchen verify py3-stable-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3000-debian-10
+          bundle exec kitchen destroy py3-stable-3001-debian-10
 
 
-  py3-git-3000-debian-10:
-    name: Debian 10 v3000 Py3 Git
+  py3-git-3001-debian-10:
+    name: Debian 10 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2240,108 +1964,16 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3000-debian-10 || bundle exec kitchen create py3-git-3000-debian-10
+          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3000-debian-10
+          bundle exec kitchen verify py3-git-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3000-debian-10
-
-
-  py3-stable-3001-debian-10:
-    name: Debian 10 v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-10
-
-
-  py3-git-3001-debian-10:
-    name: Debian 10 v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-debian-10
+          bundle exec kitchen destroy py3-git-3001-debian-10
 
 
   py3-stable-3001-0-debian-10:
@@ -3080,98 +2712,6 @@ jobs:
           bundle exec kitchen destroy latest-debian-11
 
 
-  py3-stable-3000-debian-9:
-    name: Debian 9 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-debian-9
-
-
-  py3-git-3000-debian-9:
-    name: Debian 9 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-debian-9 || bundle exec kitchen create py3-git-3000-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-debian-9
-
-
   py3-stable-3001-debian-9:
     name: Debian 9 v3001 Py3 Stable
     runs-on: ubuntu-latest
@@ -4368,52 +3908,6 @@ jobs:
           bundle exec kitchen destroy latest-fedora-35
 
 
-  py3-git-3000-opensuse-15:
-    name: Opensuse 15 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-opensuse-15 || bundle exec kitchen create py3-git-3000-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-opensuse-15
-
-
   py3-git-3001-opensuse-15:
     name: Opensuse 15 v3001 Py3 Git
     runs-on: ubuntu-latest
@@ -4874,98 +4368,6 @@ jobs:
           bundle exec kitchen destroy latest-opensuse-tumbleweed
 
 
-  py3-stable-3000-oraclelinux-7:
-    name: Oracle Linux 7 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-oraclelinux-7 || bundle exec kitchen create py3-stable-3000-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-oraclelinux-7
-
-
-  py3-git-3000-oraclelinux-7:
-    name: Oracle Linux 7 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-oraclelinux-7 || bundle exec kitchen create py3-git-3000-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-oraclelinux-7
-
-
   py3-stable-3001-oraclelinux-7:
     name: Oracle Linux 7 v3001 Py3 Stable
     runs-on: ubuntu-latest
@@ -5472,98 +4874,6 @@ jobs:
           bundle exec kitchen destroy latest-oraclelinux-7
 
 
-  py3-stable-3000-oraclelinux-8:
-    name: Oracle Linux 8 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-oraclelinux-8 || bundle exec kitchen create py3-stable-3000-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-oraclelinux-8
-
-
-  py3-git-3000-oraclelinux-8:
-    name: Oracle Linux 8 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-oraclelinux-8 || bundle exec kitchen create py3-git-3000-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-oraclelinux-8
-
-
   py3-stable-3001-oraclelinux-8:
     name: Oracle Linux 8 v3001 Py3 Stable
     runs-on: ubuntu-latest
@@ -6162,98 +5472,6 @@ jobs:
           bundle exec kitchen destroy latest-rockylinux-8
 
 
-  py3-stable-3000-ubuntu-1804:
-    name: Ubuntu 18.04 v3000 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3000-ubuntu-1804 || bundle exec kitchen create py3-stable-3000-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-ubuntu-1804
-
-
-  py3-git-3000-ubuntu-1804:
-    name: Ubuntu 18.04 v3000 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3000-ubuntu-1804 || bundle exec kitchen create py3-git-3000-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-ubuntu-1804
-
-
   py3-stable-3001-ubuntu-1804:
     name: Ubuntu 18.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index f0c9f541b..acf480c3d 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -50,36 +50,6 @@
     "ubuntu-2104",
 ]
 
-PY2_BLACKLIST = [
-    "almalinux-8",
-    "centos-8",
-    "debian-10",
-    "debian-11",
-    "fedora-33",
-    "fedora-34",
-    "fedora-35",
-    "gentoo",
-    "gentoo-systemd",
-    "opensuse-15",
-    "opensuse-tumbleweed",
-    "oraclelinux-8",
-    "rockylinux-8",
-    "ubuntu-2004",
-    "ubuntu-2104",
-]
-
-BLACKLIST_3000 = [
-    "almalinux-8",
-    "debian-11",
-    "fedora-33",
-    "fedora-34",
-    "fedora-35",
-    "opensuse-tumbleweed",
-    "rockylinux-8",
-    "ubuntu-2004",
-    "ubuntu-2104",
-]
-
 BLACKLIST_3001 = [
     "almalinux-8",
     "debian-11",
@@ -124,7 +94,6 @@
 ]
 
 SALT_BRANCHES = [
-    "3000",
     "3001",
     "3001-0",
     "3002",
@@ -136,7 +105,6 @@
 ]
 
 BRANCH_DISPLAY_NAMES = {
-    "3000": "v3000",
     "3001": "v3001",
     "3001-0": "v3001.0",
     "3002": "v3002",
@@ -234,18 +202,7 @@ def generate_test_jobs():
                     )
                 continue
 
-            for python_version in ("py2", "py3"):
-
-                if branch == "master" and python_version == "py2":
-                    # Salt's master branch no longer supports Python 2
-                    continue
-
-                try:
-                    if int(branch.split("-")[0]) >= 3000 and python_version == "py2":
-                        # Salt's 300X versions no longer supports Python 2
-                        continue
-                except ValueError:
-                    pass
+            for python_version in ("py3",):
 
                 for bootstrap_type in ("stable", "git"):
                     if bootstrap_type == "stable":
@@ -267,21 +224,6 @@ def generate_test_jobs():
                         if branch.endswith("-0"):
                             continue
 
-                        if python_version == "py3":
-                            if distro in ("arch"):
-                                allowed_branches = ["master"]
-                                try:
-                                    int_branch = int(branch)
-                                    if int_branch > 3000:
-                                        allowed_branches.append(branch)
-                                except ValueError:
-                                    pass
-                                if branch not in allowed_branches:
-                                    # Arch and Fedora default to py3.8
-                                    continue
-                    if branch == "3000" and distro in BLACKLIST_3000:
-                        continue
-
                     if branch == "3001" and distro in BLACKLIST_3001:
                         continue
 
@@ -300,9 +242,6 @@ def generate_test_jobs():
                     if branch == "3003-0" and distro in BLACKLIST_3003_0:
                         continue
 
-                    if python_version == "py2" and distro in PY2_BLACKLIST:
-                        continue
-
                     if distro in LINUX_DISTROS:
                         template = "linux.yml"
                     elif distro in OSX:
diff --git a/kitchen.yml b/kitchen.yml
index c707c3f06..d6b1e52df 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -104,56 +104,6 @@ platforms:
       run_command: /lib/systemd/systemd
 
 suites:
-  - name: py2-git-3000
-    provisioner:
-      salt_version: 3000
-    excludes:
-      - debian-10
-      - debian-11
-      - gentoo
-      - gentoo-systemd
-      - freebsd-130
-      - freebsd-122
-      - openbsd-6
-  - name: py2-git-master
-    provisioner:
-      salt_version: master
-    excludes:
-      - debian-10
-      - debian-11
-      - gentoo
-      - gentoo-systemd
-      - freebsd-130
-      - freebsd-122
-      - openbsd-6
-  - name: py2-stable-3000
-    provisioner:
-      salt_version: 3000
-      salt_bootstrap_options: -MP stable %s
-    excludes:
-      - arch
-      - opensuse-15
-      - opensuse-tumbleweed
-      - debian-10
-      - debian-11
-      - fedora-33
-      - gentoo
-      - gentoo-systemd
-      - ubuntu-2004
-      - ubuntu-2104
-      - freebsd-130
-      - freebsd-122
-      - openbsd-6
-
-  - name: py3-git-3000
-    provisioner:
-      salt_version: 3000
-      salt_bootstrap_options: -x python3 -MPfq git %s
-    excludes:
-      - debian-11
-      - opensuse-tumbleweed
-      - ubuntu-2004
-      - ubuntu-2104
   - name: py3-git-3001
     provisioner:
       salt_version: 3001
@@ -166,20 +116,6 @@ suites:
     provisioner:
       salt_version: 3003
       salt_bootstrap_options: -x python3 -MPfq git %s
-  - name: py3-stable-3000
-    provisioner:
-      salt_version: 3000
-      salt_bootstrap_options: -x python3 -MP stable %s
-    excludes:
-      - debian-11
-      - opensuse-15
-      - opensuse-tumbleweed
-      - arch
-      - ubuntu-2004
-      - ubuntu-2104
-      - freebsd-130
-      - freebsd-122
-      - openbsd-6
   - name: py3-stable-3001-0
     provisioner:
       salt_version: 3001

From 637a923fd4839567ec6813ba3f2d340922e35c53 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Tue, 24 Aug 2021 20:54:46 +0000
Subject: [PATCH 057/135] don't output info if using the default -x value

---
 bootstrap-salt.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d01caf13e..9564c8554 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -691,7 +691,9 @@ if [ -n "$_PY_EXE" ]; then
         exit 1
     fi
 
-    echoinfo "Detected -x option. Using $_PY_EXE to install Salt."
+    if [ "$_PY_EXE" != "python3" ]; then
+        echoinfo "Detected -x option. Using $_PY_EXE to install Salt."
+    fi
 else
     _PY_PKG_VER=""
     _PY_MAJOR_VERSION=""

From 9f11cbe52af2a5e871a01504a08d9c6139999765 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Tue, 7 Sep 2021 09:28:02 +0200
Subject: [PATCH 058/135] Pin latest salt version to README

---
 README.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index ceb3b7d8f..1ec13a191 100644
--- a/README.rst
+++ b/README.rst
@@ -98,12 +98,12 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a
   Examples:
     - bootstrap-salt.sh
     - bootstrap-salt.sh stable
-    - bootstrap-salt.sh stable 2017.7
-    - bootstrap-salt.sh stable 2017.7.2
+    - bootstrap-salt.sh stable 3003.3
+    - bootstrap-salt.sh stable v3002.7
     - bootstrap-salt.sh testing
     - bootstrap-salt.sh git
-    - bootstrap-salt.sh git 2017.7
-    - bootstrap-salt.sh git v2017.7.2
+    - bootstrap-salt.sh git 3003.3
+    - bootstrap-salt.sh git v3002.7
     - bootstrap-salt.sh git 06f249901a2e2f1ed310d58ea3921a129f214358
 
   Options:
@@ -214,14 +214,14 @@ If you want to install a package of a specific release version, from the SaltSta
 .. code:: console
 
   curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
-  sudo sh bootstrap-salt.sh -P stable 3002.2
+  sudo sh bootstrap-salt.sh -P stable 3003.3
 
 If you want to install a specific release version, based on the Git tags:
 
 .. code:: console
 
   curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
-  sudo sh bootstrap-salt.sh git v3002.2
+  sudo sh bootstrap-salt.sh git v3003.3
 
 Using ``curl`` to install latest development version from GitHub:
 
@@ -276,14 +276,14 @@ Installing a specific version from git using ``wget``:
 .. code:: console
 
   wget -O bootstrap-salt.sh https://bootstrap.saltproject.io
-  sudo sh bootstrap-salt.sh git v3002.2
+  sudo sh bootstrap-salt.sh git v3003.3
 
 Installing a specific version package from the SaltStack repo using ``wget``:
 
 .. code:: console
 
   wget -O bootstrap-salt.sh https://bootstrap.saltproject.io
-  sudo sh bootstrap-salt.sh -P stable 3002.2
+  sudo sh bootstrap-salt.sh -P stable 3003.3
 
 **NOTE**
 
@@ -299,7 +299,7 @@ If you already have Python installed, ``python 2.7``, then it's as easy as:
 .. code:: console
 
   python -m urllib "https://bootstrap.saltproject.io" > bootstrap-salt.sh
-  sudo sh bootstrap-salt.sh -P stable 3002.2
+  sudo sh bootstrap-salt.sh -P stable 3003.3
 
 With python version 2, the following in-line code should always work:
 
@@ -313,7 +313,7 @@ With python version 3:
 .. code:: console
 
   python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltproject.io").read().decode("ascii"))' > bootstrap-salt.sh
-  sudo sh bootstrap-salt.sh git v3002.2
+  sudo sh bootstrap-salt.sh git v3003.3
 
 Install using fetch
 ~~~~~~~~~~~~~~~~~~~
@@ -374,7 +374,7 @@ Installing a target version package of Salt from the SaltStack repo:
 
 .. code:: console
 
-  curl -L https://bootstrap.saltproject.io | sudo sh -s -- stable 3002.2
+  curl -L https://bootstrap.saltproject.io | sudo sh -s -- stable 3003.3
 
 Installing the latest master branch of Salt from git:
 

From 2dc2badee8efe3931844289fee7bac844cbdb6bb Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Tue, 14 Sep 2021 07:31:17 +0200
Subject: [PATCH 059/135] Update to new release 2021.09.14

---
 ChangeLog         | 5 +++++
 bootstrap-salt.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c40e1d46c..a4c763a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Version TBD (In Progress on the Develop Branch):
 
+Version 2021.09.14:
+	* Update latest Salt version in README (krionbsd) #1588
+	* Make Python 3 the default (bryceml) #1577
+	* Don't output info if using the default -x value (bryceml) #1587
+
 Version 2021.08.19:
     * Update README with instructions to use salt-bootstrap custom version (ari) #1580
     * Remove unsupported versions (bryceml) #1578
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 9564c8554..733e00906 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2021.08.19"
+__ScriptVersion="2021.09.14"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"

From 545aec75b826b2fea0b05a36d8c2afadc2ee5cdd Mon Sep 17 00:00:00 2001
From: krionbsd <krionbsd@users.noreply.github.com>
Date: Tue, 14 Sep 2021 08:31:05 +0000
Subject: [PATCH 060/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 43a4d4feb..860db8e92 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806
+30fdcba972f449630b4f13492cb5525e69e08fa2cdb66a6dc78f1536ad279e52

From 48628c27bd02634de4be9460324042cb5f18feb9 Mon Sep 17 00:00:00 2001
From: krionbsd <krionbsd@users.noreply.github.com>
Date: Fri, 17 Sep 2021 08:05:05 +0000
Subject: [PATCH 061/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 860db8e92..56f040aa6 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-30fdcba972f449630b4f13492cb5525e69e08fa2cdb66a6dc78f1536ad279e52
+090d652cd6290debce0e3a4eded65086a4272e69446e711eb26f87160593b6a2

From d2681a36c0edf866c3246f95f76ea05d0b2ccad1 Mon Sep 17 00:00:00 2001
From: krionbsd <krionbsd@users.noreply.github.com>
Date: Fri, 17 Sep 2021 10:01:48 +0000
Subject: [PATCH 062/135] Update README.rst with 2021.09.17 release sha256sum

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index e219d1965..ff0b33d00 100644
--- a/README.rst
+++ b/README.rst
@@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2021.09.17: ``090d652cd6290debce0e3a4eded65086a4272e69446e711eb26f87160593b6a2``
 - 2021.09.14: ``30fdcba972f449630b4f13492cb5525e69e08fa2cdb66a6dc78f1536ad279e52``
 - 2021.08.19: ``ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806``
 - 2021.06.23: ``35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665``

From 6fb638fa2b56c8df3243b8dc164dc44a9fda7b70 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Fri, 17 Sep 2021 12:18:12 +0200
Subject: [PATCH 063/135] Re-add CI for Ubuntu-16

---
 .github/workflows/main.yml              | 368 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   5 +
 kitchen.yml                             |   3 +
 3 files changed, 376 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6f78804ea..2dd796105 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5472,6 +5472,374 @@ jobs:
           bundle exec kitchen destroy latest-rockylinux-8
 
 
+  py3-stable-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
+
+
+  py3-git-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
+
+
+  py3-stable-3001-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
+
+
+  py3-stable-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
+
+
+  py3-git-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
+
+
+  py3-stable-3002-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
+
+
+  py3-git-master-ubuntu-1604:
+    name: Ubuntu 16.04 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-ubuntu-1604
+
+
+  latest-ubuntu-1604:
+    name: Ubuntu 16.04 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-ubuntu-1604
+
+
   py3-stable-3001-ubuntu-1804:
     name: Ubuntu 18.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index acf480c3d..dfebca734 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -24,6 +24,7 @@
     "oraclelinux-7",
     "oraclelinux-8",
     "rockylinux-8",
+    "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2104",
@@ -45,6 +46,7 @@
     "gentoo-systemd",
     "oraclelinux-7",
     "oraclelinux-8",
+    "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2104",
@@ -84,6 +86,7 @@
 
 BLACKLIST_3003 = [
     "rockylinux-8",
+    "ubuntu-1604",
 ]
 
 BLACKLIST_3003_0 = [
@@ -91,6 +94,7 @@
     "gentoo",
     "gentoo-systemd",
     "rockylinux-8",
+    "ubuntu-1604",
 ]
 
 SALT_BRANCHES = [
@@ -138,6 +142,7 @@
     "oraclelinux-7": "Oracle Linux 7",
     "oraclelinux-8": "Oracle Linux 8",
     "rockylinux-8": "Rocky Linux 8",
+    "ubuntu-1604": "Ubuntu 16.04",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2104": "Ubuntu 21.04",
diff --git a/kitchen.yml b/kitchen.yml
index d6b1e52df..080c79cff 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -102,6 +102,9 @@ platforms:
   - name: ubuntu-18.04
     driver:
       run_command: /lib/systemd/systemd
+  - name: ubuntu-16.04
+    driver_config:
+      run_command: /lib/systemd/systemd
 
 suites:
   - name: py3-git-3001

From c63dafa4b100032fe0eeef762d2518a35af73ee1 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Thu, 23 Sep 2021 08:32:01 +0200
Subject: [PATCH 064/135] Sort help alphabetically

---
 bootstrap-salt.sh | 120 +++++++++++++++++++++++-----------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index ee1efcdf1..526b7e9df 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -314,86 +314,86 @@ __usage() {
     - ${__ScriptName} git 06f249901a2e2f1ed310d58ea3921a129f214358
 
   Options:
-    -h  Display this message
-    -v  Display script version
-    -n  No colours
-    -D  Show debug output
+    -a  Pip install all Python pkg dependencies for Salt. Requires -V to install
+        all pip pkgs into the virtualenv.
+        (Only available for Ubuntu based distributions)
+    -A  Pass the salt-master DNS name or IP. This will be stored under
+        \${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf
+    -b  Assume that dependencies are already installed and software sources are
+        set up. If git is selected, git tree is still checked out as dependency
+        step.
     -c  Temporary configuration directory
-    -g  Salt Git repository URL. Default: ${_SALTSTACK_REPO_URL}
-    -w  Install packages from downstream package repository rather than
-        upstream, saltstack package repository. This is currently only
-        implemented for SUSE.
-    -k  Temporary directory holding the minion keys which will pre-seed
-        the master.
-    -s  Sleep time used when waiting for daemons to start, restart and when
-        checking for the services running. Default: ${__DEFAULT_SLEEP}
-    -L  Also install salt-cloud and required python-libcloud package
-    -M  Also install salt-master
-    -S  Also install salt-syndic
-    -N  Do not install salt-minion
-    -X  Do not start daemons after installation
+    -C  Only run the configuration function. Implies -F (forced overwrite).
+        To overwrite Master or Syndic configs, -M or -S, respectively, must
+        also be specified. Salt installation will be ommitted, but some of the
+        dependencies could be installed to write configuration with -j or -J.
     -d  Disables checking if Salt services are enabled to start on system boot.
         You can also do this by touching /tmp/disable_salt_checks on the target
         host. Default: \${BS_FALSE}
-    -P  Allow pip based installations. On some distributions the required salt
-        packages or its dependencies are not available as a package for that
-        distribution. Using this flag allows the script to use pip as a last
-        resort method. NOTE: This only works for functions which actually
-        implement pip based installations.
-    -U  If set, fully upgrade the system prior to bootstrapping Salt
+    -D  Show debug output
+    -f  Force shallow cloning for git installations.
+        This may result in an "n/a" in the version number.
+    -F  Allow copied files to overwrite existing (config, init.d, etc)
+    -g  Salt Git repository URL. Default: ${_SALTSTACK_REPO_URL}
+    -h  Display this message
+    -H  Use the specified HTTP proxy for all download URLs (including https://).
+        For example: http://myproxy.example.com:3128
+    -i  Pass the salt-minion id. This will be stored under
+        \${BS_SALT_ETC_DIR}/minion_id
     -I  If set, allow insecure connections while downloading any files. For
         example, pass '--no-check-certificate' to 'wget' or '--insecure' to
         'curl'. On Debian and Ubuntu, using this option with -U allows obtaining
         GnuPG archive keys insecurely if distro has changed release signatures.
-    -F  Allow copied files to overwrite existing (config, init.d, etc)
+    -j  Replace the Minion config file with data passed in as a JSON string. If
+        a Minion config file is found, a reasonable effort will be made to save
+        the file with a ".bak" extension. If used in conjunction with -C or -F,
+        no ".bak" file will be created as either of those options will force
+        a complete overwrite of the file.
+    -J  Replace the Master config file with data passed in as a JSON string. If
+        a Master config file is found, a reasonable effort will be made to save
+        the file with a ".bak" extension. If used in conjunction with -C or -F,
+        no ".bak" file will be created as either of those options will force
+        a complete overwrite of the file.
+    -k  Temporary directory holding the minion keys which will pre-seed
+        the master.
     -K  If set, keep the temporary files in the temporary directories specified
         with -c and -k
-    -C  Only run the configuration function. Implies -F (forced overwrite).
-        To overwrite Master or Syndic configs, -M or -S, respectively, must
-        also be specified. Salt installation will be ommitted, but some of the
-        dependencies could be installed to write configuration with -j or -J.
-    -A  Pass the salt-master DNS name or IP. This will be stored under
-        \${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf
-    -i  Pass the salt-minion id. This will be stored under
-        \${BS_SALT_ETC_DIR}/minion_id
-    -p  Extra-package to install while installing Salt dependencies. One package
-        per -p flag. You are responsible for providing the proper package name.
-    -H  Use the specified HTTP proxy for all download URLs (including https://).
-        For example: http://myproxy.example.com:3128
-    -b  Assume that dependencies are already installed and software sources are
-        set up. If git is selected, git tree is still checked out as dependency
-        step.
-    -f  Force shallow cloning for git installations.
-        This may result in an "n/a" in the version number.
     -l  Disable ssl checks. When passed, switches "https" calls to "http" where
         possible.
-    -V  Install Salt into virtualenv
-        (only available for Ubuntu based distributions)
-    -a  Pip install all Python pkg dependencies for Salt. Requires -V to install
-        all pip pkgs into the virtualenv.
-        (Only available for Ubuntu based distributions)
-    -r  Disable all repository configuration performed by this script. This
-        option assumes all necessary repository configuration is already present
-        on the system.
+    -L  Also install salt-cloud and required python-libcloud package
+    -M  Also install salt-master
+    -n  No colours
+    -N  Do not install salt-minion
+    -p  Extra-package to install while installing Salt dependencies. One package
+        per -p flag. You are responsible for providing the proper package name.
+    -P  Allow pip based installations. On some distributions the required salt
+        packages or its dependencies are not available as a package for that
+        distribution. Using this flag allows the script to use pip as a last
+        resort method. NOTE: This only works for functions which actually
+        implement pip based installations.
+    -q  Quiet salt installation from git (setup.py install -q)
     -R  Specify a custom repository URL. Assumes the custom repository URL
         points to a repository that mirrors Salt packages located at
         repo.saltproject.io. The option passed with -R replaces the
         "repo.saltproject.io". If -R is passed, -r is also set. Currently only
         works on CentOS/RHEL and Debian based distributions.
-    -J  Replace the Master config file with data passed in as a JSON string. If
-        a Master config file is found, a reasonable effort will be made to save
-        the file with a ".bak" extension. If used in conjunction with -C or -F,
-        no ".bak" file will be created as either of those options will force
-        a complete overwrite of the file.
-    -j  Replace the Minion config file with data passed in as a JSON string. If
-        a Minion config file is found, a reasonable effort will be made to save
-        the file with a ".bak" extension. If used in conjunction with -C or -F,
-        no ".bak" file will be created as either of those options will force
-        a complete overwrite of the file.
-    -q  Quiet salt installation from git (setup.py install -q)
+    -s  Sleep time used when waiting for daemons to start, restart and when
+        checking for the services running. Default: ${__DEFAULT_SLEEP}
+    -S  Also install salt-syndic
+    -r  Disable all repository configuration performed by this script. This
+        option assumes all necessary repository configuration is already present
+        on the system.
+    -U  If set, fully upgrade the system prior to bootstrapping Salt
+    -v  Display script version
+    -V  Install Salt into virtualenv
+        (only available for Ubuntu based distributions)
+    -w  Install packages from downstream package repository rather than
+        upstream, saltstack package repository. This is currently only
+        implemented for SUSE.
     -x  Changes the Python version used to install Salt.
         For CentOS 6 git installations python2.7 is supported.
         Fedora git installation, CentOS 7, Debian 9, Ubuntu 16.04 and 18.04 support python3.
+    -X  Do not start daemons after installation
     -y  Installs a different python version on host. Currently this has only been
         tested with CentOS 6 and is considered experimental. This will install the
         ius repo on the box if disable repo is false. This must be used in conjunction

From f55c2b4e3207a26295ee2c39506dcdaa84a4c93a Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 1 Oct 2021 20:00:39 +0100
Subject: [PATCH 065/135] ci(kitchen): add `ssh-rsa` to
 `PubkeyAcceptedAlgorithms` on Arch Linux

---
 kitchen.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kitchen.yml b/kitchen.yml
index 080c79cff..db71165c2 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -42,6 +42,7 @@ platforms:
       provision_command:
         - pacman -Syu --noconfirm --needed systemd grep awk procps which
         - systemctl enable sshd
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: centos-8
   - name: centos-7
   - name: debian-9

From 0bd70a2e53484a8a33922a32b43ce19660f2c1e0 Mon Sep 17 00:00:00 2001
From: Nascire <kaderabe@gorill.at>
Date: Wed, 6 Oct 2021 18:07:20 +0200
Subject: [PATCH 066/135] Fix git master install on alpine 3.12+

With default version 3003.3, you run into https://github.com/saltstack/salt/issues/55159, which was fixed by https://github.com/saltstack/salt/pull/60811
If you want to install from git master, it fails because py2-pip is unavailable - Alpine 3.11 was the last version to include py2-pip
This PR changes the git master process to python3 and adds all requirements for a successful build
---
 bootstrap-salt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 526b7e9df..965a86f0f 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5011,8 +5011,8 @@ install_alpine_linux_git_deps() {
             fi
         fi
     else
-        apk -U add python2 py2-pip py2-setuptools || return 1
-        _PY_EXE=python2
+        apk -U add python3 python3-dev py3-pip py3-setuptools g++ linux-headers zeromq-dev || return 1
+        _PY_EXE=python3
         return 0
     fi
 

From 68d22715a02ec5e45079a2dc900d9d2c90506743 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 9 Oct 2021 13:38:50 +0100
Subject: [PATCH 067/135] ci(centos-stream8): add platform

---
 .github/workflows/main.yml              | 230 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   7 +
 kitchen.yml                             |   3 +
 3 files changed, 240 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2dd796105..9749fcf9e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1884,6 +1884,236 @@ jobs:
           bundle exec kitchen destroy latest-centos-8
 
 
+  py3-stable-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-centos-stream8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-centos-stream8
+
+
+  py3-git-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-centos-stream8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-centos-stream8
+
+
+  py3-stable-3003-0-centos-stream8:
+    name: CentOS Stream 8 v3003.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3003-0-centos-stream8 || bundle exec kitchen create py3-stable-3003-0-centos-stream8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-centos-stream8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-centos-stream8
+
+
+  py3-git-master-centos-stream8:
+    name: CentOS Stream 8 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-centos-stream8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-centos-stream8
+
+
+  latest-centos-stream8:
+    name: CentOS Stream 8 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-centos-stream8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-centos-stream8
+
+
   py3-stable-3001-debian-10:
     name: Debian 10 v3001 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index dfebca734..e79b27641 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -11,6 +11,7 @@
     "arch",
     "centos-7",
     "centos-8",
+    "centos-stream8",
     "debian-10",
     "debian-11",
     "debian-9",
@@ -36,6 +37,7 @@
     "amazon-2",
     "centos-7",
     "centos-8",
+    "centos-stream8",
     "debian-10",
     "debian-11",
     "debian-9",
@@ -54,6 +56,7 @@
 
 BLACKLIST_3001 = [
     "almalinux-8",
+    "centos-stream8",
     "debian-11",
     "rockylinux-8",
     "ubuntu-2104",
@@ -62,6 +65,7 @@
 BLACKLIST_3001_0 = [
     "almalinux-8",
     "amazon-2",
+    "centos-stream8",
     "debian-11",
     "gentoo",
     "gentoo-systemd",
@@ -71,12 +75,14 @@
 
 BLACKLIST_3002 = [
     "almalinux-8",
+    "centos-stream8",
     "rockylinux-8",
 ]
 
 BLACKLIST_3002_0 = [
     "almalinux-8",
     "amazon-2",
+    "centos-stream8",
     "debian-11",
     "gentoo",
     "gentoo-systemd",
@@ -129,6 +135,7 @@
     "arch": "Arch",
     "centos-7": "CentOS 7",
     "centos-8": "CentOS 8",
+    "centos-stream8": "CentOS Stream 8",
     "debian-10": "Debian 10",
     "debian-11": "Debian 11",
     "debian-9": "Debian 9",
diff --git a/kitchen.yml b/kitchen.yml
index db71165c2..06452bfcc 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -43,6 +43,9 @@ platforms:
         - pacman -Syu --noconfirm --needed systemd grep awk procps which
         - systemctl enable sshd
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+  - name: centos-stream8
+    driver:
+      image: quay.io/centos/centos:stream8
   - name: centos-8
   - name: centos-7
   - name: debian-9

From 098a08950db752d3a23a9ef102bc0ac5e790e2ca Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Wed, 23 Dec 2020 16:46:01 -0600
Subject: [PATCH 068/135] Add CentOS GPG key for RHEL7 for successful builds

---
 bootstrap-salt.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 965a86f0f..6a2e98413 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4120,7 +4120,11 @@ __install_saltstack_rhel_repository() {
     # Avoid using '$releasever' variable for yum.
     # Instead, this should work correctly on all RHEL variants.
     base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
-    gpg_key="SALTSTACK-GPG-KEY.pub"
+    if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
+        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub","${base_url}base/RPM-GPG-KEY-CentOS-7"
+    else
+        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
+    fi
     repo_file="/etc/yum.repos.d/salt.repo"
 
     if [ ! -s "$repo_file" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then
@@ -4130,7 +4134,7 @@ name=SaltStack ${repo_rev} Release Channel for RHEL/CentOS \$releasever
 baseurl=${base_url}
 skip_if_unavailable=True
 gpgcheck=1
-gpgkey=${base_url}${gpg_key}
+gpgkey=${gpg_key}
 enabled=1
 enabled_metadata=1
 _eof

From 1a24a1c7ca545a5aee7ad879fb24f288adf3e97c Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Wed, 23 Dec 2020 18:57:05 -0600
Subject: [PATCH 069/135] fix quotes

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 6a2e98413..67bcc9078 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4121,7 +4121,7 @@ __install_saltstack_rhel_repository() {
     # Instead, this should work correctly on all RHEL variants.
     base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
     if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
-        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub","${base_url}base/RPM-GPG-KEY-CentOS-7"
+        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7"
     else
         gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
     fi

From b5c022a4fb6da76a28e337b3d782be4950a5467f Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 24 Dec 2020 11:35:25 -0600
Subject: [PATCH 070/135] fix key import

---
 bootstrap-salt.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 67bcc9078..a4d3e48d0 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4139,8 +4139,12 @@ enabled=1
 enabled_metadata=1
 _eof
 
-        fetch_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
-        __rpm_import_gpg "${fetch_url}${gpg_key}" || return 1
+	Field_Separator=$IFS
+	IFS=,
+	for key in $gpg_key; do
+            __rpm_import_gpg "$key" || return 1
+        done
+	IFS=$Field_Separator
         yum clean metadata || return 1
     elif [ "$repo_rev" != "latest" ]; then
         echowarn "salt.repo already exists, ignoring salt version argument."

From 3b43309236cb668b2abf82da6108558890ecb135 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 24 Dec 2020 12:00:40 -0600
Subject: [PATCH 071/135] fix fetch url

---
 bootstrap-salt.sh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index a4d3e48d0..1b426d309 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4121,10 +4121,19 @@ __install_saltstack_rhel_repository() {
     # Instead, this should work correctly on all RHEL variants.
     base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
     if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
-        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7"
+        gpg_key="SALTSTACK-GPG-KEY.pub,base/RPM-GPG-KEY-CentOS-7"
     else
-        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
+        gpg_key="SALTSTACK-GPG-KEY.pub"
     fi
+
+    Field_Separator=$IFS
+    IFS=,
+    gpg_key_urls=""
+    for key in $gpg_key; do
+	gpg_key_urls+="${base_url}${key},"
+    done
+    IFS=$Field_Separator
+
     repo_file="/etc/yum.repos.d/salt.repo"
 
     if [ ! -s "$repo_file" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then
@@ -4134,17 +4143,19 @@ name=SaltStack ${repo_rev} Release Channel for RHEL/CentOS \$releasever
 baseurl=${base_url}
 skip_if_unavailable=True
 gpgcheck=1
-gpgkey=${gpg_key}
+gpgkey=${gpg_key_urls}
 enabled=1
 enabled_metadata=1
 _eof
 
+        fetch_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
 	Field_Separator=$IFS
 	IFS=,
 	for key in $gpg_key; do
-            __rpm_import_gpg "$key" || return 1
+            __rpm_import_gpg "${fetch_url}${key}" || return 1
         done
 	IFS=$Field_Separator
+
         yum clean metadata || return 1
     elif [ "$repo_rev" != "latest" ]; then
         echowarn "salt.repo already exists, ignoring salt version argument."

From 8ec0e8d1308714cf8d114e52c637c67a8e5c1540 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 24 Dec 2020 16:23:12 -0600
Subject: [PATCH 072/135] fix lint for sh

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 1b426d309..4570f7850 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4130,7 +4130,7 @@ __install_saltstack_rhel_repository() {
     IFS=,
     gpg_key_urls=""
     for key in $gpg_key; do
-	gpg_key_urls+="${base_url}${key},"
+	gpg_key_urls=$(printf "${base_url}${key},%s" "$gpg_key_urls")
     done
     IFS=$Field_Separator
 

From 168b6787d848ace92afa22bcc3cb5003b036e7ca Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:09:11 -0600
Subject: [PATCH 073/135] correct install location

---
 bootstrap-salt.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 4570f7850..a6adb3345 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4217,6 +4217,14 @@ install_centos_stable_deps() {
                 __PACKAGES="${__PACKAGES} PyYAML"
             fi
         fi
+    else
+      if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
+        if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
+            __PACKAGES="${__PACKAGES} python3-setuptools"
+        else
+            __PACKAGES="${__PACKAGES} python36-setuptools"
+        fi
+      fi
     fi
 
     # shellcheck disable=SC2086

From 0031919e8d9d31b567dd3c778a3bf13cb280fd27 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:44:11 -0600
Subject: [PATCH 074/135] correct install

---
 bootstrap-salt.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index a6adb3345..24a7eeb70 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4198,33 +4198,25 @@ install_centos_stable_deps() {
         if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
             # YAML module is used for generating custom master/minion configs
             if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
-                __PACKAGES="${__PACKAGES} python3-pyyaml"
+                __PACKAGES="${__PACKAGES} python3-pyyaml python3-setuptools"
             else
                 __PACKAGES="${__PACKAGES} python2-pyyaml"
             fi
         elif [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then
             # YAML module is used for generating custom master/minion configs
             if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
-                __PACKAGES="${__PACKAGES} python36-PyYAML"
+                __PACKAGES="${__PACKAGES} python36-PyYAML python36-setuptools"
             else
                 __PACKAGES="${__PACKAGES} PyYAML"
             fi
         else
             # YAML module is used for generating custom master/minion configs
             if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
-                __PACKAGES="${__PACKAGES} python34-PyYAML"
+                __PACKAGES="${__PACKAGES} python34-PyYAML python34-setuptools"
             else
                 __PACKAGES="${__PACKAGES} PyYAML"
             fi
         fi
-    else
-      if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
-        if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
-            __PACKAGES="${__PACKAGES} python3-setuptools"
-        else
-            __PACKAGES="${__PACKAGES} python36-setuptools"
-        fi
-      fi
     fi
 
     # shellcheck disable=SC2086

From 9e385fbe150563eb479906e01ddaecc300d4c75c Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 7 Jan 2021 10:32:13 -0600
Subject: [PATCH 075/135] add rhel ubi tests and needed package

---
 bootstrap-salt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 24a7eeb70..687f155a0 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4351,6 +4351,7 @@ install_centos_git_deps() {
             __PACKAGES="${__PACKAGES} m2crypto python${PY_PKG_VER}-crypto"
         fi
 
+        __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-setuptools"
         __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2"
         __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests"
         __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-zmq"

From b5417e74cc4f89f2c005d0272163cef8f6f69627 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:09:11 -0600
Subject: [PATCH 076/135] correct install location

---
 bootstrap-salt.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 687f155a0..2b29ce83a 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4217,6 +4217,14 @@ install_centos_stable_deps() {
                 __PACKAGES="${__PACKAGES} PyYAML"
             fi
         fi
+    else
+      if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
+        if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
+            __PACKAGES="${__PACKAGES} python3-setuptools"
+        else
+            __PACKAGES="${__PACKAGES} python36-setuptools"
+        fi
+      fi
     fi
 
     # shellcheck disable=SC2086
@@ -4351,7 +4359,6 @@ install_centos_git_deps() {
             __PACKAGES="${__PACKAGES} m2crypto python${PY_PKG_VER}-crypto"
         fi
 
-        __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-setuptools"
         __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2"
         __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests"
         __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-zmq"

From f82cf912ad6606cb1078ee911f0f76280cc48d9b Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:44:11 -0600
Subject: [PATCH 077/135] correct install

---
 bootstrap-salt.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2b29ce83a..24a7eeb70 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4217,14 +4217,6 @@ install_centos_stable_deps() {
                 __PACKAGES="${__PACKAGES} PyYAML"
             fi
         fi
-    else
-      if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
-        if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
-            __PACKAGES="${__PACKAGES} python3-setuptools"
-        else
-            __PACKAGES="${__PACKAGES} python36-setuptools"
-        fi
-      fi
     fi
 
     # shellcheck disable=SC2086

From b6272a1b3462698ad89c00dbfdf3805e05493412 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Mon, 11 Oct 2021 17:47:07 +0000
Subject: [PATCH 078/135] fix indentation, remove unnecessary IFS changes

---
 bootstrap-salt.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 24a7eeb70..580115ba8 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4121,18 +4121,15 @@ __install_saltstack_rhel_repository() {
     # Instead, this should work correctly on all RHEL variants.
     base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
     if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
-        gpg_key="SALTSTACK-GPG-KEY.pub,base/RPM-GPG-KEY-CentOS-7"
+        gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7"
     else
         gpg_key="SALTSTACK-GPG-KEY.pub"
     fi
 
-    Field_Separator=$IFS
-    IFS=,
     gpg_key_urls=""
     for key in $gpg_key; do
-	gpg_key_urls=$(printf "${base_url}${key},%s" "$gpg_key_urls")
+        gpg_key_urls=$(printf "${base_url}${key},%s" "$gpg_key_urls")
     done
-    IFS=$Field_Separator
 
     repo_file="/etc/yum.repos.d/salt.repo"
 
@@ -4149,12 +4146,9 @@ enabled_metadata=1
 _eof
 
         fetch_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
-	Field_Separator=$IFS
-	IFS=,
-	for key in $gpg_key; do
+        for key in $gpg_key; do
             __rpm_import_gpg "${fetch_url}${key}" || return 1
         done
-	IFS=$Field_Separator
 
         yum clean metadata || return 1
     elif [ "$repo_rev" != "latest" ]; then

From 6cce7051b6e1628029b81ad8584fa7fba2d30309 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Tue, 12 Oct 2021 16:14:18 +0200
Subject: [PATCH 079/135] Add openrc to alpine:latest dependencies

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 580115ba8..2d726b032 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5024,7 +5024,7 @@ install_alpine_linux_git_deps() {
             fi
         fi
     else
-        apk -U add python3 python3-dev py3-pip py3-setuptools g++ linux-headers zeromq-dev || return 1
+        apk -U add python3 python3-dev py3-pip py3-setuptools g++ linux-headers zeromq-dev openrc || return 1
         _PY_EXE=python3
         return 0
     fi

From bbc3213454dc44d93110591ad9fea57fee1cdbc4 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 10 Nov 2021 14:33:33 +0000
Subject: [PATCH 080/135] ci(kitchen): add `ssh-rsa` to
 `PubkeyAcceptedAlgorithms` on Tumbleweed

---
 kitchen.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index 06452bfcc..e18731de5 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -84,14 +84,18 @@ platforms:
   - name: opensuse-15
     driver:
       image: opensuse/leap:15.3
-      provision_command: &opensuse_provision_command
-        - zypper --non-interactive install --auto-agree-with-licenses dbus-1
-        - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
-        - systemctl enable sshd.service
+      provision_command:
+        - &opensuse_provision_command_01 zypper --non-interactive install --auto-agree-with-licenses dbus-1
+        - &opensuse_provision_command_02 zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
+        - &opensuse_provision_command_03 systemctl enable sshd.service
   - name: opensuse-tumbleweed
     driver:
       image: opensuse/tumbleweed:latest
-      provision_command: *opensuse_provision_command
+      provision_command:
+        - *opensuse_provision_command_01
+        - *opensuse_provision_command_02
+        - *opensuse_provision_command_03
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: oraclelinux-8
   - name: oraclelinux-7
   - name: rockylinux-8

From 4387dfd260180799dcadad31fc5c583de85d876e Mon Sep 17 00:00:00 2001
From: Jille Timmermans <jille@quis.cx>
Date: Sun, 14 Nov 2021 12:10:58 +0100
Subject: [PATCH 081/135] Add support for Raspbian 11

Tested on my Raspberry Pi.

This solves the error `ERROR: No dependencies installation function found. Exiting...` when running on Raspbian 11.
---
 bootstrap-salt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2d726b032..2b85597de 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1492,6 +1492,7 @@ __debian_derivatives_translation() {
     raspbian_8_debian_base="8.0"
     raspbian_9_debian_base="9.0"
     raspbian_10_debian_base="10.0"
+    raspbian_11_debian_base="11.0"
     bunsenlabs_9_debian_base="9.0"
     turnkey_9_debian_base="9.0"
 

From e209b259d2bd75217de96faffc5ddf27ab04349d Mon Sep 17 00:00:00 2001
From: Simon TheUser <email@here.com>
Date: Tue, 16 Nov 2021 13:34:40 -0500
Subject: [PATCH 082/135] Create new process with all command-line parameters
 when UAC is enabled

---
 bootstrap-salt.ps1 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index a0d704281..ff857f87f 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -133,13 +133,11 @@ If (!(Get-IsAdministrator)) {
 
         # Specify the current script path and name as a parameter`
         $parameters = ""
-        If($minion -ne "not-specified") {$parameters = "-minion $minion"}
-        If($master -ne "not-specified") {$parameters = "$parameters -master $master"}
-        If($runservice -eq $false) {$parameters = "$parameters -runservice false"}
-        If($version -ne '') {$parameters = "$parameters -version $version"}
-        If($pythonVersion -ne "") {$parameters = "$parameters -pythonVersion $pythonVersion"}
+        foreach ($boundParam in $PSBoundParameters.GetEnumerator())
+        {
+            $parameters = "$parameters -{0} '{1}'" -f $boundParam.Key, $boundParam.Value
+        }
         $newProcess.Arguments = $myInvocation.MyCommand.Definition, $parameters
-
         # Specify the current working directory
         $newProcess.WorkingDirectory = "$script_path"
 

From b3d29d5f0a4025219245d74aca6304a3420683e0 Mon Sep 17 00:00:00 2001
From: Simon TheUser <email@here.com>
Date: Tue, 16 Nov 2021 13:52:38 -0500
Subject: [PATCH 083/135] Restored extra line

---
 bootstrap-salt.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index ff857f87f..0282121ee 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -138,6 +138,7 @@ If (!(Get-IsAdministrator)) {
             $parameters = "$parameters -{0} '{1}'" -f $boundParam.Key, $boundParam.Value
         }
         $newProcess.Arguments = $myInvocation.MyCommand.Definition, $parameters
+
         # Specify the current working directory
         $newProcess.WorkingDirectory = "$script_path"
 

From bd6a408aac44ff79a2d0d0e913fc98fec18de407 Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Sat, 18 Dec 2021 18:44:57 +0000
Subject: [PATCH 084/135] ci(proxy): fix setting up WinRM

Same fix as provided for the SaltStack Formulas organisation:

* https://github.com/myii/ssf-formula/pull/392
---
 .github/workflows/kitchen.windows.yml | 12 ++++--------
 kitchen.windows.yml                   |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
index 890632816..0b2d2c1f8 100644
--- a/.github/workflows/kitchen.windows.yml
+++ b/.github/workflows/kitchen.windows.yml
@@ -74,10 +74,8 @@ jobs:
           New-LocalUser $env:machine_user -Password $password
           Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user
       - name: 'Set up WinRM'
-        run: >
-          Set-WSManQuickConfig -Force;
-          Set-WSManInstance -ResourceURI winrm/config/service
-          -ValueSet @{AllowUnencrypted="true"}
+        run: |
+          Set-WSManQuickConfig -Force
       - name: 'Run Bundler'
         run: |
           ruby --version
@@ -131,10 +129,8 @@ jobs:
           New-LocalUser $env:machine_user -Password $password
           Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user
       - name: 'Set up WinRM'
-        run: >
-          Set-WSManQuickConfig -Force;
-          Set-WSManInstance -ResourceURI winrm/config/service
-          -ValueSet @{AllowUnencrypted="true"}
+        run: |
+          Set-WSManQuickConfig -Force
       - name: 'Run Bundler'
         run: |
           ruby --version
diff --git a/kitchen.windows.yml b/kitchen.windows.yml
index 993dbff32..109f97e11 100644
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@@ -29,6 +29,7 @@ suites:
   - name: latest
     provisioner:
       salt_version: latest
+      salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.bat
 
 verifier:
   command: pytest --cache-clear -v -s -ra --log-cli-level=debug -k "not test_ping" tests/integration/

From 3eb6001e5c1650f762a448f07b5955a4cfab57e9 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 14 Dec 2021 12:00:07 +0000
Subject: [PATCH 085/135] ci(freebsd): replace `12.2` with newly released
 `12.3` box

* https://app.vagrantup.com/bento/boxes/freebsd-12.3
---
 .github/workflows/kitchen.vagrant.yml | 10 +++++-----
 kitchen.vagrant.yml                   |  4 ++--
 kitchen.yml                           | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index a3c6e9b4d..d22dfe1b8 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -42,19 +42,19 @@ jobs:
       matrix:
         instance:
           - py3-git-3001-freebsd-130
-          - py3-git-3001-freebsd-122
+          - py3-git-3001-freebsd-123
           # - py3-git-3001-openbsd-6
           - py3-git-3002-freebsd-130
-          - py3-git-3002-freebsd-122
+          - py3-git-3002-freebsd-123
           # - py3-git-3002-openbsd-6
           - py3-git-3003-freebsd-130
-          - py3-git-3003-freebsd-122
+          - py3-git-3003-freebsd-123
           # - py3-git-3003-openbsd-6
           - py3-git-master-freebsd-130
-          - py3-git-master-freebsd-122
+          - py3-git-master-freebsd-123
           # - py3-git-master-openbsd-6
           - latest-freebsd-130
-          - latest-freebsd-122
+          - latest-freebsd-123
           - latest-openbsd-6
     steps:
       - name: 'Check out code'
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 1e5a4c87c..327728b00 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -24,9 +24,9 @@ platforms:
   - name: freebsd-130
     driver:
       box: bento/freebsd-13.0
-  - name: freebsd-122
+  - name: freebsd-123
     driver:
-      box: bento/freebsd-12.2
+      box: bento/freebsd-12.3
   - name: openbsd-6
     driver:
       box: generic/openbsd6
diff --git a/kitchen.yml b/kitchen.yml
index e18731de5..05c33ad69 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -141,7 +141,7 @@ suites:
       - gentoo-systemd
       - ubuntu-2104
       - freebsd-130
-      - freebsd-122
+      - freebsd-123
       - openbsd-6
   - name: py3-stable-3001
     provisioner:
@@ -154,7 +154,7 @@ suites:
       - arch
       - ubuntu-2104
       - freebsd-130
-      - freebsd-122
+      - freebsd-123
       - openbsd-6
   - name: py3-stable-3002-0
     provisioner:
@@ -169,7 +169,7 @@ suites:
       - gentoo
       - gentoo-systemd
       - freebsd-130
-      - freebsd-122
+      - freebsd-123
       - openbsd-6
   - name: py3-stable-3003-0
     provisioner:
@@ -183,7 +183,7 @@ suites:
       - gentoo
       - gentoo-systemd
       - freebsd-130
-      - freebsd-122
+      - freebsd-123
       - openbsd-6
   - name: py3-stable-3002
     provisioner:
@@ -194,7 +194,7 @@ suites:
       - opensuse-tumbleweed
       - arch
       - freebsd-130
-      - freebsd-122
+      - freebsd-123
       - openbsd-6
   - name: py3-stable-3003
     provisioner:
@@ -205,7 +205,7 @@ suites:
       - opensuse-tumbleweed
       - arch
       - freebsd-130
-      - freebsd-122
+      - freebsd-123
       - openbsd-6
   - name: py3-git-master
     provisioner:

From 52ffe58df85560560d8e1971ea45fff14fdfcdfe Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 18 Dec 2021 19:22:42 +0000
Subject: [PATCH 086/135] ci(proxy): replace deprecated `windows-2016` with
 `windows-2022`

* https://github.com/actions/virtual-environments/issues/4312
---
 .github/workflows/kitchen.windows.yml | 24 ++++++++++++------------
 kitchen.windows.yml                   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
index 0b2d2c1f8..214173ea1 100644
--- a/.github/workflows/kitchen.windows.yml
+++ b/.github/workflows/kitchen.windows.yml
@@ -36,18 +36,18 @@ jobs:
       - name: 'ShellCheck'
         run: |
           shellcheck -s sh -f tty bootstrap-salt.sh
-  test-2019:
-    runs-on: 'windows-2019'
+  test-2022:
+    runs-on: 'windows-2022'
     timeout-minutes: 20
     needs: 'lint'
     strategy:
       fail-fast: false
       matrix:
         instance:
-          - py3-stable-3001-windows-2019
-          - py3-stable-3002-windows-2019
-          - py3-stable-3003-windows-2019
-          - latest-windows-2019
+          - py3-stable-3001-windows-2022
+          - py3-stable-3002-windows-2022
+          - py3-stable-3003-windows-2022
+          - latest-windows-2022
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
@@ -91,18 +91,18 @@ jobs:
           pip install -r tests/requirements.txt
       - name: 'Run Test Kitchen'
         run: 'bundle exec kitchen test ${{ matrix.instance }}'
-  test-2016:
-    runs-on: 'windows-2016'
+  test-2019:
+    runs-on: 'windows-2019'
     timeout-minutes: 20
     needs: 'lint'
     strategy:
       fail-fast: false
       matrix:
         instance:
-          - py3-stable-3001-windows-2016
-          - py3-stable-3002-windows-2016
-          - py3-stable-3003-windows-2016
-          - latest-windows-2016
+          - py3-stable-3001-windows-2019
+          - py3-stable-3002-windows-2019
+          - py3-stable-3003-windows-2019
+          - latest-windows-2019
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
diff --git a/kitchen.windows.yml b/kitchen.windows.yml
index 109f97e11..1ed244693 100644
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@@ -13,8 +13,8 @@ provisioner:
   init_environment: ''
 
 platforms:
+  - name: windows-2022
   - name: windows-2019
-  - name: windows-2016
 
 suites:
   - name: py3-stable-3001

From 41f0ae7d3277c667216bb90055fc568b5e143217 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 24 Dec 2021 12:13:40 +0000
Subject: [PATCH 087/135] ci(vagrant): use conditional local settings (inc.
 `synced_folders`)

---
 kitchen.vagrant.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 327728b00..0d855e75b 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -7,9 +7,15 @@ driver:
   customize:
     usbxhci: 'off'
   gui: false
-  linked_clone: true
   ssh:
     shell: /bin/sh
+  <% unless ENV['CI'] %>
+  linked_clone: true
+  synced_folders:
+    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
+      - '/vagrant'
+      - 'create: true, disabled: false'
+  <% end %>
 
 provisioner:
   init_environment: |
@@ -32,6 +38,7 @@ platforms:
       box: generic/openbsd6
       ssh:
         shell: /bin/ksh
+      synced_folders: []
     provisioner:
       init_environment: |
         echo 'auto_accept: true' > /tmp/auto-accept-keys.conf

From e7adfe409f469f5320dffa58716ee5e1e2c84019 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 5 Jan 2022 06:11:40 +0000
Subject: [PATCH 088/135] ci(kitchen): add `ssh-rsa` to
 `PubkeyAcceptedAlgorithms` on Gentoo

---
 kitchen.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kitchen.yml b/kitchen.yml
index 05c33ad69..7a5750ef6 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -75,12 +75,14 @@ platforms:
       run_command: /sbin/init
       provision_command:
         - rc-update add sshd default
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: gentoo-systemd
     driver:
       image: gentoo/stage3:systemd
       run_command: /lib/systemd/systemd
       provision_command:
         - systemctl enable sshd.service
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: opensuse-15
     driver:
       image: opensuse/leap:15.3

From fb8105c15ee13774a4be5f56394cfcb75e49a438 Mon Sep 17 00:00:00 2001
From: Bo Zhang <zhangbodut@gmail.com>
Date: Fri, 7 Jan 2022 09:06:27 +0800
Subject: [PATCH 089/135] Support Non-LTS Ubuntu 21.04 & 21.10

Ubuntu 21.10 is out, adjust the script accordingly.
---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2b85597de..dc4f471fd 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2919,7 +2919,7 @@ __enable_universe_repository() {
 __install_saltstack_ubuntu_repository() {
     # Workaround for latest non-LTS Ubuntu
     if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
-        { [ "$DISTRO_MAJOR_VERSION" -eq 21 ] && [ "$DISTRO_MINOR_VERSION" -eq 04 ]; }; then
+        [ "$DISTRO_MAJOR_VERSION" -eq 21 ]; then
         echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
         UBUNTU_VERSION=20.04
         UBUNTU_CODENAME="focal"

From ce779b02ab51f35a06c8a42e5e9b320ca44f49da Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Fri, 7 Jan 2022 09:52:26 +0100
Subject: [PATCH 090/135] Add CI for Ubuntu-21.10 and remove for 21.04

---
 .github/workflows/main.yml              | 70 ++++++++++++-------------
 .github/workflows/templates/generate.py | 12 ++---
 kitchen.yml                             |  6 +--
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9749fcf9e..3a169d3a9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7082,8 +7082,8 @@ jobs:
           bundle exec kitchen destroy latest-ubuntu-2004
 
 
-  py3-stable-3002-ubuntu-2104:
-    name: Ubuntu 21.04 v3002 Py3 Stable
+  py3-stable-3002-ubuntu-2110:
+    name: Ubuntu 21.10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7116,20 +7116,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-2104 || bundle exec kitchen create py3-stable-3002-ubuntu-2104
+          bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-2104
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-2104
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2110
 
 
-  py3-git-3002-ubuntu-2104:
-    name: Ubuntu 21.04 v3002 Py3 Git
+  py3-git-3002-ubuntu-2110:
+    name: Ubuntu 21.10 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7162,20 +7162,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-2104 || bundle exec kitchen create py3-git-3002-ubuntu-2104
+          bundle exec kitchen create py3-git-3002-ubuntu-2110 || bundle exec kitchen create py3-git-3002-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-2104
+          bundle exec kitchen verify py3-git-3002-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-2104
+          bundle exec kitchen destroy py3-git-3002-ubuntu-2110
 
 
-  py3-stable-3003-ubuntu-2104:
-    name: Ubuntu 21.04 v3003 Py3 Stable
+  py3-stable-3003-ubuntu-2110:
+    name: Ubuntu 21.10 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7208,20 +7208,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-ubuntu-2104
+          bundle exec kitchen create py3-stable-3003-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-2104
+          bundle exec kitchen verify py3-stable-3003-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-2104
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-2110
 
 
-  py3-git-3003-ubuntu-2104:
-    name: Ubuntu 21.04 v3003 Py3 Git
+  py3-git-3003-ubuntu-2110:
+    name: Ubuntu 21.10 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7254,20 +7254,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-2104 || bundle exec kitchen create py3-git-3003-ubuntu-2104
+          bundle exec kitchen create py3-git-3003-ubuntu-2110 || bundle exec kitchen create py3-git-3003-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-2104
+          bundle exec kitchen verify py3-git-3003-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-2104
+          bundle exec kitchen destroy py3-git-3003-ubuntu-2110
 
 
-  py3-stable-3003-0-ubuntu-2104:
-    name: Ubuntu 21.04 v3003.0 Py3 Stable
+  py3-stable-3003-0-ubuntu-2110:
+    name: Ubuntu 21.10 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7300,20 +7300,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2104
+          bundle exec kitchen create py3-stable-3003-0-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2104
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2104
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2110
 
 
-  py3-git-master-ubuntu-2104:
-    name: Ubuntu 21.04 Master Py3 Git
+  py3-git-master-ubuntu-2110:
+    name: Ubuntu 21.10 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7346,20 +7346,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-2104 || bundle exec kitchen create py3-git-master-ubuntu-2104
+          bundle exec kitchen create py3-git-master-ubuntu-2110 || bundle exec kitchen create py3-git-master-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-2104
+          bundle exec kitchen verify py3-git-master-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-2104
+          bundle exec kitchen destroy py3-git-master-ubuntu-2110
 
 
-  latest-ubuntu-2104:
-    name: Ubuntu 21.04 Latest packaged release
+  latest-ubuntu-2110:
+    name: Ubuntu 21.10 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7392,13 +7392,13 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-2104 || bundle exec kitchen create latest-ubuntu-2104
+          bundle exec kitchen create latest-ubuntu-2110 || bundle exec kitchen create latest-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-2104
+          bundle exec kitchen verify latest-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-2104
+          bundle exec kitchen destroy latest-ubuntu-2110
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index e79b27641..8602fdc90 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -28,7 +28,7 @@
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
-    "ubuntu-2104",
+    "ubuntu-2110",
 ]
 OSX = WINDOWS = []
 
@@ -51,7 +51,7 @@
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
-    "ubuntu-2104",
+    "ubuntu-2110",
 ]
 
 BLACKLIST_3001 = [
@@ -59,7 +59,7 @@
     "centos-stream8",
     "debian-11",
     "rockylinux-8",
-    "ubuntu-2104",
+    "ubuntu-2110",
 ]
 
 BLACKLIST_3001_0 = [
@@ -70,7 +70,7 @@
     "gentoo",
     "gentoo-systemd",
     "rockylinux-8",
-    "ubuntu-2104",
+    "ubuntu-2110",
 ]
 
 BLACKLIST_3002 = [
@@ -87,7 +87,7 @@
     "gentoo",
     "gentoo-systemd",
     "rockylinux-8",
-    "ubuntu-2104",
+    "ubuntu-2110",
 ]
 
 BLACKLIST_3003 = [
@@ -152,7 +152,7 @@
     "ubuntu-1604": "Ubuntu 16.04",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
-    "ubuntu-2104": "Ubuntu 21.04",
+    "ubuntu-2110": "Ubuntu 21.10",
 }
 
 TIMEOUT_DEFAULT = 20
diff --git a/kitchen.yml b/kitchen.yml
index 7a5750ef6..3d614ecd7 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -103,7 +103,7 @@ platforms:
   - name: rockylinux-8
     driver:
       image: rockylinux/rockylinux
-  - name: ubuntu-21.04
+  - name: ubuntu-21.10
     driver:
       run_command: /lib/systemd/systemd
   - name: ubuntu-20.04
@@ -141,7 +141,7 @@ suites:
       - arch
       - gentoo
       - gentoo-systemd
-      - ubuntu-2104
+      - ubuntu-2110
       - freebsd-130
       - freebsd-123
       - openbsd-6
@@ -154,7 +154,7 @@ suites:
       - opensuse-15
       - opensuse-tumbleweed
       - arch
-      - ubuntu-2104
+      - ubuntu-2110
       - freebsd-130
       - freebsd-123
       - openbsd-6

From 33f23e97e4710283e240a409df3ee689bb7ae92d Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Mon, 10 Jan 2022 09:56:28 +0100
Subject: [PATCH 091/135] Add CI for v3004

---
 .github/workflows/kitchen.vagrant.yml   |    3 +
 .github/workflows/kitchen.windows.yml   |    2 +
 .github/workflows/main-branch-only.yml  |  184 ++
 .github/workflows/main.yml              | 3290 ++++++++++++++++++-----
 .github/workflows/templates/generate.py |   24 +
 kitchen.windows.yml                     |    3 +
 kitchen.yml                             |   29 +
 7 files changed, 2879 insertions(+), 656 deletions(-)

diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index d22dfe1b8..62c9c7119 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -50,6 +50,9 @@ jobs:
           - py3-git-3003-freebsd-130
           - py3-git-3003-freebsd-123
           # - py3-git-3003-openbsd-6
+          - py3-git-3004-freebsd-130
+          - py3-git-3004-freebsd-123
+          # - py3-git-3004-openbsd-6
           - py3-git-master-freebsd-130
           - py3-git-master-freebsd-123
           # - py3-git-master-openbsd-6
diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
index 214173ea1..ba211cd31 100644
--- a/.github/workflows/kitchen.windows.yml
+++ b/.github/workflows/kitchen.windows.yml
@@ -47,6 +47,7 @@ jobs:
           - py3-stable-3001-windows-2022
           - py3-stable-3002-windows-2022
           - py3-stable-3003-windows-2022
+          - py3-stable-3004-windows-2022
           - latest-windows-2022
     steps:
       - name: 'Check out code'
@@ -102,6 +103,7 @@ jobs:
           - py3-stable-3001-windows-2019
           - py3-stable-3002-windows-2019
           - py3-stable-3003-windows-2019
+          - py3-stable-3004-windows-2019
           - latest-windows-2019
     steps:
       - name: 'Check out code'
diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index aac06ef59..fe72c9aa8 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -284,6 +284,98 @@ jobs:
           bundle exec kitchen destroy py3-git-3003-gentoo
 
 
+  py3-stable-3004-gentoo:
+    name: Gentoo v3004 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-gentoo || bundle exec kitchen create py3-stable-3004-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-gentoo
+
+
+  py3-git-3004-gentoo:
+    name: Gentoo v3004 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3004-gentoo || bundle exec kitchen create py3-git-3004-gentoo
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3004-gentoo
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3004-gentoo
+
+
   py3-git-master-gentoo:
     name: Gentoo Master Py3 Git
     runs-on: ubuntu-latest
@@ -652,6 +744,98 @@ jobs:
           bundle exec kitchen destroy py3-git-3003-gentoo-systemd
 
 
+  py3-stable-3004-gentoo-systemd:
+    name: Gentoo (systemd) v3004 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-gentoo-systemd || bundle exec kitchen create py3-stable-3004-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-gentoo-systemd
+
+
+  py3-git-3004-gentoo-systemd:
+    name: Gentoo (systemd) v3004 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3004-gentoo-systemd || bundle exec kitchen create py3-git-3004-gentoo-systemd
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3004-gentoo-systemd
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3004-gentoo-systemd
+
+
   py3-git-master-gentoo-systemd:
     name: Gentoo (systemd) Master Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3a169d3a9..6ac27cce2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -182,6 +182,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3003-0-almalinux-8
 
 
+  py3-stable-3004-almalinux-8:
+    name: AlmaLinux 8 v3004 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-almalinux-8 || bundle exec kitchen create py3-stable-3004-almalinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-almalinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-almalinux-8
+
+
+  py3-git-3004-almalinux-8:
+    name: AlmaLinux 8 v3004 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3004-almalinux-8 || bundle exec kitchen create py3-git-3004-almalinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3004-almalinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3004-almalinux-8
+
+
+  py3-stable-3004-0-almalinux-8:
+    name: AlmaLinux 8 v3004.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-0-almalinux-8 || bundle exec kitchen create py3-stable-3004-0-almalinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-0-almalinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-0-almalinux-8
+
+
   py3-git-master-almalinux-8:
     name: AlmaLinux 8 Master Py3 Git
     runs-on: ubuntu-latest
@@ -550,6 +688,98 @@ jobs:
           bundle exec kitchen destroy py3-git-3003-amazon-2
 
 
+  py3-stable-3004-amazon-2:
+    name: Amazon 2 v3004 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-amazon-2 || bundle exec kitchen create py3-stable-3004-amazon-2
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-amazon-2
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-amazon-2
+
+
+  py3-git-3004-amazon-2:
+    name: Amazon 2 v3004 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3004-amazon-2 || bundle exec kitchen create py3-git-3004-amazon-2
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3004-amazon-2
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3004-amazon-2
+
+
   py3-git-master-amazon-2:
     name: Amazon 2 Master Py3 Git
     runs-on: ubuntu-latest
@@ -1286,8 +1516,8 @@ jobs:
           bundle exec kitchen destroy py3-stable-3003-0-centos-7
 
 
-  py3-git-master-centos-7:
-    name: CentOS 7 Master Py3 Git
+  py3-stable-3004-centos-7:
+    name: CentOS 7 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1320,20 +1550,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
+          bundle exec kitchen create py3-stable-3004-centos-7 || bundle exec kitchen create py3-stable-3004-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-centos-7
+          bundle exec kitchen verify py3-stable-3004-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-centos-7
+          bundle exec kitchen destroy py3-stable-3004-centos-7
 
 
-  latest-centos-7:
-    name: CentOS 7 Latest packaged release
+  py3-git-3004-centos-7:
+    name: CentOS 7 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1366,20 +1596,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
+          bundle exec kitchen create py3-git-3004-centos-7 || bundle exec kitchen create py3-git-3004-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-7
+          bundle exec kitchen verify py3-git-3004-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-7
+          bundle exec kitchen destroy py3-git-3004-centos-7
 
 
-  py3-stable-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Stable
+  py3-stable-3004-0-centos-7:
+    name: CentOS 7 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1412,20 +1642,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-centos-8 || bundle exec kitchen create py3-stable-3001-centos-8
+          bundle exec kitchen create py3-stable-3004-0-centos-7 || bundle exec kitchen create py3-stable-3004-0-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-centos-8
+          bundle exec kitchen verify py3-stable-3004-0-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-centos-8
+          bundle exec kitchen destroy py3-stable-3004-0-centos-7
 
 
-  py3-git-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Git
+  py3-git-master-centos-7:
+    name: CentOS 7 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1458,20 +1688,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-centos-8 || bundle exec kitchen create py3-git-3001-centos-8
+          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-centos-8
+          bundle exec kitchen verify py3-git-master-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-centos-8
+          bundle exec kitchen destroy py3-git-master-centos-7
 
 
-  py3-stable-3001-0-centos-8:
-    name: CentOS 8 v3001.0 Py3 Stable
+  latest-centos-7:
+    name: CentOS 7 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1504,20 +1734,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-centos-8 || bundle exec kitchen create py3-stable-3001-0-centos-8
+          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-centos-8
+          bundle exec kitchen verify latest-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-centos-8
+          bundle exec kitchen destroy latest-centos-7
 
 
-  py3-stable-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Stable
+  py3-stable-3001-centos-8:
+    name: CentOS 8 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1550,20 +1780,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
+          bundle exec kitchen create py3-stable-3001-centos-8 || bundle exec kitchen create py3-stable-3001-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-centos-8
+          bundle exec kitchen verify py3-stable-3001-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-8
+          bundle exec kitchen destroy py3-stable-3001-centos-8
 
 
-  py3-git-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Git
+  py3-git-3001-centos-8:
+    name: CentOS 8 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1596,20 +1826,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
+          bundle exec kitchen create py3-git-3001-centos-8 || bundle exec kitchen create py3-git-3001-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-centos-8
+          bundle exec kitchen verify py3-git-3001-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-centos-8
+          bundle exec kitchen destroy py3-git-3001-centos-8
 
 
-  py3-stable-3002-0-centos-8:
-    name: CentOS 8 v3002.0 Py3 Stable
+  py3-stable-3001-0-centos-8:
+    name: CentOS 8 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1642,20 +1872,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
+          bundle exec kitchen create py3-stable-3001-0-centos-8 || bundle exec kitchen create py3-stable-3001-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-centos-8
+          bundle exec kitchen verify py3-stable-3001-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-centos-8
+          bundle exec kitchen destroy py3-stable-3001-0-centos-8
 
 
-  py3-stable-3003-centos-8:
-    name: CentOS 8 v3003 Py3 Stable
+  py3-stable-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1688,20 +1918,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-centos-8 || bundle exec kitchen create py3-stable-3003-centos-8
+          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-centos-8
+          bundle exec kitchen verify py3-stable-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-8
+          bundle exec kitchen destroy py3-stable-3002-centos-8
 
 
-  py3-git-3003-centos-8:
-    name: CentOS 8 v3003 Py3 Git
+  py3-git-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1734,20 +1964,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-centos-8 || bundle exec kitchen create py3-git-3003-centos-8
+          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-centos-8
+          bundle exec kitchen verify py3-git-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-centos-8
+          bundle exec kitchen destroy py3-git-3002-centos-8
 
 
-  py3-stable-3003-0-centos-8:
-    name: CentOS 8 v3003.0 Py3 Stable
+  py3-stable-3002-0-centos-8:
+    name: CentOS 8 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1780,20 +2010,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-8 || bundle exec kitchen create py3-stable-3003-0-centos-8
+          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-8
+          bundle exec kitchen verify py3-stable-3002-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-8
+          bundle exec kitchen destroy py3-stable-3002-0-centos-8
 
 
-  py3-git-master-centos-8:
-    name: CentOS 8 Master Py3 Git
+  py3-stable-3003-centos-8:
+    name: CentOS 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1826,20 +2056,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
+          bundle exec kitchen create py3-stable-3003-centos-8 || bundle exec kitchen create py3-stable-3003-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-centos-8
+          bundle exec kitchen verify py3-stable-3003-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-centos-8
+          bundle exec kitchen destroy py3-stable-3003-centos-8
 
 
-  latest-centos-8:
-    name: CentOS 8 Latest packaged release
+  py3-git-3003-centos-8:
+    name: CentOS 8 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1872,20 +2102,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
+          bundle exec kitchen create py3-git-3003-centos-8 || bundle exec kitchen create py3-git-3003-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-8
+          bundle exec kitchen verify py3-git-3003-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-8
+          bundle exec kitchen destroy py3-git-3003-centos-8
 
 
-  py3-stable-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Stable
+  py3-stable-3003-0-centos-8:
+    name: CentOS 8 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1918,20 +2148,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
+          bundle exec kitchen create py3-stable-3003-0-centos-8 || bundle exec kitchen create py3-stable-3003-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-centos-stream8
+          bundle exec kitchen verify py3-stable-3003-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-stream8
+          bundle exec kitchen destroy py3-stable-3003-0-centos-8
 
 
-  py3-git-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Git
+  py3-stable-3004-centos-8:
+    name: CentOS 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1964,20 +2194,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
+          bundle exec kitchen create py3-stable-3004-centos-8 || bundle exec kitchen create py3-stable-3004-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-centos-stream8
+          bundle exec kitchen verify py3-stable-3004-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-centos-stream8
+          bundle exec kitchen destroy py3-stable-3004-centos-8
 
 
-  py3-stable-3003-0-centos-stream8:
-    name: CentOS Stream 8 v3003.0 Py3 Stable
+  py3-git-3004-centos-8:
+    name: CentOS 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2010,20 +2240,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-stream8 || bundle exec kitchen create py3-stable-3003-0-centos-stream8
+          bundle exec kitchen create py3-git-3004-centos-8 || bundle exec kitchen create py3-git-3004-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-stream8
+          bundle exec kitchen verify py3-git-3004-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-stream8
+          bundle exec kitchen destroy py3-git-3004-centos-8
 
 
-  py3-git-master-centos-stream8:
-    name: CentOS Stream 8 Master Py3 Git
+  py3-stable-3004-0-centos-8:
+    name: CentOS 8 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2056,20 +2286,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
+          bundle exec kitchen create py3-stable-3004-0-centos-8 || bundle exec kitchen create py3-stable-3004-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-centos-stream8
+          bundle exec kitchen verify py3-stable-3004-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-centos-stream8
+          bundle exec kitchen destroy py3-stable-3004-0-centos-8
 
 
-  latest-centos-stream8:
-    name: CentOS Stream 8 Latest packaged release
+  py3-git-master-centos-8:
+    name: CentOS 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2102,20 +2332,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
+          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-stream8
+          bundle exec kitchen verify py3-git-master-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-stream8
+          bundle exec kitchen destroy py3-git-master-centos-8
 
 
-  py3-stable-3001-debian-10:
-    name: Debian 10 v3001 Py3 Stable
+  latest-centos-8:
+    name: CentOS 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2148,20 +2378,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
+          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-debian-10
+          bundle exec kitchen verify latest-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-10
+          bundle exec kitchen destroy latest-centos-8
 
 
-  py3-git-3001-debian-10:
-    name: Debian 10 v3001 Py3 Git
+  py3-stable-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2194,20 +2424,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
+          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-debian-10
+          bundle exec kitchen verify py3-stable-3003-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-debian-10
+          bundle exec kitchen destroy py3-stable-3003-centos-stream8
 
 
-  py3-stable-3001-0-debian-10:
-    name: Debian 10 v3001.0 Py3 Stable
+  py3-git-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2240,20 +2470,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-10 || bundle exec kitchen create py3-stable-3001-0-debian-10
+          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-10
+          bundle exec kitchen verify py3-git-3003-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-10
+          bundle exec kitchen destroy py3-git-3003-centos-stream8
 
 
-  py3-stable-3002-debian-10:
-    name: Debian 10 v3002 Py3 Stable
+  py3-stable-3003-0-centos-stream8:
+    name: CentOS Stream 8 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2286,20 +2516,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
+          bundle exec kitchen create py3-stable-3003-0-centos-stream8 || bundle exec kitchen create py3-stable-3003-0-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-debian-10
+          bundle exec kitchen verify py3-stable-3003-0-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-10
+          bundle exec kitchen destroy py3-stable-3003-0-centos-stream8
 
 
-  py3-git-3002-debian-10:
-    name: Debian 10 v3002 Py3 Git
+  py3-stable-3004-centos-stream8:
+    name: CentOS Stream 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2332,20 +2562,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
+          bundle exec kitchen create py3-stable-3004-centos-stream8 || bundle exec kitchen create py3-stable-3004-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-debian-10
+          bundle exec kitchen verify py3-stable-3004-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-debian-10
+          bundle exec kitchen destroy py3-stable-3004-centos-stream8
 
 
-  py3-stable-3002-0-debian-10:
-    name: Debian 10 v3002.0 Py3 Stable
+  py3-git-3004-centos-stream8:
+    name: CentOS Stream 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2378,20 +2608,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
+          bundle exec kitchen create py3-git-3004-centos-stream8 || bundle exec kitchen create py3-git-3004-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-10
+          bundle exec kitchen verify py3-git-3004-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-10
+          bundle exec kitchen destroy py3-git-3004-centos-stream8
 
 
-  py3-stable-3003-debian-10:
-    name: Debian 10 v3003 Py3 Stable
+  py3-stable-3004-0-centos-stream8:
+    name: CentOS Stream 8 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2424,20 +2654,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
+          bundle exec kitchen create py3-stable-3004-0-centos-stream8 || bundle exec kitchen create py3-stable-3004-0-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-debian-10
+          bundle exec kitchen verify py3-stable-3004-0-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-10
+          bundle exec kitchen destroy py3-stable-3004-0-centos-stream8
 
 
-  py3-git-3003-debian-10:
-    name: Debian 10 v3003 Py3 Git
+  py3-git-master-centos-stream8:
+    name: CentOS Stream 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2470,20 +2700,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-debian-10 || bundle exec kitchen create py3-git-3003-debian-10
+          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-debian-10
+          bundle exec kitchen verify py3-git-master-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-debian-10
+          bundle exec kitchen destroy py3-git-master-centos-stream8
 
 
-  py3-stable-3003-0-debian-10:
-    name: Debian 10 v3003.0 Py3 Stable
+  latest-centos-stream8:
+    name: CentOS Stream 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2516,20 +2746,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-10 || bundle exec kitchen create py3-stable-3003-0-debian-10
+          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-10
+          bundle exec kitchen verify latest-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-10
+          bundle exec kitchen destroy latest-centos-stream8
 
 
-  py3-git-master-debian-10:
-    name: Debian 10 Master Py3 Git
+  py3-stable-3001-debian-10:
+    name: Debian 10 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2562,20 +2792,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
+          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-10
+          bundle exec kitchen verify py3-stable-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-10
+          bundle exec kitchen destroy py3-stable-3001-debian-10
 
 
-  latest-debian-10:
-    name: Debian 10 Latest packaged release
+  py3-git-3001-debian-10:
+    name: Debian 10 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2608,20 +2838,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
+          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-10
+          bundle exec kitchen verify py3-git-3001-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-10
+          bundle exec kitchen destroy py3-git-3001-debian-10
 
 
-  py3-stable-3002-debian-11:
-    name: Debian 11 v3002 Py3 Stable
+  py3-stable-3001-0-debian-10:
+    name: Debian 10 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2654,20 +2884,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
+          bundle exec kitchen create py3-stable-3001-0-debian-10 || bundle exec kitchen create py3-stable-3001-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-debian-11
+          bundle exec kitchen verify py3-stable-3001-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-11
+          bundle exec kitchen destroy py3-stable-3001-0-debian-10
 
 
-  py3-git-3002-debian-11:
-    name: Debian 11 v3002 Py3 Git
+  py3-stable-3002-debian-10:
+    name: Debian 10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2700,20 +2930,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
+          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-debian-11
+          bundle exec kitchen verify py3-stable-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-debian-11
+          bundle exec kitchen destroy py3-stable-3002-debian-10
 
 
-  py3-stable-3003-debian-11:
-    name: Debian 11 v3003 Py3 Stable
+  py3-git-3002-debian-10:
+    name: Debian 10 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2746,20 +2976,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11
+          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-debian-11
+          bundle exec kitchen verify py3-git-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-11
+          bundle exec kitchen destroy py3-git-3002-debian-10
 
 
-  py3-git-3003-debian-11:
-    name: Debian 11 v3003 Py3 Git
+  py3-stable-3002-0-debian-10:
+    name: Debian 10 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2792,20 +3022,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-debian-11 || bundle exec kitchen create py3-git-3003-debian-11
+          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-debian-11
+          bundle exec kitchen verify py3-stable-3002-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-debian-11
+          bundle exec kitchen destroy py3-stable-3002-0-debian-10
 
 
-  py3-stable-3003-0-debian-11:
-    name: Debian 11 v3003.0 Py3 Stable
+  py3-stable-3003-debian-10:
+    name: Debian 10 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2838,20 +3068,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11
+          bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-11
+          bundle exec kitchen verify py3-stable-3003-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-11
+          bundle exec kitchen destroy py3-stable-3003-debian-10
 
 
-  py3-git-master-debian-11:
-    name: Debian 11 Master Py3 Git
+  py3-git-3003-debian-10:
+    name: Debian 10 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2884,20 +3114,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
+          bundle exec kitchen create py3-git-3003-debian-10 || bundle exec kitchen create py3-git-3003-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-11
+          bundle exec kitchen verify py3-git-3003-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-11
+          bundle exec kitchen destroy py3-git-3003-debian-10
 
 
-  latest-debian-11:
-    name: Debian 11 Latest packaged release
+  py3-stable-3003-0-debian-10:
+    name: Debian 10 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2930,20 +3160,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
+          bundle exec kitchen create py3-stable-3003-0-debian-10 || bundle exec kitchen create py3-stable-3003-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-11
+          bundle exec kitchen verify py3-stable-3003-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-11
+          bundle exec kitchen destroy py3-stable-3003-0-debian-10
 
 
-  py3-stable-3001-debian-9:
-    name: Debian 9 v3001 Py3 Stable
+  py3-stable-3004-debian-10:
+    name: Debian 10 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -2976,20 +3206,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-debian-9 || bundle exec kitchen create py3-stable-3001-debian-9
+          bundle exec kitchen create py3-stable-3004-debian-10 || bundle exec kitchen create py3-stable-3004-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-debian-9
+          bundle exec kitchen verify py3-stable-3004-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-9
+          bundle exec kitchen destroy py3-stable-3004-debian-10
 
 
-  py3-git-3001-debian-9:
-    name: Debian 9 v3001 Py3 Git
+  py3-git-3004-debian-10:
+    name: Debian 10 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3022,20 +3252,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-debian-9 || bundle exec kitchen create py3-git-3001-debian-9
+          bundle exec kitchen create py3-git-3004-debian-10 || bundle exec kitchen create py3-git-3004-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-debian-9
+          bundle exec kitchen verify py3-git-3004-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-debian-9
+          bundle exec kitchen destroy py3-git-3004-debian-10
 
 
-  py3-stable-3001-0-debian-9:
-    name: Debian 9 v3001.0 Py3 Stable
+  py3-stable-3004-0-debian-10:
+    name: Debian 10 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3068,20 +3298,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-9 || bundle exec kitchen create py3-stable-3001-0-debian-9
+          bundle exec kitchen create py3-stable-3004-0-debian-10 || bundle exec kitchen create py3-stable-3004-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-9
+          bundle exec kitchen verify py3-stable-3004-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-9
+          bundle exec kitchen destroy py3-stable-3004-0-debian-10
 
 
-  py3-stable-3002-debian-9:
-    name: Debian 9 v3002 Py3 Stable
+  py3-git-master-debian-10:
+    name: Debian 10 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3114,20 +3344,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
+          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-debian-9
+          bundle exec kitchen verify py3-git-master-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-9
+          bundle exec kitchen destroy py3-git-master-debian-10
 
 
-  py3-git-3002-debian-9:
-    name: Debian 9 v3002 Py3 Git
+  latest-debian-10:
+    name: Debian 10 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3160,20 +3390,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
+          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-debian-9
+          bundle exec kitchen verify latest-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-debian-9
+          bundle exec kitchen destroy latest-debian-10
 
 
-  py3-stable-3002-0-debian-9:
-    name: Debian 9 v3002.0 Py3 Stable
+  py3-stable-3002-debian-11:
+    name: Debian 11 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3206,20 +3436,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
+          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-9
+          bundle exec kitchen verify py3-stable-3002-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-9
+          bundle exec kitchen destroy py3-stable-3002-debian-11
 
 
-  py3-stable-3003-debian-9:
-    name: Debian 9 v3003 Py3 Stable
+  py3-git-3002-debian-11:
+    name: Debian 11 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3252,20 +3482,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
+          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-debian-9
+          bundle exec kitchen verify py3-git-3002-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-9
+          bundle exec kitchen destroy py3-git-3002-debian-11
 
 
-  py3-git-3003-debian-9:
-    name: Debian 9 v3003 Py3 Git
+  py3-stable-3003-debian-11:
+    name: Debian 11 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3298,20 +3528,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
+          bundle exec kitchen create py3-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-debian-9
+          bundle exec kitchen verify py3-stable-3003-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-debian-9
+          bundle exec kitchen destroy py3-stable-3003-debian-11
 
 
-  py3-stable-3003-0-debian-9:
-    name: Debian 9 v3003.0 Py3 Stable
+  py3-git-3003-debian-11:
+    name: Debian 11 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3344,20 +3574,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-9 || bundle exec kitchen create py3-stable-3003-0-debian-9
+          bundle exec kitchen create py3-git-3003-debian-11 || bundle exec kitchen create py3-git-3003-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-9
+          bundle exec kitchen verify py3-git-3003-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-9
+          bundle exec kitchen destroy py3-git-3003-debian-11
 
 
-  py3-git-master-debian-9:
-    name: Debian 9 Master Py3 Git
+  py3-stable-3003-0-debian-11:
+    name: Debian 11 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3390,20 +3620,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
+          bundle exec kitchen create py3-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-9
+          bundle exec kitchen verify py3-stable-3003-0-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-9
+          bundle exec kitchen destroy py3-stable-3003-0-debian-11
 
 
-  latest-debian-9:
-    name: Debian 9 Latest packaged release
+  py3-stable-3004-debian-11:
+    name: Debian 11 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3436,20 +3666,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
+          bundle exec kitchen create py3-stable-3004-debian-11 || bundle exec kitchen create py3-stable-3004-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-9
+          bundle exec kitchen verify py3-stable-3004-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-9
+          bundle exec kitchen destroy py3-stable-3004-debian-11
 
 
-  py3-git-3001-fedora-33:
-    name: Fedora 33 v3001 Py3 Git
+  py3-git-3004-debian-11:
+    name: Debian 11 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3482,20 +3712,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-33 || bundle exec kitchen create py3-git-3001-fedora-33
+          bundle exec kitchen create py3-git-3004-debian-11 || bundle exec kitchen create py3-git-3004-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-33
+          bundle exec kitchen verify py3-git-3004-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-33
+          bundle exec kitchen destroy py3-git-3004-debian-11
 
 
-  py3-git-3002-fedora-33:
-    name: Fedora 33 v3002 Py3 Git
+  py3-stable-3004-0-debian-11:
+    name: Debian 11 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3528,20 +3758,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
+          bundle exec kitchen create py3-stable-3004-0-debian-11 || bundle exec kitchen create py3-stable-3004-0-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-33
+          bundle exec kitchen verify py3-stable-3004-0-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-33
+          bundle exec kitchen destroy py3-stable-3004-0-debian-11
 
 
-  py3-git-3003-fedora-33:
-    name: Fedora 33 v3003 Py3 Git
+  py3-git-master-debian-11:
+    name: Debian 11 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3574,20 +3804,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-fedora-33 || bundle exec kitchen create py3-git-3003-fedora-33
+          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-fedora-33
+          bundle exec kitchen verify py3-git-master-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-33
+          bundle exec kitchen destroy py3-git-master-debian-11
 
 
-  py3-git-master-fedora-33:
-    name: Fedora 33 Master Py3 Git
+  latest-debian-11:
+    name: Debian 11 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3620,20 +3850,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
+          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-33
+          bundle exec kitchen verify latest-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-33
+          bundle exec kitchen destroy latest-debian-11
 
 
-  latest-fedora-33:
-    name: Fedora 33 Latest packaged release
+  py3-stable-3001-debian-9:
+    name: Debian 9 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3666,20 +3896,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
+          bundle exec kitchen create py3-stable-3001-debian-9 || bundle exec kitchen create py3-stable-3001-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-33
+          bundle exec kitchen verify py3-stable-3001-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-33
+          bundle exec kitchen destroy py3-stable-3001-debian-9
 
 
-  py3-git-3001-fedora-34:
-    name: Fedora 34 v3001 Py3 Git
+  py3-git-3001-debian-9:
+    name: Debian 9 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3712,20 +3942,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-34 || bundle exec kitchen create py3-git-3001-fedora-34
+          bundle exec kitchen create py3-git-3001-debian-9 || bundle exec kitchen create py3-git-3001-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-34
+          bundle exec kitchen verify py3-git-3001-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-34
+          bundle exec kitchen destroy py3-git-3001-debian-9
 
 
-  py3-git-3002-fedora-34:
-    name: Fedora 34 v3002 Py3 Git
+  py3-stable-3001-0-debian-9:
+    name: Debian 9 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3758,20 +3988,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-34 || bundle exec kitchen create py3-git-3002-fedora-34
+          bundle exec kitchen create py3-stable-3001-0-debian-9 || bundle exec kitchen create py3-stable-3001-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-34
+          bundle exec kitchen verify py3-stable-3001-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-34
+          bundle exec kitchen destroy py3-stable-3001-0-debian-9
 
 
-  py3-git-3003-fedora-34:
-    name: Fedora 34 v3003 Py3 Git
+  py3-stable-3002-debian-9:
+    name: Debian 9 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3804,20 +4034,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-fedora-34 || bundle exec kitchen create py3-git-3003-fedora-34
+          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-fedora-34
+          bundle exec kitchen verify py3-stable-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-34
+          bundle exec kitchen destroy py3-stable-3002-debian-9
 
 
-  py3-git-master-fedora-34:
-    name: Fedora 34 Master Py3 Git
+  py3-git-3002-debian-9:
+    name: Debian 9 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3850,20 +4080,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34
+          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-34
+          bundle exec kitchen verify py3-git-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-34
+          bundle exec kitchen destroy py3-git-3002-debian-9
 
 
-  latest-fedora-34:
-    name: Fedora 34 Latest packaged release
+  py3-stable-3002-0-debian-9:
+    name: Debian 9 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3896,20 +4126,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34
+          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-34
+          bundle exec kitchen verify py3-stable-3002-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-34
+          bundle exec kitchen destroy py3-stable-3002-0-debian-9
 
 
-  py3-git-3001-fedora-35:
-    name: Fedora 35 v3001 Py3 Git
+  py3-stable-3003-debian-9:
+    name: Debian 9 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3942,20 +4172,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-35 || bundle exec kitchen create py3-git-3001-fedora-35
+          bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-35
+          bundle exec kitchen verify py3-stable-3003-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-35
+          bundle exec kitchen destroy py3-stable-3003-debian-9
 
 
-  py3-git-3002-fedora-35:
-    name: Fedora 35 v3002 Py3 Git
+  py3-git-3003-debian-9:
+    name: Debian 9 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3988,20 +4218,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-35 || bundle exec kitchen create py3-git-3002-fedora-35
+          bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-35
+          bundle exec kitchen verify py3-git-3003-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-35
+          bundle exec kitchen destroy py3-git-3003-debian-9
 
 
-  py3-git-3003-fedora-35:
-    name: Fedora 35 v3003 Py3 Git
+  py3-stable-3003-0-debian-9:
+    name: Debian 9 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4034,20 +4264,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-fedora-35 || bundle exec kitchen create py3-git-3003-fedora-35
+          bundle exec kitchen create py3-stable-3003-0-debian-9 || bundle exec kitchen create py3-stable-3003-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-fedora-35
+          bundle exec kitchen verify py3-stable-3003-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-35
+          bundle exec kitchen destroy py3-stable-3003-0-debian-9
 
 
-  py3-git-master-fedora-35:
-    name: Fedora 35 Master Py3 Git
+  py3-stable-3004-debian-9:
+    name: Debian 9 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4080,20 +4310,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-35 || bundle exec kitchen create py3-git-master-fedora-35
+          bundle exec kitchen create py3-stable-3004-debian-9 || bundle exec kitchen create py3-stable-3004-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-35
+          bundle exec kitchen verify py3-stable-3004-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-35
+          bundle exec kitchen destroy py3-stable-3004-debian-9
 
 
-  latest-fedora-35:
-    name: Fedora 35 Latest packaged release
+  py3-git-3004-debian-9:
+    name: Debian 9 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4126,20 +4356,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-35 || bundle exec kitchen create latest-fedora-35
+          bundle exec kitchen create py3-git-3004-debian-9 || bundle exec kitchen create py3-git-3004-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-35
+          bundle exec kitchen verify py3-git-3004-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-35
+          bundle exec kitchen destroy py3-git-3004-debian-9
 
 
-  py3-git-3001-opensuse-15:
-    name: Opensuse 15 v3001 Py3 Git
+  py3-stable-3004-0-debian-9:
+    name: Debian 9 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4172,20 +4402,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-opensuse-15 || bundle exec kitchen create py3-git-3001-opensuse-15
+          bundle exec kitchen create py3-stable-3004-0-debian-9 || bundle exec kitchen create py3-stable-3004-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-opensuse-15
+          bundle exec kitchen verify py3-stable-3004-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-opensuse-15
+          bundle exec kitchen destroy py3-stable-3004-0-debian-9
 
 
-  py3-git-3002-opensuse-15:
-    name: Opensuse 15 v3002 Py3 Git
+  py3-git-master-debian-9:
+    name: Debian 9 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4218,20 +4448,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
+          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-opensuse-15
+          bundle exec kitchen verify py3-git-master-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-opensuse-15
+          bundle exec kitchen destroy py3-git-master-debian-9
 
 
-  py3-git-3003-opensuse-15:
-    name: Opensuse 15 v3003 Py3 Git
+  latest-debian-9:
+    name: Debian 9 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4264,21 +4494,21 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-opensuse-15 || bundle exec kitchen create py3-git-3003-opensuse-15
+          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-opensuse-15
+          bundle exec kitchen verify latest-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-opensuse-15
+          bundle exec kitchen destroy latest-debian-9
 
 
-  py3-git-master-opensuse-15:
-    name: Opensuse 15 Master Py3 Git
-    runs-on: ubuntu-latest
+  py3-git-3001-fedora-33:
+    name: Fedora 33 v3001 Py3 Git
+    runs-on: ubuntu-latest
     timeout-minutes: 20
 
     needs: lint
@@ -4310,20 +4540,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
+          bundle exec kitchen create py3-git-3001-fedora-33 || bundle exec kitchen create py3-git-3001-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-opensuse-15
+          bundle exec kitchen verify py3-git-3001-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-15
+          bundle exec kitchen destroy py3-git-3001-fedora-33
 
 
-  latest-opensuse-15:
-    name: Opensuse 15 Latest packaged release
+  py3-git-3002-fedora-33:
+    name: Fedora 33 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4356,20 +4586,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
+          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-opensuse-15
+          bundle exec kitchen verify py3-git-3002-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-opensuse-15
+          bundle exec kitchen destroy py3-git-3002-fedora-33
 
 
-  py3-git-3001-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3001 Py3 Git
+  py3-git-3003-fedora-33:
+    name: Fedora 33 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4402,20 +4632,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-opensuse-tumbleweed || bundle exec kitchen create py3-git-3001-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-3003-fedora-33 || bundle exec kitchen create py3-git-3003-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-3003-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-3003-fedora-33
 
 
-  py3-git-3002-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3002 Py3 Git
+  py3-git-3004-fedora-33:
+    name: Fedora 33 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4448,20 +4678,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-opensuse-tumbleweed || bundle exec kitchen create py3-git-3002-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-3004-fedora-33 || bundle exec kitchen create py3-git-3004-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-3004-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-3004-fedora-33
 
 
-  py3-git-3003-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3003 Py3 Git
+  py3-git-master-fedora-33:
+    name: Fedora 33 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4494,20 +4724,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-opensuse-tumbleweed || bundle exec kitchen create py3-git-3003-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-master-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-master-fedora-33
 
 
-  py3-git-master-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Master Py3 Git
+  latest-fedora-33:
+    name: Fedora 33 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4540,20 +4770,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
+          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
+          bundle exec kitchen verify latest-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
+          bundle exec kitchen destroy latest-fedora-33
 
 
-  latest-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Latest packaged release
+  py3-git-3001-fedora-34:
+    name: Fedora 34 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4586,20 +4816,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-3001-fedora-34 || bundle exec kitchen create py3-git-3001-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-3001-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-3001-fedora-34
 
 
-  py3-stable-3001-oraclelinux-7:
-    name: Oracle Linux 7 v3001 Py3 Stable
+  py3-git-3002-fedora-34:
+    name: Fedora 34 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4632,20 +4862,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-oraclelinux-7
+          bundle exec kitchen create py3-git-3002-fedora-34 || bundle exec kitchen create py3-git-3002-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-oraclelinux-7
+          bundle exec kitchen verify py3-git-3002-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3002-fedora-34
 
 
-  py3-git-3001-oraclelinux-7:
-    name: Oracle Linux 7 v3001 Py3 Git
+  py3-git-3003-fedora-34:
+    name: Fedora 34 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4678,20 +4908,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-oraclelinux-7 || bundle exec kitchen create py3-git-3001-oraclelinux-7
+          bundle exec kitchen create py3-git-3003-fedora-34 || bundle exec kitchen create py3-git-3003-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-oraclelinux-7
+          bundle exec kitchen verify py3-git-3003-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3003-fedora-34
 
 
-  py3-stable-3001-0-oraclelinux-7:
-    name: Oracle Linux 7 v3001.0 Py3 Stable
+  py3-git-3004-fedora-34:
+    name: Fedora 34 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4724,20 +4954,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-0-oraclelinux-7
+          bundle exec kitchen create py3-git-3004-fedora-34 || bundle exec kitchen create py3-git-3004-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-3004-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3004-fedora-34
 
 
-  py3-stable-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Stable
+  py3-git-master-fedora-34:
+    name: Fedora 34 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4770,20 +5000,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
+          bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
+          bundle exec kitchen verify py3-git-master-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
+          bundle exec kitchen destroy py3-git-master-fedora-34
 
 
-  py3-git-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Git
+  latest-fedora-34:
+    name: Fedora 34 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4816,20 +5046,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
+          bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-7
+          bundle exec kitchen verify latest-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
+          bundle exec kitchen destroy latest-fedora-34
 
 
-  py3-stable-3002-0-oraclelinux-7:
-    name: Oracle Linux 7 v3002.0 Py3 Stable
+  py3-git-3001-fedora-35:
+    name: Fedora 35 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4862,20 +5092,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen create py3-git-3001-fedora-35 || bundle exec kitchen create py3-git-3001-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-3001-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3001-fedora-35
 
 
-  py3-stable-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Stable
+  py3-git-3002-fedora-35:
+    name: Fedora 35 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4908,20 +5138,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
+          bundle exec kitchen create py3-git-3002-fedora-35 || bundle exec kitchen create py3-git-3002-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
+          bundle exec kitchen verify py3-git-3002-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3002-fedora-35
 
 
-  py3-git-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Git
+  py3-git-3003-fedora-35:
+    name: Fedora 35 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4954,20 +5184,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
+          bundle exec kitchen create py3-git-3003-fedora-35 || bundle exec kitchen create py3-git-3003-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-7
+          bundle exec kitchen verify py3-git-3003-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3003-fedora-35
 
 
-  py3-stable-3003-0-oraclelinux-7:
-    name: Oracle Linux 7 v3003.0 Py3 Stable
+  py3-git-3004-fedora-35:
+    name: Fedora 35 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5000,20 +5230,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen create py3-git-3004-fedora-35 || bundle exec kitchen create py3-git-3004-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-3004-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3004-fedora-35
 
 
-  py3-git-master-oraclelinux-7:
-    name: Oracle Linux 7 Master Py3 Git
+  py3-git-master-fedora-35:
+    name: Fedora 35 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5046,20 +5276,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
+          bundle exec kitchen create py3-git-master-fedora-35 || bundle exec kitchen create py3-git-master-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-7
+          bundle exec kitchen verify py3-git-master-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-7
+          bundle exec kitchen destroy py3-git-master-fedora-35
 
 
-  latest-oraclelinux-7:
-    name: Oracle Linux 7 Latest packaged release
+  latest-fedora-35:
+    name: Fedora 35 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5092,20 +5322,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
+          bundle exec kitchen create latest-fedora-35 || bundle exec kitchen create latest-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-oraclelinux-7
+          bundle exec kitchen verify latest-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-oraclelinux-7
+          bundle exec kitchen destroy latest-fedora-35
 
 
-  py3-stable-3001-oraclelinux-8:
-    name: Oracle Linux 8 v3001 Py3 Stable
+  py3-git-3001-opensuse-15:
+    name: Opensuse 15 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5138,20 +5368,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-oraclelinux-8 || bundle exec kitchen create py3-stable-3001-oraclelinux-8
+          bundle exec kitchen create py3-git-3001-opensuse-15 || bundle exec kitchen create py3-git-3001-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-oraclelinux-8
+          bundle exec kitchen verify py3-git-3001-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3001-opensuse-15
 
 
-  py3-git-3001-oraclelinux-8:
-    name: Oracle Linux 8 v3001 Py3 Git
+  py3-git-3002-opensuse-15:
+    name: Opensuse 15 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5184,20 +5414,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-oraclelinux-8 || bundle exec kitchen create py3-git-3001-oraclelinux-8
+          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-oraclelinux-8
+          bundle exec kitchen verify py3-git-3002-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3002-opensuse-15
 
 
-  py3-stable-3001-0-oraclelinux-8:
-    name: Oracle Linux 8 v3001.0 Py3 Stable
+  py3-git-3003-opensuse-15:
+    name: Opensuse 15 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5230,20 +5460,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3001-0-oraclelinux-8
+          bundle exec kitchen create py3-git-3003-opensuse-15 || bundle exec kitchen create py3-git-3003-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-oraclelinux-8
+          bundle exec kitchen verify py3-git-3003-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3003-opensuse-15
 
 
-  py3-stable-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Stable
+  py3-git-3004-opensuse-15:
+    name: Opensuse 15 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5276,20 +5506,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8
+          bundle exec kitchen create py3-git-3004-opensuse-15 || bundle exec kitchen create py3-git-3004-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-8
+          bundle exec kitchen verify py3-git-3004-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3004-opensuse-15
 
 
-  py3-git-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Git
+  py3-git-master-opensuse-15:
+    name: Opensuse 15 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5322,20 +5552,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8
+          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-opensuse-15
 
 
-  py3-stable-3002-0-oraclelinux-8:
-    name: Oracle Linux 8 v3002.0 Py3 Stable
+  latest-opensuse-15:
+    name: Opensuse 15 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5368,20 +5598,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen verify latest-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen destroy latest-opensuse-15
 
 
-  py3-stable-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Stable
+  py3-git-3001-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5414,20 +5644,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
+          bundle exec kitchen create py3-git-3001-opensuse-tumbleweed || bundle exec kitchen create py3-git-3001-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
+          bundle exec kitchen verify py3-git-3001-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3001-opensuse-tumbleweed
 
 
-  py3-git-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Git
+  py3-git-3002-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5460,20 +5690,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
+          bundle exec kitchen create py3-git-3002-opensuse-tumbleweed || bundle exec kitchen create py3-git-3002-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-8
+          bundle exec kitchen verify py3-git-3002-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed
 
 
-  py3-stable-3003-0-oraclelinux-8:
-    name: Oracle Linux 8 v3003.0 Py3 Stable
+  py3-git-3003-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5506,20 +5736,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen create py3-git-3003-opensuse-tumbleweed || bundle exec kitchen create py3-git-3003-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen verify py3-git-3003-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3003-opensuse-tumbleweed
 
 
-  py3-git-master-oraclelinux-8:
-    name: Oracle Linux 8 Master Py3 Git
+  py3-git-3004-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5552,20 +5782,1630 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-8 || bundle exec kitchen create py3-git-master-oraclelinux-8
+          bundle exec kitchen create py3-git-3004-opensuse-tumbleweed || bundle exec kitchen create py3-git-3004-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-8
+          bundle exec kitchen verify py3-git-3004-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3004-opensuse-tumbleweed
 
 
-  latest-oraclelinux-8:
-    name: Oracle Linux 8 Latest packaged release
+  py3-git-master-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
+
+
+  latest-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-opensuse-tumbleweed
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-opensuse-tumbleweed
+
+
+  py3-stable-3001-oraclelinux-7:
+    name: Oracle Linux 7 v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-oraclelinux-7
+
+
+  py3-git-3001-oraclelinux-7:
+    name: Oracle Linux 7 v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-oraclelinux-7 || bundle exec kitchen create py3-git-3001-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-oraclelinux-7
+
+
+  py3-stable-3001-0-oraclelinux-7:
+    name: Oracle Linux 7 v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-0-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-oraclelinux-7
+
+
+  py3-stable-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
+
+
+  py3-git-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
+
+
+  py3-stable-3002-0-oraclelinux-7:
+    name: Oracle Linux 7 v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7
+
+
+  py3-stable-3003-oraclelinux-7:
+    name: Oracle Linux 7 v3003 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
+
+
+  py3-git-3003-oraclelinux-7:
+    name: Oracle Linux 7 v3003 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
+
+
+  py3-stable-3003-0-oraclelinux-7:
+    name: Oracle Linux 7 v3003.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3003-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-7
+
+
+  py3-stable-3004-oraclelinux-7:
+    name: Oracle Linux 7 v3004 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-oraclelinux-7
+
+
+  py3-git-3004-oraclelinux-7:
+    name: Oracle Linux 7 v3004 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3004-oraclelinux-7 || bundle exec kitchen create py3-git-3004-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3004-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3004-oraclelinux-7
+
+
+  py3-stable-3004-0-oraclelinux-7:
+    name: Oracle Linux 7 v3004.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-7
+
+
+  py3-git-master-oraclelinux-7:
+    name: Oracle Linux 7 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-oraclelinux-7
+
+
+  latest-oraclelinux-7:
+    name: Oracle Linux 7 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-oraclelinux-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-oraclelinux-7
+
+
+  py3-stable-3001-oraclelinux-8:
+    name: Oracle Linux 8 v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-oraclelinux-8 || bundle exec kitchen create py3-stable-3001-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-oraclelinux-8
+
+
+  py3-git-3001-oraclelinux-8:
+    name: Oracle Linux 8 v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-oraclelinux-8 || bundle exec kitchen create py3-git-3001-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-oraclelinux-8
+
+
+  py3-stable-3001-0-oraclelinux-8:
+    name: Oracle Linux 8 v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3001-0-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-oraclelinux-8
+
+
+  py3-stable-3002-oraclelinux-8:
+    name: Oracle Linux 8 v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-oraclelinux-8
+
+
+  py3-git-3002-oraclelinux-8:
+    name: Oracle Linux 8 v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-oraclelinux-8
+
+
+  py3-stable-3002-0-oraclelinux-8:
+    name: Oracle Linux 8 v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-8
+
+
+  py3-stable-3003-oraclelinux-8:
+    name: Oracle Linux 8 v3003 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
+
+
+  py3-git-3003-oraclelinux-8:
+    name: Oracle Linux 8 v3003 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3003-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
+
+
+  py3-stable-3003-0-oraclelinux-8:
+    name: Oracle Linux 8 v3003.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3003-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-8
+
+
+  py3-stable-3004-oraclelinux-8:
+    name: Oracle Linux 8 v3004 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-oraclelinux-8
+
+
+  py3-git-3004-oraclelinux-8:
+    name: Oracle Linux 8 v3004 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3004-oraclelinux-8 || bundle exec kitchen create py3-git-3004-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3004-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3004-oraclelinux-8
+
+
+  py3-stable-3004-0-oraclelinux-8:
+    name: Oracle Linux 8 v3004.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-8
+
+
+  py3-git-master-oraclelinux-8:
+    name: Oracle Linux 8 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-oraclelinux-8 || bundle exec kitchen create py3-git-master-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-oraclelinux-8
+
+
+  latest-oraclelinux-8:
+    name: Oracle Linux 8 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-oraclelinux-8 || bundle exec kitchen create latest-oraclelinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-oraclelinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-oraclelinux-8
+
+
+  py3-git-master-rockylinux-8:
+    name: Rocky Linux 8 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-rockylinux-8 || bundle exec kitchen create py3-git-master-rockylinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-rockylinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-rockylinux-8
+
+
+  latest-rockylinux-8:
+    name: Rocky Linux 8 Latest packaged release
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create latest-rockylinux-8 || bundle exec kitchen create latest-rockylinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-rockylinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-rockylinux-8
+
+
+  py3-stable-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
+
+
+  py3-git-3001-ubuntu-1604:
+    name: Ubuntu 16.04 v3001 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
+
+
+  py3-stable-3001-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3001.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
+
+
+  py3-stable-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5598,20 +7438,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-oraclelinux-8 || bundle exec kitchen create latest-oraclelinux-8
+          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
 
 
-  py3-git-master-rockylinux-8:
-    name: Rocky Linux 8 Master Py3 Git
+  py3-git-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5644,20 +7484,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-rockylinux-8 || bundle exec kitchen create py3-git-master-rockylinux-8
+          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-rockylinux-8
+          bundle exec kitchen verify py3-git-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-rockylinux-8
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
 
 
-  latest-rockylinux-8:
-    name: Rocky Linux 8 Latest packaged release
+  py3-stable-3002-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5690,20 +7530,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-rockylinux-8 || bundle exec kitchen create latest-rockylinux-8
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-rockylinux-8
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-rockylinux-8
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
 
 
-  py3-stable-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Stable
+  py3-git-master-ubuntu-1604:
+    name: Ubuntu 16.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5736,20 +7576,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
+          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
+          bundle exec kitchen verify py3-git-master-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
+          bundle exec kitchen destroy py3-git-master-ubuntu-1604
 
 
-  py3-git-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Git
+  latest-ubuntu-1604:
+    name: Ubuntu 16.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5782,20 +7622,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
+          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-1604
+          bundle exec kitchen verify latest-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
+          bundle exec kitchen destroy latest-ubuntu-1604
 
 
-  py3-stable-3001-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3001.0 Py3 Stable
+  py3-stable-3001-ubuntu-1804:
+    name: Ubuntu 18.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5828,20 +7668,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen create py3-stable-3001-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3001-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-1804
 
 
-  py3-stable-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Stable
+  py3-git-3001-ubuntu-1804:
+    name: Ubuntu 18.04 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5874,20 +7714,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
+          bundle exec kitchen create py3-git-3001-ubuntu-1804 || bundle exec kitchen create py3-git-3001-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
+          bundle exec kitchen verify py3-git-3001-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3001-ubuntu-1804
 
 
-  py3-git-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Git
+  py3-stable-3001-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5920,20 +7760,158 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1804
+
+
+  py3-stable-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
+
+
+  py3-git-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-ubuntu-1804
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
+
+
+  py3-stable-3002-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3002.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1804
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1804
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804
 
 
-  py3-stable-3002-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3002.0 Py3 Stable
+  py3-stable-3003-ubuntu-1804:
+    name: Ubuntu 18.04 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5966,20 +7944,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
 
 
-  py3-git-master-ubuntu-1604:
-    name: Ubuntu 16.04 Master Py3 Git
+  py3-git-3003-ubuntu-1804:
+    name: Ubuntu 18.04 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6012,20 +7990,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
+          bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1604
+          bundle exec kitchen verify py3-git-3003-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
 
 
-  latest-ubuntu-1604:
-    name: Ubuntu 16.04 Latest packaged release
+  py3-stable-3003-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6058,20 +8036,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
+          bundle exec kitchen create py3-stable-3003-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-1804
 
 
-  py3-stable-3001-ubuntu-1804:
-    name: Ubuntu 18.04 v3001 Py3 Stable
+  py3-stable-3004-ubuntu-1804:
+    name: Ubuntu 18.04 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6104,20 +8082,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-ubuntu-1804
+          bundle exec kitchen create py3-stable-3004-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3004-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-1804
 
 
-  py3-git-3001-ubuntu-1804:
-    name: Ubuntu 18.04 v3001 Py3 Git
+  py3-git-3004-ubuntu-1804:
+    name: Ubuntu 18.04 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6150,20 +8128,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-1804 || bundle exec kitchen create py3-git-3001-ubuntu-1804
+          bundle exec kitchen create py3-git-3004-ubuntu-1804 || bundle exec kitchen create py3-git-3004-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-1804
+          bundle exec kitchen verify py3-git-3004-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3004-ubuntu-1804
 
 
-  py3-stable-3001-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3001.0 Py3 Stable
+  py3-stable-3004-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6196,20 +8174,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen create py3-stable-3004-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3004-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-1804
 
 
-  py3-stable-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Stable
+  py3-git-master-ubuntu-1804:
+    name: Ubuntu 18.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6242,20 +8220,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
+          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
+          bundle exec kitchen verify py3-git-master-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
+          bundle exec kitchen destroy py3-git-master-ubuntu-1804
 
 
-  py3-git-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Git
+  latest-ubuntu-1804:
+    name: Ubuntu 18.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6288,20 +8266,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
+          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1804
+          bundle exec kitchen verify latest-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
+          bundle exec kitchen destroy latest-ubuntu-1804
 
 
-  py3-stable-3002-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3002.0 Py3 Stable
+  py3-stable-3001-ubuntu-2004:
+    name: Ubuntu 20.04 v3001 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6334,20 +8312,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen create py3-stable-3001-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3001-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3001-ubuntu-2004
 
 
-  py3-stable-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Stable
+  py3-git-3001-ubuntu-2004:
+    name: Ubuntu 20.04 v3001 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6380,20 +8358,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
+          bundle exec kitchen create py3-git-3001-ubuntu-2004 || bundle exec kitchen create py3-git-3001-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
+          bundle exec kitchen verify py3-git-3001-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3001-ubuntu-2004
 
 
-  py3-git-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Git
+  py3-stable-3001-0-ubuntu-2004:
+    name: Ubuntu 20.04 v3001.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6426,20 +8404,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
+          bundle exec kitchen create py3-stable-3001-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-0-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3001-0-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-2004
 
 
-  py3-stable-3003-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3003.0 Py3 Stable
+  py3-stable-3002-ubuntu-2004:
+    name: Ubuntu 20.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6472,20 +8450,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2004
 
 
-  py3-git-master-ubuntu-1804:
-    name: Ubuntu 18.04 Master Py3 Git
+  py3-git-3002-ubuntu-2004:
+    name: Ubuntu 20.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6518,20 +8496,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
+          bundle exec kitchen create py3-git-3002-ubuntu-2004 || bundle exec kitchen create py3-git-3002-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1804
+          bundle exec kitchen verify py3-git-3002-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3002-ubuntu-2004
 
 
-  latest-ubuntu-1804:
-    name: Ubuntu 18.04 Latest packaged release
+  py3-stable-3002-0-ubuntu-2004:
+    name: Ubuntu 20.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6564,20 +8542,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-0-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-2004
 
 
-  py3-stable-3001-ubuntu-2004:
-    name: Ubuntu 20.04 v3001 Py3 Stable
+  py3-stable-3003-ubuntu-2004:
+    name: Ubuntu 20.04 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6610,20 +8588,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-ubuntu-2004
+          bundle exec kitchen create py3-stable-3003-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3003-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-2004
 
 
-  py3-git-3001-ubuntu-2004:
-    name: Ubuntu 20.04 v3001 Py3 Git
+  py3-git-3003-ubuntu-2004:
+    name: Ubuntu 20.04 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6656,20 +8634,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-2004 || bundle exec kitchen create py3-git-3001-ubuntu-2004
+          bundle exec kitchen create py3-git-3003-ubuntu-2004 || bundle exec kitchen create py3-git-3003-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-2004
+          bundle exec kitchen verify py3-git-3003-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-2004
+          bundle exec kitchen destroy py3-git-3003-ubuntu-2004
 
 
-  py3-stable-3001-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3001.0 Py3 Stable
+  py3-stable-3003-0-ubuntu-2004:
+    name: Ubuntu 20.04 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6702,20 +8680,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen create py3-stable-3003-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2004
 
 
-  py3-stable-3002-ubuntu-2004:
-    name: Ubuntu 20.04 v3002 Py3 Stable
+  py3-stable-3004-ubuntu-2004:
+    name: Ubuntu 20.04 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6748,20 +8726,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-ubuntu-2004
+          bundle exec kitchen create py3-stable-3004-ubuntu-2004 || bundle exec kitchen create py3-stable-3004-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3004-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-2004
 
 
-  py3-git-3002-ubuntu-2004:
-    name: Ubuntu 20.04 v3002 Py3 Git
+  py3-git-3004-ubuntu-2004:
+    name: Ubuntu 20.04 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6794,20 +8772,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-2004 || bundle exec kitchen create py3-git-3002-ubuntu-2004
+          bundle exec kitchen create py3-git-3004-ubuntu-2004 || bundle exec kitchen create py3-git-3004-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-2004
+          bundle exec kitchen verify py3-git-3004-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-2004
+          bundle exec kitchen destroy py3-git-3004-ubuntu-2004
 
 
-  py3-stable-3002-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3002.0 Py3 Stable
+  py3-stable-3004-0-ubuntu-2004:
+    name: Ubuntu 20.04 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6840,20 +8818,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-0-ubuntu-2004
+          bundle exec kitchen create py3-stable-3004-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3004-0-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3004-0-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-2004
 
 
-  py3-stable-3003-ubuntu-2004:
-    name: Ubuntu 20.04 v3003 Py3 Stable
+  py3-git-master-ubuntu-2004:
+    name: Ubuntu 20.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6886,20 +8864,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-ubuntu-2004
+          bundle exec kitchen create py3-git-master-ubuntu-2004 || bundle exec kitchen create py3-git-master-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-2004
+          bundle exec kitchen verify py3-git-master-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-2004
+          bundle exec kitchen destroy py3-git-master-ubuntu-2004
 
 
-  py3-git-3003-ubuntu-2004:
-    name: Ubuntu 20.04 v3003 Py3 Git
+  latest-ubuntu-2004:
+    name: Ubuntu 20.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6932,20 +8910,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-2004 || bundle exec kitchen create py3-git-3003-ubuntu-2004
+          bundle exec kitchen create latest-ubuntu-2004 || bundle exec kitchen create latest-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-2004
+          bundle exec kitchen verify latest-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-2004
+          bundle exec kitchen destroy latest-ubuntu-2004
 
 
-  py3-stable-3003-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3003.0 Py3 Stable
+  py3-stable-3002-ubuntu-2110:
+    name: Ubuntu 21.10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6978,20 +8956,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2004
+          bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2110
 
 
-  py3-git-master-ubuntu-2004:
-    name: Ubuntu 20.04 Master Py3 Git
+  py3-git-3002-ubuntu-2110:
+    name: Ubuntu 21.10 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7024,20 +9002,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-2004 || bundle exec kitchen create py3-git-master-ubuntu-2004
+          bundle exec kitchen create py3-git-3002-ubuntu-2110 || bundle exec kitchen create py3-git-3002-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-2004
+          bundle exec kitchen verify py3-git-3002-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-2004
+          bundle exec kitchen destroy py3-git-3002-ubuntu-2110
 
 
-  latest-ubuntu-2004:
-    name: Ubuntu 20.04 Latest packaged release
+  py3-stable-3003-ubuntu-2110:
+    name: Ubuntu 21.10 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7070,20 +9048,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-2004 || bundle exec kitchen create latest-ubuntu-2004
+          bundle exec kitchen create py3-stable-3003-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3003-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-2110
 
 
-  py3-stable-3002-ubuntu-2110:
-    name: Ubuntu 21.10 v3002 Py3 Stable
+  py3-git-3003-ubuntu-2110:
+    name: Ubuntu 21.10 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7116,20 +9094,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110
+          bundle exec kitchen create py3-git-3003-ubuntu-2110 || bundle exec kitchen create py3-git-3003-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-2110
+          bundle exec kitchen verify py3-git-3003-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-2110
+          bundle exec kitchen destroy py3-git-3003-ubuntu-2110
 
 
-  py3-git-3002-ubuntu-2110:
-    name: Ubuntu 21.10 v3002 Py3 Git
+  py3-stable-3003-0-ubuntu-2110:
+    name: Ubuntu 21.10 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7162,20 +9140,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-2110 || bundle exec kitchen create py3-git-3002-ubuntu-2110
+          bundle exec kitchen create py3-stable-3003-0-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-2110
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-2110
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2110
 
 
-  py3-stable-3003-ubuntu-2110:
-    name: Ubuntu 21.10 v3003 Py3 Stable
+  py3-stable-3004-ubuntu-2110:
+    name: Ubuntu 21.10 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7208,20 +9186,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-ubuntu-2110
+          bundle exec kitchen create py3-stable-3004-ubuntu-2110 || bundle exec kitchen create py3-stable-3004-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-2110
+          bundle exec kitchen verify py3-stable-3004-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-2110
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-2110
 
 
-  py3-git-3003-ubuntu-2110:
-    name: Ubuntu 21.10 v3003 Py3 Git
+  py3-git-3004-ubuntu-2110:
+    name: Ubuntu 21.10 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7254,20 +9232,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-2110 || bundle exec kitchen create py3-git-3003-ubuntu-2110
+          bundle exec kitchen create py3-git-3004-ubuntu-2110 || bundle exec kitchen create py3-git-3004-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-2110
+          bundle exec kitchen verify py3-git-3004-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-2110
+          bundle exec kitchen destroy py3-git-3004-ubuntu-2110
 
 
-  py3-stable-3003-0-ubuntu-2110:
-    name: Ubuntu 21.10 v3003.0 Py3 Stable
+  py3-stable-3004-0-ubuntu-2110:
+    name: Ubuntu 21.10 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7300,16 +9278,16 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2110
+          bundle exec kitchen create py3-stable-3004-0-ubuntu-2110 || bundle exec kitchen create py3-stable-3004-0-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2110
+          bundle exec kitchen verify py3-stable-3004-0-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2110
+          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-2110
 
 
   py3-git-master-ubuntu-2110:
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 8602fdc90..0082bb65d 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -103,6 +103,21 @@
     "ubuntu-1604",
 ]
 
+BLACKLIST_3004 = [
+    "rockylinux-8",
+    "ubuntu-1604",
+    "arch",
+]
+
+BLACKLIST_3004_0 = [
+    "amazon-2",
+    "gentoo",
+    "gentoo-systemd",
+    "rockylinux-8",
+    "ubuntu-1604",
+    "arch",
+]
+
 SALT_BRANCHES = [
     "3001",
     "3001-0",
@@ -110,6 +125,8 @@
     "3002-0",
     "3003",
     "3003-0",
+    "3004",
+    "3004-0",
     "master",
     "latest",
 ]
@@ -121,6 +138,8 @@
     "3002-0": "v3002.0",
     "3003": "v3003",
     "3003-0": "v3003.0",
+    "3004": "v3004",
+    "3004-0": "v3004.0",
     "master": "Master",
     "latest": "Latest",
 }
@@ -254,6 +273,11 @@ def generate_test_jobs():
                     if branch == "3003-0" and distro in BLACKLIST_3003_0:
                         continue
 
+                    if branch == "3004" and distro in BLACKLIST_3004:
+                        continue
+
+                    if branch == "3004-0" and distro in BLACKLIST_3004_0:
+                        continue
                     if distro in LINUX_DISTROS:
                         template = "linux.yml"
                     elif distro in OSX:
diff --git a/kitchen.windows.yml b/kitchen.windows.yml
index 1ed244693..13fa86ff5 100644
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@@ -26,6 +26,9 @@ suites:
   - name: py3-stable-3003
     provisioner:
       salt_version: 3003
+  - name: py3-stable-3004
+    provisioner:
+      salt_version: 3004
   - name: latest
     provisioner:
       salt_version: latest
diff --git a/kitchen.yml b/kitchen.yml
index 3d614ecd7..bf59d09cb 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -129,6 +129,10 @@ suites:
     provisioner:
       salt_version: 3003
       salt_bootstrap_options: -x python3 -MPfq git %s
+  - name: py3-git-3004
+    provisioner:
+      salt_version: 3004
+      salt_bootstrap_options: -x python3 -MPfq git %s
   - name: py3-stable-3001-0
     provisioner:
       salt_version: 3001
@@ -209,6 +213,31 @@ suites:
       - freebsd-130
       - freebsd-123
       - openbsd-6
+  - name: py3-stable-3004-0
+    provisioner:
+      salt_version: 3004
+      salt_bootstrap_options: -x python3 -MP stable 3004.0
+    excludes:
+      - opensuse-15
+      - opensuse-tumbleweed
+      - fedora-33
+      - arch
+      - gentoo
+      - gentoo-systemd
+      - freebsd-130
+      - freebsd-123
+      - openbsd-6
+  - name: py3-stable-3004
+    provisioner:
+      salt_version: 3004
+      salt_bootstrap_options: -x python3 -MP stable %s
+    excludes:
+      - opensuse-15
+      - opensuse-tumbleweed
+      - arch
+      - freebsd-130
+      - freebsd-123
+      - openbsd-6
   - name: py3-git-master
     provisioner:
       salt_version: master

From a143b26bd42084f20dd955b10969f288c9938555 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Tue, 11 Jan 2022 09:18:03 +0100
Subject: [PATCH 092/135] Remove 3001 from CI: EoL

---
 .github/workflows/kitchen.vagrant.yml   |    3 -
 .github/workflows/kitchen.windows.yml   |    2 -
 .github/workflows/main-branch-only.yml  |  184 --
 .github/workflows/main.yml              | 2880 +++++------------------
 .github/workflows/templates/generate.py |   31 +-
 kitchen.windows.yml                     |    3 -
 kitchen.yml                             |   33 -
 7 files changed, 636 insertions(+), 2500 deletions(-)

diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 62c9c7119..71fab7aa1 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -41,9 +41,6 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - py3-git-3001-freebsd-130
-          - py3-git-3001-freebsd-123
-          # - py3-git-3001-openbsd-6
           - py3-git-3002-freebsd-130
           - py3-git-3002-freebsd-123
           # - py3-git-3002-openbsd-6
diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
index ba211cd31..572806e65 100644
--- a/.github/workflows/kitchen.windows.yml
+++ b/.github/workflows/kitchen.windows.yml
@@ -44,7 +44,6 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - py3-stable-3001-windows-2022
           - py3-stable-3002-windows-2022
           - py3-stable-3003-windows-2022
           - py3-stable-3004-windows-2022
@@ -100,7 +99,6 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - py3-stable-3001-windows-2019
           - py3-stable-3002-windows-2019
           - py3-stable-3003-windows-2019
           - py3-stable-3004-windows-2019
diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index fe72c9aa8..2f8c43748 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -8,98 +8,6 @@ on: [push]
 
 jobs:
 
-  py3-stable-3001-gentoo:
-    name: Gentoo v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-gentoo || bundle exec kitchen create py3-stable-3001-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-gentoo
-
-
-  py3-git-3001-gentoo:
-    name: Gentoo v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-gentoo || bundle exec kitchen create py3-git-3001-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-gentoo
-
-
   py3-stable-3002-gentoo:
     name: Gentoo v3002 Py3 Stable
     runs-on: ubuntu-latest
@@ -468,98 +376,6 @@ jobs:
           bundle exec kitchen destroy latest-gentoo
 
 
-  py3-stable-3001-gentoo-systemd:
-    name: Gentoo (systemd) v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-gentoo-systemd || bundle exec kitchen create py3-stable-3001-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-gentoo-systemd
-
-
-  py3-git-3001-gentoo-systemd:
-    name: Gentoo (systemd) v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-gentoo-systemd || bundle exec kitchen create py3-git-3001-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-gentoo-systemd
-
-
   py3-stable-3002-gentoo-systemd:
     name: Gentoo (systemd) v3002 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6ac27cce2..acdfafd8f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -412,98 +412,6 @@ jobs:
           bundle exec kitchen destroy latest-almalinux-8
 
 
-  py3-stable-3001-amazon-2:
-    name: Amazon 2 v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-amazon-2 || bundle exec kitchen create py3-stable-3001-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-amazon-2
-
-
-  py3-git-3001-amazon-2:
-    name: Amazon 2 v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-amazon-2 || bundle exec kitchen create py3-git-3001-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-amazon-2
-
-
   py3-stable-3002-amazon-2:
     name: Amazon 2 v3002 Py3 Stable
     runs-on: ubuntu-latest
@@ -872,52 +780,6 @@ jobs:
           bundle exec kitchen destroy latest-amazon-2
 
 
-  py3-git-3001-arch:
-    name: Arch v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-arch || bundle exec kitchen create py3-git-3001-arch
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-arch
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-arch
-
-
   py3-git-3002-arch:
     name: Arch v3002 Py3 Git
     runs-on: ubuntu-latest
@@ -1102,8 +964,8 @@ jobs:
           bundle exec kitchen destroy latest-arch
 
 
-  py3-stable-3001-centos-7:
-    name: CentOS 7 v3001 Py3 Stable
+  py3-stable-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1136,20 +998,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-centos-7 || bundle exec kitchen create py3-stable-3001-centos-7
+          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-centos-7
+          bundle exec kitchen verify py3-stable-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-centos-7
+          bundle exec kitchen destroy py3-stable-3002-centos-7
 
 
-  py3-git-3001-centos-7:
-    name: CentOS 7 v3001 Py3 Git
+  py3-git-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1182,20 +1044,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-centos-7 || bundle exec kitchen create py3-git-3001-centos-7
+          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-centos-7
+          bundle exec kitchen verify py3-git-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-centos-7
+          bundle exec kitchen destroy py3-git-3002-centos-7
 
 
-  py3-stable-3001-0-centos-7:
-    name: CentOS 7 v3001.0 Py3 Stable
+  py3-stable-3002-0-centos-7:
+    name: CentOS 7 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1228,20 +1090,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-centos-7 || bundle exec kitchen create py3-stable-3001-0-centos-7
+          bundle exec kitchen create py3-stable-3002-0-centos-7 || bundle exec kitchen create py3-stable-3002-0-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-centos-7
+          bundle exec kitchen verify py3-stable-3002-0-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-centos-7
+          bundle exec kitchen destroy py3-stable-3002-0-centos-7
 
 
-  py3-stable-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Stable
+  py3-stable-3003-centos-7:
+    name: CentOS 7 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1274,20 +1136,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
+          bundle exec kitchen create py3-stable-3003-centos-7 || bundle exec kitchen create py3-stable-3003-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-centos-7
+          bundle exec kitchen verify py3-stable-3003-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-7
+          bundle exec kitchen destroy py3-stable-3003-centos-7
 
 
-  py3-git-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Git
+  py3-git-3003-centos-7:
+    name: CentOS 7 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1320,20 +1182,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
+          bundle exec kitchen create py3-git-3003-centos-7 || bundle exec kitchen create py3-git-3003-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-centos-7
+          bundle exec kitchen verify py3-git-3003-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-centos-7
+          bundle exec kitchen destroy py3-git-3003-centos-7
 
 
-  py3-stable-3002-0-centos-7:
-    name: CentOS 7 v3002.0 Py3 Stable
+  py3-stable-3003-0-centos-7:
+    name: CentOS 7 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1366,20 +1228,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-centos-7 || bundle exec kitchen create py3-stable-3002-0-centos-7
+          bundle exec kitchen create py3-stable-3003-0-centos-7 || bundle exec kitchen create py3-stable-3003-0-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-centos-7
+          bundle exec kitchen verify py3-stable-3003-0-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-centos-7
+          bundle exec kitchen destroy py3-stable-3003-0-centos-7
 
 
-  py3-stable-3003-centos-7:
-    name: CentOS 7 v3003 Py3 Stable
+  py3-stable-3004-centos-7:
+    name: CentOS 7 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1412,20 +1274,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-centos-7 || bundle exec kitchen create py3-stable-3003-centos-7
+          bundle exec kitchen create py3-stable-3004-centos-7 || bundle exec kitchen create py3-stable-3004-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-centos-7
+          bundle exec kitchen verify py3-stable-3004-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-7
+          bundle exec kitchen destroy py3-stable-3004-centos-7
 
 
-  py3-git-3003-centos-7:
-    name: CentOS 7 v3003 Py3 Git
+  py3-git-3004-centos-7:
+    name: CentOS 7 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1458,20 +1320,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-centos-7 || bundle exec kitchen create py3-git-3003-centos-7
+          bundle exec kitchen create py3-git-3004-centos-7 || bundle exec kitchen create py3-git-3004-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-centos-7
+          bundle exec kitchen verify py3-git-3004-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-centos-7
+          bundle exec kitchen destroy py3-git-3004-centos-7
 
 
-  py3-stable-3003-0-centos-7:
-    name: CentOS 7 v3003.0 Py3 Stable
+  py3-stable-3004-0-centos-7:
+    name: CentOS 7 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1504,20 +1366,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-7 || bundle exec kitchen create py3-stable-3003-0-centos-7
+          bundle exec kitchen create py3-stable-3004-0-centos-7 || bundle exec kitchen create py3-stable-3004-0-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-7
+          bundle exec kitchen verify py3-stable-3004-0-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-7
+          bundle exec kitchen destroy py3-stable-3004-0-centos-7
 
 
-  py3-stable-3004-centos-7:
-    name: CentOS 7 v3004 Py3 Stable
+  py3-git-master-centos-7:
+    name: CentOS 7 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1550,20 +1412,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-centos-7 || bundle exec kitchen create py3-stable-3004-centos-7
+          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-centos-7
+          bundle exec kitchen verify py3-git-master-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-7
+          bundle exec kitchen destroy py3-git-master-centos-7
 
 
-  py3-git-3004-centos-7:
-    name: CentOS 7 v3004 Py3 Git
+  latest-centos-7:
+    name: CentOS 7 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1596,20 +1458,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-centos-7 || bundle exec kitchen create py3-git-3004-centos-7
+          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-centos-7
+          bundle exec kitchen verify latest-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-centos-7
+          bundle exec kitchen destroy latest-centos-7
 
 
-  py3-stable-3004-0-centos-7:
-    name: CentOS 7 v3004.0 Py3 Stable
+  py3-stable-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1642,20 +1504,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-centos-7 || bundle exec kitchen create py3-stable-3004-0-centos-7
+          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-centos-7
+          bundle exec kitchen verify py3-stable-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-centos-7
+          bundle exec kitchen destroy py3-stable-3002-centos-8
 
 
-  py3-git-master-centos-7:
-    name: CentOS 7 Master Py3 Git
+  py3-git-3002-centos-8:
+    name: CentOS 8 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1688,20 +1550,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
+          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-centos-7
+          bundle exec kitchen verify py3-git-3002-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-centos-7
+          bundle exec kitchen destroy py3-git-3002-centos-8
 
 
-  latest-centos-7:
-    name: CentOS 7 Latest packaged release
+  py3-stable-3002-0-centos-8:
+    name: CentOS 8 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1734,20 +1596,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
+          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-7
+          bundle exec kitchen verify py3-stable-3002-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-7
+          bundle exec kitchen destroy py3-stable-3002-0-centos-8
 
 
-  py3-stable-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Stable
+  py3-stable-3003-centos-8:
+    name: CentOS 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1780,20 +1642,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-centos-8 || bundle exec kitchen create py3-stable-3001-centos-8
+          bundle exec kitchen create py3-stable-3003-centos-8 || bundle exec kitchen create py3-stable-3003-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-centos-8
+          bundle exec kitchen verify py3-stable-3003-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-centos-8
+          bundle exec kitchen destroy py3-stable-3003-centos-8
 
 
-  py3-git-3001-centos-8:
-    name: CentOS 8 v3001 Py3 Git
+  py3-git-3003-centos-8:
+    name: CentOS 8 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1826,1492 +1688,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-centos-8 || bundle exec kitchen create py3-git-3001-centos-8
+          bundle exec kitchen create py3-git-3003-centos-8 || bundle exec kitchen create py3-git-3003-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-centos-8
-
-
-  py3-stable-3001-0-centos-8:
-    name: CentOS 8 v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-centos-8 || bundle exec kitchen create py3-stable-3001-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-centos-8
-
-
-  py3-stable-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-8
-
-
-  py3-git-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-centos-8
-
-
-  py3-stable-3002-0-centos-8:
-    name: CentOS 8 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-centos-8
-
-
-  py3-stable-3003-centos-8:
-    name: CentOS 8 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-centos-8 || bundle exec kitchen create py3-stable-3003-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-8
-
-
-  py3-git-3003-centos-8:
-    name: CentOS 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-centos-8 || bundle exec kitchen create py3-git-3003-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-centos-8
-
-
-  py3-stable-3003-0-centos-8:
-    name: CentOS 8 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-8 || bundle exec kitchen create py3-stable-3003-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-8
-
-
-  py3-stable-3004-centos-8:
-    name: CentOS 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-centos-8 || bundle exec kitchen create py3-stable-3004-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-8
-
-
-  py3-git-3004-centos-8:
-    name: CentOS 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-centos-8 || bundle exec kitchen create py3-git-3004-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-centos-8
-
-
-  py3-stable-3004-0-centos-8:
-    name: CentOS 8 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-centos-8 || bundle exec kitchen create py3-stable-3004-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-0-centos-8
-
-
-  py3-git-master-centos-8:
-    name: CentOS 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-8
-
-
-  latest-centos-8:
-    name: CentOS 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-8
-
-
-  py3-stable-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-stream8
-
-
-  py3-git-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-centos-stream8
-
-
-  py3-stable-3003-0-centos-stream8:
-    name: CentOS Stream 8 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-stream8 || bundle exec kitchen create py3-stable-3003-0-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-stream8
-
-
-  py3-stable-3004-centos-stream8:
-    name: CentOS Stream 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-centos-stream8 || bundle exec kitchen create py3-stable-3004-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-stream8
-
-
-  py3-git-3004-centos-stream8:
-    name: CentOS Stream 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-centos-stream8 || bundle exec kitchen create py3-git-3004-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-centos-stream8
-
-
-  py3-stable-3004-0-centos-stream8:
-    name: CentOS Stream 8 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-centos-stream8 || bundle exec kitchen create py3-stable-3004-0-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-0-centos-stream8
-
-
-  py3-git-master-centos-stream8:
-    name: CentOS Stream 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-stream8
-
-
-  latest-centos-stream8:
-    name: CentOS Stream 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-stream8
-
-
-  py3-stable-3001-debian-10:
-    name: Debian 10 v3001 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-debian-10 || bundle exec kitchen create py3-stable-3001-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-10
-
-
-  py3-git-3001-debian-10:
-    name: Debian 10 v3001 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3001-debian-10 || bundle exec kitchen create py3-git-3001-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-debian-10
-
-
-  py3-stable-3001-0-debian-10:
-    name: Debian 10 v3001.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-10 || bundle exec kitchen create py3-stable-3001-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-10
-
-
-  py3-stable-3002-debian-10:
-    name: Debian 10 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-10
-
-
-  py3-git-3002-debian-10:
-    name: Debian 10 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-debian-10
-
-
-  py3-stable-3002-0-debian-10:
-    name: Debian 10 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-10
-
-
-  py3-stable-3003-debian-10:
-    name: Debian 10 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-10
-
-
-  py3-git-3003-debian-10:
-    name: Debian 10 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-debian-10 || bundle exec kitchen create py3-git-3003-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-debian-10
-
-
-  py3-stable-3003-0-debian-10:
-    name: Debian 10 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-10 || bundle exec kitchen create py3-stable-3003-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-10
-
-
-  py3-stable-3004-debian-10:
-    name: Debian 10 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-debian-10 || bundle exec kitchen create py3-stable-3004-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-10
-
-
-  py3-git-3004-debian-10:
-    name: Debian 10 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-debian-10 || bundle exec kitchen create py3-git-3004-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-debian-10
-
-
-  py3-stable-3004-0-debian-10:
-    name: Debian 10 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-debian-10 || bundle exec kitchen create py3-stable-3004-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-debian-10
+          bundle exec kitchen verify py3-git-3003-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-debian-10
+          bundle exec kitchen destroy py3-git-3003-centos-8
 
 
-  py3-git-master-debian-10:
-    name: Debian 10 Master Py3 Git
+  py3-stable-3003-0-centos-8:
+    name: CentOS 8 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3344,20 +1734,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
+          bundle exec kitchen create py3-stable-3003-0-centos-8 || bundle exec kitchen create py3-stable-3003-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-10
+          bundle exec kitchen verify py3-stable-3003-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-10
+          bundle exec kitchen destroy py3-stable-3003-0-centos-8
 
 
-  latest-debian-10:
-    name: Debian 10 Latest packaged release
+  py3-stable-3004-centos-8:
+    name: CentOS 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3390,20 +1780,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
+          bundle exec kitchen create py3-stable-3004-centos-8 || bundle exec kitchen create py3-stable-3004-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-10
+          bundle exec kitchen verify py3-stable-3004-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-10
+          bundle exec kitchen destroy py3-stable-3004-centos-8
 
 
-  py3-stable-3002-debian-11:
-    name: Debian 11 v3002 Py3 Stable
+  py3-git-3004-centos-8:
+    name: CentOS 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3436,20 +1826,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
+          bundle exec kitchen create py3-git-3004-centos-8 || bundle exec kitchen create py3-git-3004-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-debian-11
+          bundle exec kitchen verify py3-git-3004-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-11
+          bundle exec kitchen destroy py3-git-3004-centos-8
 
 
-  py3-git-3002-debian-11:
-    name: Debian 11 v3002 Py3 Git
+  py3-stable-3004-0-centos-8:
+    name: CentOS 8 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3482,20 +1872,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
+          bundle exec kitchen create py3-stable-3004-0-centos-8 || bundle exec kitchen create py3-stable-3004-0-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-debian-11
+          bundle exec kitchen verify py3-stable-3004-0-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-debian-11
+          bundle exec kitchen destroy py3-stable-3004-0-centos-8
 
 
-  py3-stable-3003-debian-11:
-    name: Debian 11 v3003 Py3 Stable
+  py3-git-master-centos-8:
+    name: CentOS 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3528,20 +1918,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11
+          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-debian-11
+          bundle exec kitchen verify py3-git-master-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-11
+          bundle exec kitchen destroy py3-git-master-centos-8
 
 
-  py3-git-3003-debian-11:
-    name: Debian 11 v3003 Py3 Git
+  latest-centos-8:
+    name: CentOS 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3574,20 +1964,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-debian-11 || bundle exec kitchen create py3-git-3003-debian-11
+          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-debian-11
+          bundle exec kitchen verify latest-centos-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-debian-11
+          bundle exec kitchen destroy latest-centos-8
 
 
-  py3-stable-3003-0-debian-11:
-    name: Debian 11 v3003.0 Py3 Stable
+  py3-stable-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3620,20 +2010,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11
+          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-11
+          bundle exec kitchen verify py3-stable-3003-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-11
+          bundle exec kitchen destroy py3-stable-3003-centos-stream8
 
 
-  py3-stable-3004-debian-11:
-    name: Debian 11 v3004 Py3 Stable
+  py3-git-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3666,20 +2056,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-debian-11 || bundle exec kitchen create py3-stable-3004-debian-11
+          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-debian-11
+          bundle exec kitchen verify py3-git-3003-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-11
+          bundle exec kitchen destroy py3-git-3003-centos-stream8
 
 
-  py3-git-3004-debian-11:
-    name: Debian 11 v3004 Py3 Git
+  py3-stable-3003-0-centos-stream8:
+    name: CentOS Stream 8 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3712,20 +2102,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-debian-11 || bundle exec kitchen create py3-git-3004-debian-11
+          bundle exec kitchen create py3-stable-3003-0-centos-stream8 || bundle exec kitchen create py3-stable-3003-0-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-debian-11
+          bundle exec kitchen verify py3-stable-3003-0-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-debian-11
+          bundle exec kitchen destroy py3-stable-3003-0-centos-stream8
 
 
-  py3-stable-3004-0-debian-11:
-    name: Debian 11 v3004.0 Py3 Stable
+  py3-stable-3004-centos-stream8:
+    name: CentOS Stream 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3758,20 +2148,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-debian-11 || bundle exec kitchen create py3-stable-3004-0-debian-11
+          bundle exec kitchen create py3-stable-3004-centos-stream8 || bundle exec kitchen create py3-stable-3004-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-debian-11
+          bundle exec kitchen verify py3-stable-3004-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-debian-11
+          bundle exec kitchen destroy py3-stable-3004-centos-stream8
 
 
-  py3-git-master-debian-11:
-    name: Debian 11 Master Py3 Git
+  py3-git-3004-centos-stream8:
+    name: CentOS Stream 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3804,20 +2194,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
+          bundle exec kitchen create py3-git-3004-centos-stream8 || bundle exec kitchen create py3-git-3004-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-11
+          bundle exec kitchen verify py3-git-3004-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-11
+          bundle exec kitchen destroy py3-git-3004-centos-stream8
 
 
-  latest-debian-11:
-    name: Debian 11 Latest packaged release
+  py3-stable-3004-0-centos-stream8:
+    name: CentOS Stream 8 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3850,20 +2240,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
+          bundle exec kitchen create py3-stable-3004-0-centos-stream8 || bundle exec kitchen create py3-stable-3004-0-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-11
+          bundle exec kitchen verify py3-stable-3004-0-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-11
+          bundle exec kitchen destroy py3-stable-3004-0-centos-stream8
 
 
-  py3-stable-3001-debian-9:
-    name: Debian 9 v3001 Py3 Stable
+  py3-git-master-centos-stream8:
+    name: CentOS Stream 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3896,20 +2286,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-debian-9 || bundle exec kitchen create py3-stable-3001-debian-9
+          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-debian-9
+          bundle exec kitchen verify py3-git-master-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-debian-9
+          bundle exec kitchen destroy py3-git-master-centos-stream8
 
 
-  py3-git-3001-debian-9:
-    name: Debian 9 v3001 Py3 Git
+  latest-centos-stream8:
+    name: CentOS Stream 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3942,20 +2332,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-debian-9 || bundle exec kitchen create py3-git-3001-debian-9
+          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-debian-9
+          bundle exec kitchen verify latest-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-debian-9
+          bundle exec kitchen destroy latest-centos-stream8
 
 
-  py3-stable-3001-0-debian-9:
-    name: Debian 9 v3001.0 Py3 Stable
+  py3-stable-3002-debian-10:
+    name: Debian 10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -3988,20 +2378,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-debian-9 || bundle exec kitchen create py3-stable-3001-0-debian-9
+          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-debian-9
+          bundle exec kitchen verify py3-stable-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-debian-9
+          bundle exec kitchen destroy py3-stable-3002-debian-10
 
 
-  py3-stable-3002-debian-9:
-    name: Debian 9 v3002 Py3 Stable
+  py3-git-3002-debian-10:
+    name: Debian 10 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4034,20 +2424,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
+          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-debian-9
+          bundle exec kitchen verify py3-git-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-9
+          bundle exec kitchen destroy py3-git-3002-debian-10
 
 
-  py3-git-3002-debian-9:
-    name: Debian 9 v3002 Py3 Git
+  py3-stable-3002-0-debian-10:
+    name: Debian 10 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4080,20 +2470,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
+          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-debian-9
+          bundle exec kitchen verify py3-stable-3002-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-debian-9
+          bundle exec kitchen destroy py3-stable-3002-0-debian-10
 
 
-  py3-stable-3002-0-debian-9:
-    name: Debian 9 v3002.0 Py3 Stable
+  py3-stable-3003-debian-10:
+    name: Debian 10 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4126,20 +2516,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
+          bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-9
+          bundle exec kitchen verify py3-stable-3003-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-9
+          bundle exec kitchen destroy py3-stable-3003-debian-10
 
 
-  py3-stable-3003-debian-9:
-    name: Debian 9 v3003 Py3 Stable
+  py3-git-3003-debian-10:
+    name: Debian 10 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4172,20 +2562,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
+          bundle exec kitchen create py3-git-3003-debian-10 || bundle exec kitchen create py3-git-3003-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-debian-9
+          bundle exec kitchen verify py3-git-3003-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-9
+          bundle exec kitchen destroy py3-git-3003-debian-10
 
 
-  py3-git-3003-debian-9:
-    name: Debian 9 v3003 Py3 Git
+  py3-stable-3003-0-debian-10:
+    name: Debian 10 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4218,20 +2608,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
+          bundle exec kitchen create py3-stable-3003-0-debian-10 || bundle exec kitchen create py3-stable-3003-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-debian-9
+          bundle exec kitchen verify py3-stable-3003-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-debian-9
+          bundle exec kitchen destroy py3-stable-3003-0-debian-10
 
 
-  py3-stable-3003-0-debian-9:
-    name: Debian 9 v3003.0 Py3 Stable
+  py3-stable-3004-debian-10:
+    name: Debian 10 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4264,20 +2654,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-9 || bundle exec kitchen create py3-stable-3003-0-debian-9
+          bundle exec kitchen create py3-stable-3004-debian-10 || bundle exec kitchen create py3-stable-3004-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-9
+          bundle exec kitchen verify py3-stable-3004-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-9
+          bundle exec kitchen destroy py3-stable-3004-debian-10
 
 
-  py3-stable-3004-debian-9:
-    name: Debian 9 v3004 Py3 Stable
+  py3-git-3004-debian-10:
+    name: Debian 10 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4310,20 +2700,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-debian-9 || bundle exec kitchen create py3-stable-3004-debian-9
+          bundle exec kitchen create py3-git-3004-debian-10 || bundle exec kitchen create py3-git-3004-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-debian-9
+          bundle exec kitchen verify py3-git-3004-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-9
+          bundle exec kitchen destroy py3-git-3004-debian-10
 
 
-  py3-git-3004-debian-9:
-    name: Debian 9 v3004 Py3 Git
+  py3-stable-3004-0-debian-10:
+    name: Debian 10 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4356,20 +2746,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-debian-9 || bundle exec kitchen create py3-git-3004-debian-9
+          bundle exec kitchen create py3-stable-3004-0-debian-10 || bundle exec kitchen create py3-stable-3004-0-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-debian-9
+          bundle exec kitchen verify py3-stable-3004-0-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-debian-9
+          bundle exec kitchen destroy py3-stable-3004-0-debian-10
 
 
-  py3-stable-3004-0-debian-9:
-    name: Debian 9 v3004.0 Py3 Stable
+  py3-git-master-debian-10:
+    name: Debian 10 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4402,20 +2792,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-debian-9 || bundle exec kitchen create py3-stable-3004-0-debian-9
+          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-debian-9
+          bundle exec kitchen verify py3-git-master-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-debian-9
+          bundle exec kitchen destroy py3-git-master-debian-10
 
 
-  py3-git-master-debian-9:
-    name: Debian 9 Master Py3 Git
+  latest-debian-10:
+    name: Debian 10 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4448,20 +2838,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
+          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-debian-9
+          bundle exec kitchen verify latest-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-debian-9
+          bundle exec kitchen destroy latest-debian-10
 
 
-  latest-debian-9:
-    name: Debian 9 Latest packaged release
+  py3-stable-3002-debian-11:
+    name: Debian 11 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4494,20 +2884,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
+          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-debian-9
+          bundle exec kitchen verify py3-stable-3002-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-debian-9
+          bundle exec kitchen destroy py3-stable-3002-debian-11
 
 
-  py3-git-3001-fedora-33:
-    name: Fedora 33 v3001 Py3 Git
+  py3-git-3002-debian-11:
+    name: Debian 11 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4540,20 +2930,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-33 || bundle exec kitchen create py3-git-3001-fedora-33
+          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-33
+          bundle exec kitchen verify py3-git-3002-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-33
+          bundle exec kitchen destroy py3-git-3002-debian-11
 
 
-  py3-git-3002-fedora-33:
-    name: Fedora 33 v3002 Py3 Git
+  py3-stable-3003-debian-11:
+    name: Debian 11 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4586,20 +2976,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
+          bundle exec kitchen create py3-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-33
+          bundle exec kitchen verify py3-stable-3003-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-33
+          bundle exec kitchen destroy py3-stable-3003-debian-11
 
 
-  py3-git-3003-fedora-33:
-    name: Fedora 33 v3003 Py3 Git
+  py3-git-3003-debian-11:
+    name: Debian 11 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4632,20 +3022,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-fedora-33 || bundle exec kitchen create py3-git-3003-fedora-33
+          bundle exec kitchen create py3-git-3003-debian-11 || bundle exec kitchen create py3-git-3003-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-fedora-33
+          bundle exec kitchen verify py3-git-3003-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-33
+          bundle exec kitchen destroy py3-git-3003-debian-11
 
 
-  py3-git-3004-fedora-33:
-    name: Fedora 33 v3004 Py3 Git
+  py3-stable-3003-0-debian-11:
+    name: Debian 11 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4678,20 +3068,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-fedora-33 || bundle exec kitchen create py3-git-3004-fedora-33
+          bundle exec kitchen create py3-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-fedora-33
+          bundle exec kitchen verify py3-stable-3003-0-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-fedora-33
+          bundle exec kitchen destroy py3-stable-3003-0-debian-11
 
 
-  py3-git-master-fedora-33:
-    name: Fedora 33 Master Py3 Git
+  py3-stable-3004-debian-11:
+    name: Debian 11 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4724,20 +3114,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
+          bundle exec kitchen create py3-stable-3004-debian-11 || bundle exec kitchen create py3-stable-3004-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-33
+          bundle exec kitchen verify py3-stable-3004-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-33
+          bundle exec kitchen destroy py3-stable-3004-debian-11
 
 
-  latest-fedora-33:
-    name: Fedora 33 Latest packaged release
+  py3-git-3004-debian-11:
+    name: Debian 11 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4770,20 +3160,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
+          bundle exec kitchen create py3-git-3004-debian-11 || bundle exec kitchen create py3-git-3004-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-33
+          bundle exec kitchen verify py3-git-3004-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-33
+          bundle exec kitchen destroy py3-git-3004-debian-11
 
 
-  py3-git-3001-fedora-34:
-    name: Fedora 34 v3001 Py3 Git
+  py3-stable-3004-0-debian-11:
+    name: Debian 11 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4816,20 +3206,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-34 || bundle exec kitchen create py3-git-3001-fedora-34
+          bundle exec kitchen create py3-stable-3004-0-debian-11 || bundle exec kitchen create py3-stable-3004-0-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-34
+          bundle exec kitchen verify py3-stable-3004-0-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-34
+          bundle exec kitchen destroy py3-stable-3004-0-debian-11
 
 
-  py3-git-3002-fedora-34:
-    name: Fedora 34 v3002 Py3 Git
+  py3-git-master-debian-11:
+    name: Debian 11 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4862,20 +3252,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-34 || bundle exec kitchen create py3-git-3002-fedora-34
+          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-34
+          bundle exec kitchen verify py3-git-master-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-34
+          bundle exec kitchen destroy py3-git-master-debian-11
 
 
-  py3-git-3003-fedora-34:
-    name: Fedora 34 v3003 Py3 Git
+  latest-debian-11:
+    name: Debian 11 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4908,20 +3298,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-fedora-34 || bundle exec kitchen create py3-git-3003-fedora-34
+          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-fedora-34
+          bundle exec kitchen verify latest-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-34
+          bundle exec kitchen destroy latest-debian-11
 
 
-  py3-git-3004-fedora-34:
-    name: Fedora 34 v3004 Py3 Git
+  py3-stable-3002-debian-9:
+    name: Debian 9 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4954,20 +3344,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-fedora-34 || bundle exec kitchen create py3-git-3004-fedora-34
+          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-fedora-34
+          bundle exec kitchen verify py3-stable-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-fedora-34
+          bundle exec kitchen destroy py3-stable-3002-debian-9
 
 
-  py3-git-master-fedora-34:
-    name: Fedora 34 Master Py3 Git
+  py3-git-3002-debian-9:
+    name: Debian 9 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5000,20 +3390,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34
+          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-34
+          bundle exec kitchen verify py3-git-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-34
+          bundle exec kitchen destroy py3-git-3002-debian-9
 
 
-  latest-fedora-34:
-    name: Fedora 34 Latest packaged release
+  py3-stable-3002-0-debian-9:
+    name: Debian 9 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5046,20 +3436,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34
+          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-34
+          bundle exec kitchen verify py3-stable-3002-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-34
+          bundle exec kitchen destroy py3-stable-3002-0-debian-9
 
 
-  py3-git-3001-fedora-35:
-    name: Fedora 35 v3001 Py3 Git
+  py3-stable-3003-debian-9:
+    name: Debian 9 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5092,20 +3482,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-fedora-35 || bundle exec kitchen create py3-git-3001-fedora-35
+          bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-fedora-35
+          bundle exec kitchen verify py3-stable-3003-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-35
+          bundle exec kitchen destroy py3-stable-3003-debian-9
 
 
-  py3-git-3002-fedora-35:
-    name: Fedora 35 v3002 Py3 Git
+  py3-git-3003-debian-9:
+    name: Debian 9 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5138,20 +3528,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-fedora-35 || bundle exec kitchen create py3-git-3002-fedora-35
+          bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-fedora-35
+          bundle exec kitchen verify py3-git-3003-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-35
+          bundle exec kitchen destroy py3-git-3003-debian-9
 
 
-  py3-git-3003-fedora-35:
-    name: Fedora 35 v3003 Py3 Git
+  py3-stable-3003-0-debian-9:
+    name: Debian 9 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5184,20 +3574,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-fedora-35 || bundle exec kitchen create py3-git-3003-fedora-35
+          bundle exec kitchen create py3-stable-3003-0-debian-9 || bundle exec kitchen create py3-stable-3003-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-fedora-35
+          bundle exec kitchen verify py3-stable-3003-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-35
+          bundle exec kitchen destroy py3-stable-3003-0-debian-9
 
 
-  py3-git-3004-fedora-35:
-    name: Fedora 35 v3004 Py3 Git
+  py3-stable-3004-debian-9:
+    name: Debian 9 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5230,20 +3620,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-fedora-35 || bundle exec kitchen create py3-git-3004-fedora-35
+          bundle exec kitchen create py3-stable-3004-debian-9 || bundle exec kitchen create py3-stable-3004-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-fedora-35
+          bundle exec kitchen verify py3-stable-3004-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-fedora-35
+          bundle exec kitchen destroy py3-stable-3004-debian-9
 
 
-  py3-git-master-fedora-35:
-    name: Fedora 35 Master Py3 Git
+  py3-git-3004-debian-9:
+    name: Debian 9 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5276,20 +3666,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-fedora-35 || bundle exec kitchen create py3-git-master-fedora-35
+          bundle exec kitchen create py3-git-3004-debian-9 || bundle exec kitchen create py3-git-3004-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-fedora-35
+          bundle exec kitchen verify py3-git-3004-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-fedora-35
+          bundle exec kitchen destroy py3-git-3004-debian-9
 
 
-  latest-fedora-35:
-    name: Fedora 35 Latest packaged release
+  py3-stable-3004-0-debian-9:
+    name: Debian 9 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5322,20 +3712,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-fedora-35 || bundle exec kitchen create latest-fedora-35
+          bundle exec kitchen create py3-stable-3004-0-debian-9 || bundle exec kitchen create py3-stable-3004-0-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-fedora-35
+          bundle exec kitchen verify py3-stable-3004-0-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-fedora-35
+          bundle exec kitchen destroy py3-stable-3004-0-debian-9
 
 
-  py3-git-3001-opensuse-15:
-    name: Opensuse 15 v3001 Py3 Git
+  py3-git-master-debian-9:
+    name: Debian 9 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5368,20 +3758,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-opensuse-15 || bundle exec kitchen create py3-git-3001-opensuse-15
+          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-opensuse-15
+          bundle exec kitchen verify py3-git-master-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-opensuse-15
+          bundle exec kitchen destroy py3-git-master-debian-9
 
 
-  py3-git-3002-opensuse-15:
-    name: Opensuse 15 v3002 Py3 Git
+  latest-debian-9:
+    name: Debian 9 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5414,20 +3804,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
+          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-opensuse-15
+          bundle exec kitchen verify latest-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-opensuse-15
+          bundle exec kitchen destroy latest-debian-9
 
 
-  py3-git-3003-opensuse-15:
-    name: Opensuse 15 v3003 Py3 Git
+  py3-git-3002-fedora-33:
+    name: Fedora 33 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5460,20 +3850,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-opensuse-15 || bundle exec kitchen create py3-git-3003-opensuse-15
+          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-opensuse-15
+          bundle exec kitchen verify py3-git-3002-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-opensuse-15
+          bundle exec kitchen destroy py3-git-3002-fedora-33
 
 
-  py3-git-3004-opensuse-15:
-    name: Opensuse 15 v3004 Py3 Git
+  py3-git-3003-fedora-33:
+    name: Fedora 33 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5506,20 +3896,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-opensuse-15 || bundle exec kitchen create py3-git-3004-opensuse-15
+          bundle exec kitchen create py3-git-3003-fedora-33 || bundle exec kitchen create py3-git-3003-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-opensuse-15
+          bundle exec kitchen verify py3-git-3003-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-opensuse-15
+          bundle exec kitchen destroy py3-git-3003-fedora-33
 
 
-  py3-git-master-opensuse-15:
-    name: Opensuse 15 Master Py3 Git
+  py3-git-3004-fedora-33:
+    name: Fedora 33 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5552,20 +3942,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
+          bundle exec kitchen create py3-git-3004-fedora-33 || bundle exec kitchen create py3-git-3004-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-opensuse-15
+          bundle exec kitchen verify py3-git-3004-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-15
+          bundle exec kitchen destroy py3-git-3004-fedora-33
 
 
-  latest-opensuse-15:
-    name: Opensuse 15 Latest packaged release
+  py3-git-master-fedora-33:
+    name: Fedora 33 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5598,20 +3988,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
+          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-opensuse-15
+          bundle exec kitchen verify py3-git-master-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-opensuse-15
+          bundle exec kitchen destroy py3-git-master-fedora-33
 
 
-  py3-git-3001-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3001 Py3 Git
+  latest-fedora-33:
+    name: Fedora 33 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5644,20 +4034,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-opensuse-tumbleweed || bundle exec kitchen create py3-git-3001-opensuse-tumbleweed
+          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-opensuse-tumbleweed
+          bundle exec kitchen verify latest-fedora-33
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-opensuse-tumbleweed
+          bundle exec kitchen destroy latest-fedora-33
 
 
-  py3-git-3002-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3002 Py3 Git
+  py3-git-3002-fedora-34:
+    name: Fedora 34 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5690,20 +4080,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-opensuse-tumbleweed || bundle exec kitchen create py3-git-3002-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-3002-fedora-34 || bundle exec kitchen create py3-git-3002-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-3002-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-3002-fedora-34
 
 
-  py3-git-3003-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3003 Py3 Git
+  py3-git-3003-fedora-34:
+    name: Fedora 34 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5736,20 +4126,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-opensuse-tumbleweed || bundle exec kitchen create py3-git-3003-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-3003-fedora-34 || bundle exec kitchen create py3-git-3003-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-3003-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-3003-fedora-34
 
 
-  py3-git-3004-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3004 Py3 Git
+  py3-git-3004-fedora-34:
+    name: Fedora 34 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5782,20 +4172,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-opensuse-tumbleweed || bundle exec kitchen create py3-git-3004-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-3004-fedora-34 || bundle exec kitchen create py3-git-3004-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-3004-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-3004-fedora-34
 
 
-  py3-git-master-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Master Py3 Git
+  py3-git-master-fedora-34:
+    name: Fedora 34 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5828,20 +4218,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
+          bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
+          bundle exec kitchen verify py3-git-master-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
+          bundle exec kitchen destroy py3-git-master-fedora-34
 
 
-  latest-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Latest packaged release
+  latest-fedora-34:
+    name: Fedora 34 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5874,20 +4264,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
+          bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-opensuse-tumbleweed
+          bundle exec kitchen verify latest-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-opensuse-tumbleweed
+          bundle exec kitchen destroy latest-fedora-34
 
 
-  py3-stable-3001-oraclelinux-7:
-    name: Oracle Linux 7 v3001 Py3 Stable
+  py3-git-3002-fedora-35:
+    name: Fedora 35 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5920,20 +4310,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-oraclelinux-7
+          bundle exec kitchen create py3-git-3002-fedora-35 || bundle exec kitchen create py3-git-3002-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-oraclelinux-7
+          bundle exec kitchen verify py3-git-3002-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3002-fedora-35
 
 
-  py3-git-3001-oraclelinux-7:
-    name: Oracle Linux 7 v3001 Py3 Git
+  py3-git-3003-fedora-35:
+    name: Fedora 35 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5966,20 +4356,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-oraclelinux-7 || bundle exec kitchen create py3-git-3001-oraclelinux-7
+          bundle exec kitchen create py3-git-3003-fedora-35 || bundle exec kitchen create py3-git-3003-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-oraclelinux-7
+          bundle exec kitchen verify py3-git-3003-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3003-fedora-35
 
 
-  py3-stable-3001-0-oraclelinux-7:
-    name: Oracle Linux 7 v3001.0 Py3 Stable
+  py3-git-3004-fedora-35:
+    name: Fedora 35 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6012,20 +4402,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3001-0-oraclelinux-7
+          bundle exec kitchen create py3-git-3004-fedora-35 || bundle exec kitchen create py3-git-3004-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-3004-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3004-fedora-35
 
 
-  py3-stable-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Stable
+  py3-git-master-fedora-35:
+    name: Fedora 35 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6058,20 +4448,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
+          bundle exec kitchen create py3-git-master-fedora-35 || bundle exec kitchen create py3-git-master-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
+          bundle exec kitchen verify py3-git-master-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
+          bundle exec kitchen destroy py3-git-master-fedora-35
 
 
-  py3-git-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Git
+  latest-fedora-35:
+    name: Fedora 35 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6104,20 +4494,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
+          bundle exec kitchen create latest-fedora-35 || bundle exec kitchen create latest-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-7
+          bundle exec kitchen verify latest-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
+          bundle exec kitchen destroy latest-fedora-35
 
 
-  py3-stable-3002-0-oraclelinux-7:
-    name: Oracle Linux 7 v3002.0 Py3 Stable
+  py3-git-3002-opensuse-15:
+    name: Opensuse 15 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6150,20 +4540,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-3002-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3002-opensuse-15
 
 
-  py3-stable-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Stable
+  py3-git-3003-opensuse-15:
+    name: Opensuse 15 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6196,20 +4586,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
+          bundle exec kitchen create py3-git-3003-opensuse-15 || bundle exec kitchen create py3-git-3003-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
+          bundle exec kitchen verify py3-git-3003-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3003-opensuse-15
 
 
-  py3-git-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Git
+  py3-git-3004-opensuse-15:
+    name: Opensuse 15 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6242,20 +4632,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
+          bundle exec kitchen create py3-git-3004-opensuse-15 || bundle exec kitchen create py3-git-3004-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-7
+          bundle exec kitchen verify py3-git-3004-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3004-opensuse-15
 
 
-  py3-stable-3003-0-oraclelinux-7:
-    name: Oracle Linux 7 v3003.0 Py3 Stable
+  py3-git-master-opensuse-15:
+    name: Opensuse 15 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6288,20 +4678,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-master-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-master-opensuse-15
 
 
-  py3-stable-3004-oraclelinux-7:
-    name: Oracle Linux 7 v3004 Py3 Stable
+  latest-opensuse-15:
+    name: Opensuse 15 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6334,20 +4724,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-oraclelinux-7
+          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-oraclelinux-7
+          bundle exec kitchen verify latest-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-oraclelinux-7
+          bundle exec kitchen destroy latest-opensuse-15
 
 
-  py3-git-3004-oraclelinux-7:
-    name: Oracle Linux 7 v3004 Py3 Git
+  py3-git-3002-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6380,20 +4770,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-oraclelinux-7 || bundle exec kitchen create py3-git-3004-oraclelinux-7
+          bundle exec kitchen create py3-git-3002-opensuse-tumbleweed || bundle exec kitchen create py3-git-3002-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-oraclelinux-7
+          bundle exec kitchen verify py3-git-3002-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed
 
 
-  py3-stable-3004-0-oraclelinux-7:
-    name: Oracle Linux 7 v3004.0 Py3 Stable
+  py3-git-3003-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6426,20 +4816,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-7
+          bundle exec kitchen create py3-git-3003-opensuse-tumbleweed || bundle exec kitchen create py3-git-3003-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-3003-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3003-opensuse-tumbleweed
 
 
-  py3-git-master-oraclelinux-7:
-    name: Oracle Linux 7 Master Py3 Git
+  py3-git-3004-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6472,20 +4862,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
+          bundle exec kitchen create py3-git-3004-opensuse-tumbleweed || bundle exec kitchen create py3-git-3004-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-7
+          bundle exec kitchen verify py3-git-3004-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3004-opensuse-tumbleweed
 
 
-  latest-oraclelinux-7:
-    name: Oracle Linux 7 Latest packaged release
+  py3-git-master-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6518,20 +4908,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
+          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-oraclelinux-7
+          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-oraclelinux-7
+          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
 
 
-  py3-stable-3001-oraclelinux-8:
-    name: Oracle Linux 8 v3001 Py3 Stable
+  latest-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6564,20 +4954,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-oraclelinux-8 || bundle exec kitchen create py3-stable-3001-oraclelinux-8
+          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-oraclelinux-8
+          bundle exec kitchen verify latest-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-oraclelinux-8
+          bundle exec kitchen destroy latest-opensuse-tumbleweed
 
 
-  py3-git-3001-oraclelinux-8:
-    name: Oracle Linux 8 v3001 Py3 Git
+  py3-stable-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6610,20 +5000,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-oraclelinux-8 || bundle exec kitchen create py3-git-3001-oraclelinux-8
+          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
 
 
-  py3-stable-3001-0-oraclelinux-8:
-    name: Oracle Linux 8 v3001.0 Py3 Stable
+  py3-git-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6656,20 +5046,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3001-0-oraclelinux-8
+          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-oraclelinux-8
+          bundle exec kitchen verify py3-git-3002-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
 
 
-  py3-stable-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Stable
+  py3-stable-3002-0-oraclelinux-7:
+    name: Oracle Linux 7 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6702,20 +5092,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8
+          bundle exec kitchen create py3-stable-3002-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7
 
 
-  py3-git-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Git
+  py3-stable-3003-oraclelinux-7:
+    name: Oracle Linux 7 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6748,20 +5138,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8
+          bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
 
 
-  py3-stable-3002-0-oraclelinux-8:
-    name: Oracle Linux 8 v3002.0 Py3 Stable
+  py3-git-3003-oraclelinux-7:
+    name: Oracle Linux 7 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6794,20 +5184,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen verify py3-git-3003-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
 
 
-  py3-stable-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Stable
+  py3-stable-3003-0-oraclelinux-7:
+    name: Oracle Linux 7 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6840,20 +5230,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
+          bundle exec kitchen create py3-stable-3003-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-7
 
 
-  py3-git-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Git
+  py3-stable-3004-oraclelinux-7:
+    name: Oracle Linux 7 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6886,20 +5276,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
+          bundle exec kitchen create py3-stable-3004-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3004-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3004-oraclelinux-7
 
 
-  py3-stable-3003-0-oraclelinux-8:
-    name: Oracle Linux 8 v3003.0 Py3 Stable
+  py3-git-3004-oraclelinux-7:
+    name: Oracle Linux 7 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6932,20 +5322,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen create py3-git-3004-oraclelinux-7 || bundle exec kitchen create py3-git-3004-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen verify py3-git-3004-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3004-oraclelinux-7
 
 
-  py3-stable-3004-oraclelinux-8:
-    name: Oracle Linux 8 v3004 Py3 Stable
+  py3-stable-3004-0-oraclelinux-7:
+    name: Oracle Linux 7 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6978,20 +5368,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-oraclelinux-8
+          bundle exec kitchen create py3-stable-3004-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-7
 
 
-  py3-git-3004-oraclelinux-8:
-    name: Oracle Linux 8 v3004 Py3 Git
+  py3-git-master-oraclelinux-7:
+    name: Oracle Linux 7 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7024,20 +5414,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-oraclelinux-8 || bundle exec kitchen create py3-git-3004-oraclelinux-8
+          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-oraclelinux-7
 
 
-  py3-stable-3004-0-oraclelinux-8:
-    name: Oracle Linux 8 v3004.0 Py3 Stable
+  latest-oraclelinux-7:
+    name: Oracle Linux 7 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7070,20 +5460,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-8
+          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-8
+          bundle exec kitchen verify latest-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-8
+          bundle exec kitchen destroy latest-oraclelinux-7
 
 
-  py3-git-master-oraclelinux-8:
-    name: Oracle Linux 8 Master Py3 Git
+  py3-stable-3002-oraclelinux-8:
+    name: Oracle Linux 8 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7116,20 +5506,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-8 || bundle exec kitchen create py3-git-master-oraclelinux-8
+          bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-8
+          bundle exec kitchen verify py3-stable-3002-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-8
+          bundle exec kitchen destroy py3-stable-3002-oraclelinux-8
 
 
-  latest-oraclelinux-8:
-    name: Oracle Linux 8 Latest packaged release
+  py3-git-3002-oraclelinux-8:
+    name: Oracle Linux 8 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7162,20 +5552,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-oraclelinux-8 || bundle exec kitchen create latest-oraclelinux-8
+          bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-oraclelinux-8
+          bundle exec kitchen verify py3-git-3002-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-oraclelinux-8
+          bundle exec kitchen destroy py3-git-3002-oraclelinux-8
 
 
-  py3-git-master-rockylinux-8:
-    name: Rocky Linux 8 Master Py3 Git
+  py3-stable-3002-0-oraclelinux-8:
+    name: Oracle Linux 8 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7208,20 +5598,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-rockylinux-8 || bundle exec kitchen create py3-git-master-rockylinux-8
+          bundle exec kitchen create py3-stable-3002-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-rockylinux-8
+          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-rockylinux-8
+          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-8
 
 
-  latest-rockylinux-8:
-    name: Rocky Linux 8 Latest packaged release
+  py3-stable-3003-oraclelinux-8:
+    name: Oracle Linux 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7254,20 +5644,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-rockylinux-8 || bundle exec kitchen create latest-rockylinux-8
+          bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-rockylinux-8
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-rockylinux-8
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
 
 
-  py3-stable-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Stable
+  py3-git-3003-oraclelinux-8:
+    name: Oracle Linux 8 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7300,20 +5690,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-ubuntu-1604
+          bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-1604
+          bundle exec kitchen verify py3-git-3003-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
 
 
-  py3-git-3001-ubuntu-1604:
-    name: Ubuntu 16.04 v3001 Py3 Git
+  py3-stable-3003-0-oraclelinux-8:
+    name: Oracle Linux 8 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7346,20 +5736,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-1604 || bundle exec kitchen create py3-git-3001-ubuntu-1604
+          bundle exec kitchen create py3-stable-3003-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-8
 
 
-  py3-stable-3001-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3001.0 Py3 Stable
+  py3-stable-3004-oraclelinux-8:
+    name: Oracle Linux 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7392,20 +5782,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen create py3-stable-3004-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3004-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3004-oraclelinux-8
 
 
-  py3-stable-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Stable
+  py3-git-3004-oraclelinux-8:
+    name: Oracle Linux 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7438,20 +5828,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
+          bundle exec kitchen create py3-git-3004-oraclelinux-8 || bundle exec kitchen create py3-git-3004-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
+          bundle exec kitchen verify py3-git-3004-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3004-oraclelinux-8
 
 
-  py3-git-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Git
+  py3-stable-3004-0-oraclelinux-8:
+    name: Oracle Linux 8 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7484,20 +5874,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
+          bundle exec kitchen create py3-stable-3004-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-8
 
 
-  py3-stable-3002-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3002.0 Py3 Stable
+  py3-git-master-oraclelinux-8:
+    name: Oracle Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7530,20 +5920,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen create py3-git-master-oraclelinux-8 || bundle exec kitchen create py3-git-master-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen verify py3-git-master-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen destroy py3-git-master-oraclelinux-8
 
 
-  py3-git-master-ubuntu-1604:
-    name: Ubuntu 16.04 Master Py3 Git
+  latest-oraclelinux-8:
+    name: Oracle Linux 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7576,20 +5966,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
+          bundle exec kitchen create latest-oraclelinux-8 || bundle exec kitchen create latest-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1604
+          bundle exec kitchen verify latest-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1604
+          bundle exec kitchen destroy latest-oraclelinux-8
 
 
-  latest-ubuntu-1604:
-    name: Ubuntu 16.04 Latest packaged release
+  py3-git-master-rockylinux-8:
+    name: Rocky Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7622,20 +6012,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
+          bundle exec kitchen create py3-git-master-rockylinux-8 || bundle exec kitchen create py3-git-master-rockylinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1604
+          bundle exec kitchen verify py3-git-master-rockylinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1604
+          bundle exec kitchen destroy py3-git-master-rockylinux-8
 
 
-  py3-stable-3001-ubuntu-1804:
-    name: Ubuntu 18.04 v3001 Py3 Stable
+  latest-rockylinux-8:
+    name: Rocky Linux 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7668,20 +6058,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-ubuntu-1804
+          bundle exec kitchen create latest-rockylinux-8 || bundle exec kitchen create latest-rockylinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-1804
+          bundle exec kitchen verify latest-rockylinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-1804
+          bundle exec kitchen destroy latest-rockylinux-8
 
 
-  py3-git-3001-ubuntu-1804:
-    name: Ubuntu 18.04 v3001 Py3 Git
+  py3-stable-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7714,20 +6104,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-1804 || bundle exec kitchen create py3-git-3001-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
 
 
-  py3-stable-3001-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3001.0 Py3 Stable
+  py3-git-3002-ubuntu-1604:
+    name: Ubuntu 16.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7760,20 +6150,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen verify py3-git-3002-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
 
 
-  py3-stable-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Stable
+  py3-stable-3002-0-ubuntu-1604:
+    name: Ubuntu 16.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7806,20 +6196,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
 
 
-  py3-git-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Git
+  py3-git-master-ubuntu-1604:
+    name: Ubuntu 16.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7852,20 +6242,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
+          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1804
+          bundle exec kitchen verify py3-git-master-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
+          bundle exec kitchen destroy py3-git-master-ubuntu-1604
 
 
-  py3-stable-3002-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3002.0 Py3 Stable
+  latest-ubuntu-1604:
+    name: Ubuntu 16.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7898,20 +6288,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen verify latest-ubuntu-1604
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen destroy latest-ubuntu-1604
 
 
-  py3-stable-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Stable
+  py3-stable-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7944,20 +6334,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
 
 
-  py3-git-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Git
+  py3-git-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -7990,20 +6380,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
+          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-1804
+          bundle exec kitchen verify py3-git-3002-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
 
 
-  py3-stable-3003-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3003.0 Py3 Stable
+  py3-stable-3002-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3002.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8036,20 +6426,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen create py3-stable-3002-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804
 
 
-  py3-stable-3004-ubuntu-1804:
-    name: Ubuntu 18.04 v3004 Py3 Stable
+  py3-stable-3003-ubuntu-1804:
+    name: Ubuntu 18.04 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8082,20 +6472,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-ubuntu-1804
+          bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
 
 
-  py3-git-3004-ubuntu-1804:
-    name: Ubuntu 18.04 v3004 Py3 Git
+  py3-git-3003-ubuntu-1804:
+    name: Ubuntu 18.04 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8128,20 +6518,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-ubuntu-1804 || bundle exec kitchen create py3-git-3004-ubuntu-1804
+          bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-ubuntu-1804
+          bundle exec kitchen verify py3-git-3003-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
 
 
-  py3-stable-3004-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3004.0 Py3 Stable
+  py3-stable-3003-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3003.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8174,20 +6564,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-0-ubuntu-1804
+          bundle exec kitchen create py3-stable-3003-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3003-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-1804
 
 
-  py3-git-master-ubuntu-1804:
-    name: Ubuntu 18.04 Master Py3 Git
+  py3-stable-3004-ubuntu-1804:
+    name: Ubuntu 18.04 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8220,20 +6610,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
+          bundle exec kitchen create py3-stable-3004-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3004-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-1804
 
 
-  latest-ubuntu-1804:
-    name: Ubuntu 18.04 Latest packaged release
+  py3-git-3004-ubuntu-1804:
+    name: Ubuntu 18.04 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8266,20 +6656,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
+          bundle exec kitchen create py3-git-3004-ubuntu-1804 || bundle exec kitchen create py3-git-3004-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1804
+          bundle exec kitchen verify py3-git-3004-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3004-ubuntu-1804
 
 
-  py3-stable-3001-ubuntu-2004:
-    name: Ubuntu 20.04 v3001 Py3 Stable
+  py3-stable-3004-0-ubuntu-1804:
+    name: Ubuntu 18.04 v3004.0 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8312,20 +6702,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-ubuntu-2004
+          bundle exec kitchen create py3-stable-3004-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-0-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3004-0-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-1804
 
 
-  py3-git-3001-ubuntu-2004:
-    name: Ubuntu 20.04 v3001 Py3 Git
+  py3-git-master-ubuntu-1804:
+    name: Ubuntu 18.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8358,20 +6748,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3001-ubuntu-2004 || bundle exec kitchen create py3-git-3001-ubuntu-2004
+          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3001-ubuntu-2004
+          bundle exec kitchen verify py3-git-master-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3001-ubuntu-2004
+          bundle exec kitchen destroy py3-git-master-ubuntu-1804
 
 
-  py3-stable-3001-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3001.0 Py3 Stable
+  latest-ubuntu-1804:
+    name: Ubuntu 18.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -8404,16 +6794,16 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3001-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen verify latest-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3001-0-ubuntu-2004
+          bundle exec kitchen destroy latest-ubuntu-1804
 
 
   py3-stable-3002-ubuntu-2004:
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 0082bb65d..e7eb00bfa 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -54,25 +54,6 @@
     "ubuntu-2110",
 ]
 
-BLACKLIST_3001 = [
-    "almalinux-8",
-    "centos-stream8",
-    "debian-11",
-    "rockylinux-8",
-    "ubuntu-2110",
-]
-
-BLACKLIST_3001_0 = [
-    "almalinux-8",
-    "amazon-2",
-    "centos-stream8",
-    "debian-11",
-    "gentoo",
-    "gentoo-systemd",
-    "rockylinux-8",
-    "ubuntu-2110",
-]
-
 BLACKLIST_3002 = [
     "almalinux-8",
     "centos-stream8",
@@ -119,8 +100,6 @@
 ]
 
 SALT_BRANCHES = [
-    "3001",
-    "3001-0",
     "3002",
     "3002-0",
     "3003",
@@ -132,8 +111,6 @@
 ]
 
 BRANCH_DISPLAY_NAMES = {
-    "3001": "v3001",
-    "3001-0": "v3001.0",
     "3002": "v3002",
     "3002-0": "v3002.0",
     "3003": "v3003",
@@ -251,16 +228,10 @@ def generate_test_jobs():
                             continue
 
                     if bootstrap_type == "git":
-                        # .0 versions are a virtual version for pinning to the first point release of a major release, such as 3001, there is no git version.
+                        # .0 versions are a virtual version for pinning to the first point release of a major release, such as 3002, there is no git version.
                         if branch.endswith("-0"):
                             continue
 
-                    if branch == "3001" and distro in BLACKLIST_3001:
-                        continue
-
-                    if branch == "3001-0" and distro in BLACKLIST_3001_0:
-                        continue
-
                     if branch == "3002" and distro in BLACKLIST_3002:
                         continue
 
diff --git a/kitchen.windows.yml b/kitchen.windows.yml
index 13fa86ff5..b858f6061 100644
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@@ -17,9 +17,6 @@ platforms:
   - name: windows-2019
 
 suites:
-  - name: py3-stable-3001
-    provisioner:
-      salt_version: 3001.7
   - name: py3-stable-3002
     provisioner:
       salt_version: 3002
diff --git a/kitchen.yml b/kitchen.yml
index bf59d09cb..4c798b5f6 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -117,10 +117,6 @@ platforms:
       run_command: /lib/systemd/systemd
 
 suites:
-  - name: py3-git-3001
-    provisioner:
-      salt_version: 3001
-      salt_bootstrap_options: -x python3 -MPfq git %s
   - name: py3-git-3002
     provisioner:
       salt_version: 3002
@@ -133,35 +129,6 @@ suites:
     provisioner:
       salt_version: 3004
       salt_bootstrap_options: -x python3 -MPfq git %s
-  - name: py3-stable-3001-0
-    provisioner:
-      salt_version: 3001
-      salt_bootstrap_options: -x python3 -MP stable 3001.0
-    excludes:
-      - opensuse-15
-      - opensuse-tumbleweed
-      - debian-11
-      - fedora-33
-      - arch
-      - gentoo
-      - gentoo-systemd
-      - ubuntu-2110
-      - freebsd-130
-      - freebsd-123
-      - openbsd-6
-  - name: py3-stable-3001
-    provisioner:
-      salt_version: 3001
-      salt_bootstrap_options: -x python3 -MP stable %s
-    excludes:
-      - debian-11
-      - opensuse-15
-      - opensuse-tumbleweed
-      - arch
-      - ubuntu-2110
-      - freebsd-130
-      - freebsd-123
-      - openbsd-6
   - name: py3-stable-3002-0
     provisioner:
       salt_version: 3002

From 22a56aacf4eb6c152e7ea2469bae23eeb275d91a Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Tue, 18 Jan 2022 13:23:23 +0000
Subject: [PATCH 093/135] fix(windows): copy configs to correct config dirs
 (v3004+)

---
 bootstrap-salt.ps1 | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 0282121ee..fb6e22a3a 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -186,6 +186,15 @@ Else {
 
 $ConfiguredAnything = $False
 
+$SaltRegKey = "HKLM:\SOFTWARE\Salt Project\Salt"
+$RootDir = If ((Get-ItemProperty $SaltRegKey).root_dir -ne $null) {
+    (Get-ItemProperty $SaltRegKey).root_dir
+} Else {
+    "C:\salt"
+}
+$ConfDir = "$RootDir\conf"
+$PkiDir = "$ConfDir\pki\minion"
+
 # Create C:\tmp\
 New-Item C:\tmp\ -ItemType directory -Force | Out-Null
 
@@ -193,9 +202,9 @@ New-Item C:\tmp\ -ItemType directory -Force | Out-Null
 # in C:\tmp
 # Check if minion keys have been uploaded, copy to correct location
 If (Test-Path C:\tmp\minion.pem) {
-    New-Item C:\salt\conf\pki\minion\ -ItemType Directory -Force | Out-Null
-    Copy-Item -Path C:\tmp\minion.pem -Destination C:\salt\conf\pki\minion\ -Force | Out-Null
-    Copy-Item -Path C:\tmp\minion.pub -Destination C:\salt\conf\pki\minion\ -Force | Out-Null
+    New-Item $PkiDir -ItemType Directory -Force | Out-Null
+    Copy-Item -Path C:\tmp\minion.pem -Destination $PkiDir -Force | Out-Null
+    Copy-Item -Path C:\tmp\minion.pub -Destination $PkiDir -Force | Out-Null
     $ConfiguredAnything = $True
 }
 
@@ -203,15 +212,15 @@ If (Test-Path C:\tmp\minion.pem) {
 # This should be done before the installer is run so that it can be updated with
 # id: and master: settings when the installer runs
 If (Test-Path C:\tmp\minion) {
-    New-Item C:\salt\conf\ -ItemType Directory -Force | Out-Null
-    Copy-Item -Path C:\tmp\minion -Destination C:\salt\conf\ -Force | Out-Null
+    New-Item $ConfDir -ItemType Directory -Force | Out-Null
+    Copy-Item -Path C:\tmp\minion -Destination $ConfDir -Force | Out-Null
     $ConfiguredAnything = $True
 }
 
 # Check if grains config has been uploaded
 If (Test-Path C:\tmp\grains) {
-    New-Item C:\salt\conf\ -ItemType Directory -Force | Out-Null
-    Copy-Item -Path C:\tmp\grains -Destination C:\salt\conf\ -Force | Out-Null
+    New-Item $ConfDir -ItemType Directory -Force | Out-Null
+    Copy-Item -Path C:\tmp\grains -Destination $ConfDir -Force | Out-Null
     $ConfiguredAnything = $True
 }
 

From 3f0a3aba2e4012436b84b867a57db619f4e2e096 Mon Sep 17 00:00:00 2001
From: Joseph Pacura <jpacura96@gmail.com>
Date: Fri, 21 Jan 2022 17:40:27 -0500
Subject: [PATCH 094/135] Use native repositories for Debian 11 Remove
 best-effort support for Debian Testing Remove Ubuntu 20.10 support because it
 is end-of-life

---
 .github/workflows/main.yml              | 230 ------------------------
 .github/workflows/templates/generate.py |   3 +
 README.rst                              |  18 +-
 bootstrap-salt.sh                       |  17 +-
 4 files changed, 12 insertions(+), 256 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index acdfafd8f..344bdf007 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2850,236 +2850,6 @@ jobs:
           bundle exec kitchen destroy latest-debian-10
 
 
-  py3-stable-3002-debian-11:
-    name: Debian 11 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-debian-11 || bundle exec kitchen create py3-stable-3002-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-11
-
-
-  py3-git-3002-debian-11:
-    name: Debian 11 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-debian-11 || bundle exec kitchen create py3-git-3002-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-debian-11
-
-
-  py3-stable-3003-debian-11:
-    name: Debian 11 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-11
-
-
-  py3-git-3003-debian-11:
-    name: Debian 11 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-debian-11 || bundle exec kitchen create py3-git-3003-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-debian-11
-
-
-  py3-stable-3003-0-debian-11:
-    name: Debian 11 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-11
-
-
   py3-stable-3004-debian-11:
     name: Debian 11 v3004 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index e7eb00bfa..6648b9f84 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -58,6 +58,7 @@
     "almalinux-8",
     "centos-stream8",
     "rockylinux-8",
+    "debian-11",
 ]
 
 BLACKLIST_3002_0 = [
@@ -74,6 +75,7 @@
 BLACKLIST_3003 = [
     "rockylinux-8",
     "ubuntu-1604",
+    "debian-11",
 ]
 
 BLACKLIST_3003_0 = [
@@ -82,6 +84,7 @@
     "gentoo-systemd",
     "rockylinux-8",
     "ubuntu-1604",
+    "debian-11"
 ]
 
 BLACKLIST_3004 = [
diff --git a/README.rst b/README.rst
index ff0b33d00..5c68fb6ed 100644
--- a/README.rst
+++ b/README.rst
@@ -440,24 +440,12 @@ Debian and derivatives
 ~~~~~~~~~~~~~~~~~~~~~~
 
 - Cumulus Linux 2/3
-- Debian GNU/Linux 7/8/9/10
+- Debian GNU/Linux 9/10/11
 - Devuan GNU/Linux 1/2
 - Kali Linux 1.0 (based on Debian 7)
 - Linux Mint Debian Edition 1 (based on Debian 8)
 - Raspbian 8 (``armhf`` packages) and 9 (using ``git`` installation mode only)
 
-Debian Best Effort Support: Testing Release
-*******************************************
-
-This script provides best-effort support for the upcoming Debian testing release. Package
-repositories are not provided on `SaltStack's Debian repository`_ for Debian testing releases.
-However, the bootstrap script will attempt to install the packages for the current stable
-version of Debian.
-
-For example, when installing Salt on Debian 11 (Bullseye), the bootstrap script will setup the
-repository for Debian 10 (Buster) from `SaltStack's Debian repository`_ and install the
-Debian 10 packages.
-
 
 Red Hat family
 ~~~~~~~~~~~~~~
@@ -504,7 +492,7 @@ repositories are not provided on `SaltStack's Ubuntu repository`_ for the non-LT
 bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu
 release instead.
 
-For example, when installing Salt on Ubuntu 20.10, the bootstrap script will setup the repository
+For example, when installing Salt on Ubuntu 21.10, the bootstrap script will setup the repository
 for Ubuntu 20.04 from `SaltStack's Ubuntu repository`_ and install the 20.04 packages.
 
 Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by
@@ -572,9 +560,11 @@ this offering, while limited, is as follows:
 - Centos 8
 - Debian 9
 - Debian 10
+- Debian 11
 - Fedora (only git installations)
 - Ubuntu 16.04
 - Ubuntu 18.04
+- Ubuntu 20.04
 
 On Fedora, PIP installation must be allowed (-P) due to incompatibility with the shipped Tornado
 library.
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index dc4f471fd..9e0b33c0e 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1591,11 +1591,13 @@ __check_end_of_life_versions() {
             #  = 17.04, 17.10
             #  = 18.10
             #  = 19.04, 19.10
+            #  = 20.10
             if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
                 [ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
                 [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
                 { [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
-                { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
+                { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
+                { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://wiki.ubuntu.com/Releases"
@@ -3350,17 +3352,8 @@ install_ubuntu_check_services() {
 #   Debian Install Functions
 #
 __install_saltstack_debian_repository() {
-    if [ "$DISTRO_MAJOR_VERSION" -eq 11 ]; then
-        # Packages for Debian 11 at repo.saltproject.io are not yet available
-        # Set up repository for Debian 10 for Debian 11 for now until support
-        # is available at repo.saltproject.io for Debian 11.
-        echowarn "Debian 11 distribution detected, but stable packages requested. Trying packages from Debian 10. You may experience problems."
-        DEBIAN_RELEASE="10"
-        DEBIAN_CODENAME="buster"
-    else
-        DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
-        DEBIAN_CODENAME="$DISTRO_CODENAME"
-    fi
+    DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION"
+    DEBIAN_CODENAME="$DISTRO_CODENAME"
 
     __PY_VERSION_REPO="apt"
     if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then

From f16a2ffbd3cdf67345dd0f40f61155f14806bc38 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 09:11:49 +0000
Subject: [PATCH 095/135] feat(bootstrap-salt): add AlmaLinux detection and
 functions

Fix #1803.
---
 bootstrap-salt.sh | 72 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 9e0b33c0e..71efe6232 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -945,7 +945,7 @@ __strip_duplicates() {
 __sort_release_files() {
     KNOWN_RELEASE_FILES=$(echo "(arch|alpine|centos|debian|ubuntu|fedora|redhat|suse|\
         mandrake|mandriva|gentoo|slackware|turbolinux|unitedlinux|void|lsb|system|\
-        oracle|os)(-|_)(release|version)" | sed -E 's:[[:space:]]::g')
+        oracle|os|almalinux)(-|_)(release|version)" | sed -E 's:[[:space:]]::g')
     primary_release_files=""
     secondary_release_files=""
     # Sort know VS un-known files first
@@ -959,7 +959,7 @@ __sort_release_files() {
     done
 
     # Now let's sort by know files importance, max important goes last in the max_prio list
-    max_prio="redhat-release centos-release oracle-release fedora-release"
+    max_prio="redhat-release centos-release oracle-release fedora-release almalinux-release"
     for entry in $max_prio; do
         if [ "$(echo "${primary_release_files}" | grep "$entry")" != "" ]; then
             primary_release_files=$(echo "${primary_release_files}" | sed -e "s:\\(.*\\)\\($entry\\)\\(.*\\):\\2 \\1 \\3:g")
@@ -1086,6 +1086,7 @@ __gather_linux_system_info() {
             unitedlinux        ) n="UnitedLinux"    ;;
             void               ) n="VoidLinux"      ;;
             oracle             ) n="Oracle Linux"   ;;
+            almalinux          ) n="AlmaLinux"      ;;
             system             )
                 while read -r line; do
                     [ "${n}x" != "systemx" ] && break
@@ -1815,14 +1816,14 @@ elif [ "${DISTRO_NAME_L}" = "debian" ]; then
   __debian_codename_translation
 fi
 
-if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian|ubuntu|centos|gentoo|red_hat|oracle|scientific|amazon|fedora|macosx)')" = "" ] && [ "$ITYPE" = "stable" ] && [ "$STABLE_REV" != "latest" ]; then
+if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian|ubuntu|centos|gentoo|red_hat|oracle|scientific|amazon|fedora|macosx|almalinux)')" = "" ] && [ "$ITYPE" = "stable" ] && [ "$STABLE_REV" != "latest" ]; then
     echoerror "${DISTRO_NAME} does not have major version pegged packages support"
     exit 1
 fi
 
 # Only RedHat based distros have testing support
 if [ "${ITYPE}" = "testing" ]; then
-    if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(centos|red_hat|amazon|oracle)')" = "" ]; then
+    if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(centos|red_hat|amazon|oracle|almalinux)')" = "" ]; then
         echoerror "${DISTRO_NAME} does not have testing packages support"
         exit 1
     fi
@@ -4848,6 +4849,69 @@ install_oracle_linux_check_services() {
 #
 #######################################################################################################################
 
+#######################################################################################################################
+#
+#   AlmaLinux Install Functions
+#
+install_almalinux_stable_deps() {
+    install_centos_stable_deps || return 1
+    return 0
+}
+
+install_almalinux_git_deps() {
+    install_centos_git_deps || return 1
+    return 0
+}
+
+install_almalinux_testing_deps() {
+    install_centos_testing_deps || return 1
+    return 0
+}
+
+install_almalinux_stable() {
+    install_centos_stable || return 1
+    return 0
+}
+
+install_almalinux_git() {
+    install_centos_git || return 1
+    return 0
+}
+
+install_almalinux_testing() {
+    install_centos_testing || return 1
+    return 0
+}
+
+install_almalinux_stable_post() {
+    install_centos_stable_post || return 1
+    return 0
+}
+
+install_almalinux_git_post() {
+    install_centos_git_post || return 1
+    return 0
+}
+
+install_almalinux_testing_post() {
+    install_centos_testing_post || return 1
+    return 0
+}
+
+install_almalinux_restart_daemons() {
+    install_centos_restart_daemons || return 1
+    return 0
+}
+
+install_almalinux_check_services() {
+    install_centos_check_services || return 1
+    return 0
+}
+#
+#   Ended AlmaLinux Install Functions
+#
+#######################################################################################################################
+
 #######################################################################################################################
 #
 #   Scientific Linux Install Functions

From f805365b110b632f1d92b573de9da604fdd9dd25 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 09:14:00 +0000
Subject: [PATCH 096/135] feat(bootstrap-salt): add Rocky Linux detection and
 functions

Fix #1803.
---
 bootstrap-salt.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 71efe6232..386cc318e 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -945,7 +945,7 @@ __strip_duplicates() {
 __sort_release_files() {
     KNOWN_RELEASE_FILES=$(echo "(arch|alpine|centos|debian|ubuntu|fedora|redhat|suse|\
         mandrake|mandriva|gentoo|slackware|turbolinux|unitedlinux|void|lsb|system|\
-        oracle|os|almalinux)(-|_)(release|version)" | sed -E 's:[[:space:]]::g')
+        oracle|os|almalinux|rocky)(-|_)(release|version)" | sed -E 's:[[:space:]]::g')
     primary_release_files=""
     secondary_release_files=""
     # Sort know VS un-known files first
@@ -959,7 +959,7 @@ __sort_release_files() {
     done
 
     # Now let's sort by know files importance, max important goes last in the max_prio list
-    max_prio="redhat-release centos-release oracle-release fedora-release almalinux-release"
+    max_prio="redhat-release centos-release oracle-release fedora-release almalinux-release rocky-release"
     for entry in $max_prio; do
         if [ "$(echo "${primary_release_files}" | grep "$entry")" != "" ]; then
             primary_release_files=$(echo "${primary_release_files}" | sed -e "s:\\(.*\\)\\($entry\\)\\(.*\\):\\2 \\1 \\3:g")
@@ -1028,6 +1028,8 @@ __gather_linux_system_info() {
         elif [ "${DISTRO_NAME}" = "Arch" ]; then
             DISTRO_NAME="Arch Linux"
             return
+        elif [ "${DISTRO_NAME}" = "Rocky" ]; then
+            DISTRO_NAME="Rocky Linux"
         fi
         rv=$(lsb_release -sr)
         [ "${rv}" != "" ] && DISTRO_VERSION=$(__parse_version_string "$rv")
@@ -1087,6 +1089,7 @@ __gather_linux_system_info() {
             void               ) n="VoidLinux"      ;;
             oracle             ) n="Oracle Linux"   ;;
             almalinux          ) n="AlmaLinux"      ;;
+            rocky              ) n="Rocky Linux"    ;;
             system             )
                 while read -r line; do
                     [ "${n}x" != "systemx" ] && break
@@ -1816,14 +1819,14 @@ elif [ "${DISTRO_NAME_L}" = "debian" ]; then
   __debian_codename_translation
 fi
 
-if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian|ubuntu|centos|gentoo|red_hat|oracle|scientific|amazon|fedora|macosx|almalinux)')" = "" ] && [ "$ITYPE" = "stable" ] && [ "$STABLE_REV" != "latest" ]; then
+if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian|ubuntu|centos|gentoo|red_hat|oracle|scientific|amazon|fedora|macosx|almalinux|rocky)')" = "" ] && [ "$ITYPE" = "stable" ] && [ "$STABLE_REV" != "latest" ]; then
     echoerror "${DISTRO_NAME} does not have major version pegged packages support"
     exit 1
 fi
 
 # Only RedHat based distros have testing support
 if [ "${ITYPE}" = "testing" ]; then
-    if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(centos|red_hat|amazon|oracle|almalinux)')" = "" ]; then
+    if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(centos|red_hat|amazon|oracle|almalinux|rocky)')" = "" ]; then
         echoerror "${DISTRO_NAME} does not have testing packages support"
         exit 1
     fi
@@ -4912,6 +4915,69 @@ install_almalinux_check_services() {
 #
 #######################################################################################################################
 
+#######################################################################################################################
+#
+#   Rocky Linux Install Functions
+#
+install_rocky_linux_stable_deps() {
+    install_centos_stable_deps || return 1
+    return 0
+}
+
+install_rocky_linux_git_deps() {
+    install_centos_git_deps || return 1
+    return 0
+}
+
+install_rocky_linux_testing_deps() {
+    install_centos_testing_deps || return 1
+    return 0
+}
+
+install_rocky_linux_stable() {
+    install_centos_stable || return 1
+    return 0
+}
+
+install_rocky_linux_git() {
+    install_centos_git || return 1
+    return 0
+}
+
+install_rocky_linux_testing() {
+    install_centos_testing || return 1
+    return 0
+}
+
+install_rocky_linux_stable_post() {
+    install_centos_stable_post || return 1
+    return 0
+}
+
+install_rocky_linux_git_post() {
+    install_centos_git_post || return 1
+    return 0
+}
+
+install_rocky_linux_testing_post() {
+    install_centos_testing_post || return 1
+    return 0
+}
+
+install_rocky_linux_restart_daemons() {
+    install_centos_restart_daemons || return 1
+    return 0
+}
+
+install_rocky_linux_check_services() {
+    install_centos_check_services || return 1
+    return 0
+}
+#
+#   Ended Rocky Linux Install Functions
+#
+#######################################################################################################################
+
 #######################################################################################################################
 #
 #   Scientific Linux Install Functions

From 86058da36b2dea7f5cc9aead27f387049effe966 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 09:09:57 +0000
Subject: [PATCH 097/135] ci(kitchen): use official Rocky Linux image on Docker
 Hub

* https://hub.docker.com/_/rockylinux?tab=tags
---
 kitchen.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index 4c798b5f6..5d90c24dc 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -101,8 +101,6 @@ platforms:
   - name: oraclelinux-8
   - name: oraclelinux-7
   - name: rockylinux-8
-    driver:
-      image: rockylinux/rockylinux
   - name: ubuntu-21.10
     driver:
       run_command: /lib/systemd/systemd

From 78a1458c21b22e2168157e103f72d6aebab662bf Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 09:41:35 +0000
Subject: [PATCH 098/135] ci(rockylinux): add `3004` testing (`stable` and
 `git`)

---
 .github/workflows/main.yml              | 138 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   3 +-
 2 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 344bdf007..cf325f78d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5748,6 +5748,144 @@ jobs:
           bundle exec kitchen destroy latest-oraclelinux-8
 
 
+  py3-stable-3004-rockylinux-8:
+    name: Rocky Linux 8 v3004 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-rockylinux-8 || bundle exec kitchen create py3-stable-3004-rockylinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-rockylinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-rockylinux-8
+
+
+  py3-git-3004-rockylinux-8:
+    name: Rocky Linux 8 v3004 Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-3004-rockylinux-8 || bundle exec kitchen create py3-git-3004-rockylinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3004-rockylinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3004-rockylinux-8
+
+
+  py3-stable-3004-0-rockylinux-8:
+    name: Rocky Linux 8 v3004.0 Py3 Stable
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-stable-3004-0-rockylinux-8 || bundle exec kitchen create py3-stable-3004-0-rockylinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3004-0-rockylinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3004-0-rockylinux-8
+
+
   py3-git-master-rockylinux-8:
     name: Rocky Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 6648b9f84..ac619e583 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -48,6 +48,7 @@
     "gentoo-systemd",
     "oraclelinux-7",
     "oraclelinux-8",
+    "rockylinux-8",
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
@@ -88,7 +89,6 @@
 ]
 
 BLACKLIST_3004 = [
-    "rockylinux-8",
     "ubuntu-1604",
     "arch",
 ]
@@ -97,7 +97,6 @@
     "amazon-2",
     "gentoo",
     "gentoo-systemd",
-    "rockylinux-8",
     "ubuntu-1604",
     "arch",
 ]

From d209023419b03d3e528e1990eedc77c78eb200cc Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 09:26:52 +0000
Subject: [PATCH 099/135] ci(gemfile+lock): update to latest versions

---
 .gitignore   |   1 -
 Gemfile      |   6 ++-
 Gemfile.lock | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 Gemfile.lock

diff --git a/.gitignore b/.gitignore
index bf1876684..45c7a12e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@
 kitchen.local.yml
 .kitchen/
 .bundle/
-Gemfile.lock
diff --git a/Gemfile b/Gemfile
index ecb686d8f..373342b8b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-gem 'test-kitchen', '>= 2.0.1'
-gem 'kitchen-salt', '>= 0.5'
+gem 'test-kitchen', '>= 3.2.2'
+gem 'kitchen-salt', '>= 0.7.2'
 gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker.git'
 
 group :vagrant do
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..92cd27045
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,124 @@
+GIT
+  remote: https://github.com/test-kitchen/kitchen-docker.git
+  revision: 8d2a6f04e77b76bc9f77e0bb8cc52542743b7b6a
+  specs:
+    kitchen-docker (2.11.0)
+      test-kitchen (>= 1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bcrypt_pbkdf (1.1.0)
+    builder (3.2.4)
+    chef-utils (17.9.52)
+      concurrent-ruby
+    concurrent-ruby (1.1.9)
+    ed25519 (1.3.0)
+    erubi (1.10.0)
+    ffi (1.15.5)
+    gssapi (1.3.1)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashie (5.0.0)
+    httpclient (2.8.3)
+    kitchen-salt (0.7.2)
+      hashie (>= 3.5)
+      test-kitchen (>= 1.4)
+    kitchen-vagrant (1.11.0)
+      test-kitchen (>= 1.4, < 4)
+    license-acceptance (2.1.13)
+      pastel (~> 0.7)
+      tomlrb (>= 1.2, < 3.0)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)
+    little-plugger (1.1.4)
+    logging (2.3.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
+    mixlib-install (3.12.16)
+      mixlib-shellout
+      mixlib-versioning
+      thor
+    mixlib-shellout (3.2.5)
+      chef-utils
+    mixlib-versioning (1.2.12)
+    multi_json (1.15.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
+    nori (2.6.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.2)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    test-kitchen (3.2.2)
+      bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
+      ed25519 (~> 1.2)
+      license-acceptance (>= 1.0.11, < 3.0)
+      mixlib-install (~> 3.6)
+      mixlib-shellout (>= 1.2, < 4.0)
+      net-scp (>= 1.1, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
+      net-ssh-gateway (>= 1.2, < 3.0)
+      thor (>= 0.19, < 2.0)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.1)
+    thor (1.2.1)
+    tomlrb (2.0.1)
+    tty-box (0.7.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-cursor (~> 0.7)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    unicode-display_width (2.1.0)
+    unicode_utils (1.4.0)
+    winrm (2.3.6)
+      builder (>= 2.1.2)
+      erubi (~> 1.8)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
+      erubi (~> 1.8)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.3.5)
+      erubi (~> 1.8)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 2.0)
+      winrm (~> 2.0)
+    wisper (2.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  kitchen-docker!
+  kitchen-salt (>= 0.7.2)
+  kitchen-vagrant
+  test-kitchen (>= 3.2.2)
+
+BUNDLED WITH
+   2.1.2

From e3ff84df7891cb4fd4076cf5d6219d2ab6327586 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 10:02:04 +0000
Subject: [PATCH 100/135] ci: remove `centos-8` (EOL)

* https://www.centos.org/centos-linux-eol/
  - "CentOS Linux 8 will reach End Of Life (EOL) on December 31st, 2021."
---
 .github/workflows/main.yml              | 506 ------------------------
 .github/workflows/templates/generate.py |   3 -
 kitchen.yml                             |   1 -
 3 files changed, 510 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf325f78d..cb371e55d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1470,512 +1470,6 @@ jobs:
           bundle exec kitchen destroy latest-centos-7
 
 
-  py3-stable-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-centos-8 || bundle exec kitchen create py3-stable-3002-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-8
-
-
-  py3-git-3002-centos-8:
-    name: CentOS 8 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-centos-8 || bundle exec kitchen create py3-git-3002-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-centos-8
-
-
-  py3-stable-3002-0-centos-8:
-    name: CentOS 8 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-centos-8 || bundle exec kitchen create py3-stable-3002-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-centos-8
-
-
-  py3-stable-3003-centos-8:
-    name: CentOS 8 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-centos-8 || bundle exec kitchen create py3-stable-3003-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-8
-
-
-  py3-git-3003-centos-8:
-    name: CentOS 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-centos-8 || bundle exec kitchen create py3-git-3003-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-centos-8
-
-
-  py3-stable-3003-0-centos-8:
-    name: CentOS 8 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-8 || bundle exec kitchen create py3-stable-3003-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-8
-
-
-  py3-stable-3004-centos-8:
-    name: CentOS 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-centos-8 || bundle exec kitchen create py3-stable-3004-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-8
-
-
-  py3-git-3004-centos-8:
-    name: CentOS 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-centos-8 || bundle exec kitchen create py3-git-3004-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-centos-8
-
-
-  py3-stable-3004-0-centos-8:
-    name: CentOS 8 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-centos-8 || bundle exec kitchen create py3-stable-3004-0-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-0-centos-8
-
-
-  py3-git-master-centos-8:
-    name: CentOS 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-8 || bundle exec kitchen create py3-git-master-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-8
-
-
-  latest-centos-8:
-    name: CentOS 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-8
-
-
   py3-stable-3003-centos-stream8:
     name: CentOS Stream 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index ac619e583..fd4014095 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -10,7 +10,6 @@
     "amazon-2",
     "arch",
     "centos-7",
-    "centos-8",
     "centos-stream8",
     "debian-10",
     "debian-11",
@@ -36,7 +35,6 @@
     "almalinux-8",
     "amazon-2",
     "centos-7",
-    "centos-8",
     "centos-stream8",
     "debian-10",
     "debian-11",
@@ -132,7 +130,6 @@
     "amazon-2": "Amazon 2",
     "arch": "Arch",
     "centos-7": "CentOS 7",
-    "centos-8": "CentOS 8",
     "centos-stream8": "CentOS Stream 8",
     "debian-10": "Debian 10",
     "debian-11": "Debian 11",
diff --git a/kitchen.yml b/kitchen.yml
index 5d90c24dc..420cb4072 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -46,7 +46,6 @@ platforms:
   - name: centos-stream8
     driver:
       image: quay.io/centos/centos:stream8
-  - name: centos-8
   - name: centos-7
   - name: debian-9
     driver:

From b2d56a6b2148a408799b03b03e5c0a0ff7461b7d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 15:38:57 +0000
Subject: [PATCH 101/135] ci: remove `fedora-33` (EOL)

* https://docs.fedoraproject.org/en-US/releases/eol/
  - Release:   Fedora Linux 33
  - EOL since: 2021-11-30
---
 .github/workflows/main.yml              | 230 ------------------------
 .github/workflows/templates/generate.py |   3 -
 kitchen.yml                             |   8 +-
 3 files changed, 1 insertion(+), 240 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cb371e55d..2078e099b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3080,236 +3080,6 @@ jobs:
           bundle exec kitchen destroy latest-debian-9
 
 
-  py3-git-3002-fedora-33:
-    name: Fedora 33 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-fedora-33 || bundle exec kitchen create py3-git-3002-fedora-33
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-fedora-33
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-33
-
-
-  py3-git-3003-fedora-33:
-    name: Fedora 33 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-fedora-33 || bundle exec kitchen create py3-git-3003-fedora-33
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-fedora-33
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-33
-
-
-  py3-git-3004-fedora-33:
-    name: Fedora 33 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-fedora-33 || bundle exec kitchen create py3-git-3004-fedora-33
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-fedora-33
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-fedora-33
-
-
-  py3-git-master-fedora-33:
-    name: Fedora 33 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-fedora-33 || bundle exec kitchen create py3-git-master-fedora-33
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-33
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-33
-
-
-  latest-fedora-33:
-    name: Fedora 33 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-fedora-33 || bundle exec kitchen create latest-fedora-33
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-33
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-33
-
-
   py3-git-3002-fedora-34:
     name: Fedora 34 v3002 Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index fd4014095..4ceaaba3c 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -14,7 +14,6 @@
     "debian-10",
     "debian-11",
     "debian-9",
-    "fedora-33",
     "fedora-34",
     "fedora-35",
     "gentoo",
@@ -39,7 +38,6 @@
     "debian-10",
     "debian-11",
     "debian-9",
-    "fedora-33",
     "fedora-34",
     "fedora-35",
     "gentoo",
@@ -134,7 +132,6 @@
     "debian-10": "Debian 10",
     "debian-11": "Debian 11",
     "debian-9": "Debian 9",
-    "fedora-33": "Fedora 33",
     "fedora-34": "Fedora 34",
     "fedora-35": "Fedora 35",
     "gentoo": "Gentoo",
diff --git a/kitchen.yml b/kitchen.yml
index 420cb4072..a543310cb 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -57,14 +57,11 @@ platforms:
     driver:
       image: debian:bullseye
       run_command: /lib/systemd/systemd
-  - name: fedora-33
+  - name: fedora-34
     driver:
       provision_command: &fedora_provision_command
         - dnf -y install procps-ng
         - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
-  - name: fedora-34
-    driver:
-      provision_command: *fedora_provision_command
   - name: fedora-35
     driver:
       provision_command: *fedora_provision_command
@@ -134,7 +131,6 @@ suites:
       - opensuse-15
       - opensuse-tumbleweed
       - debian-11
-      - fedora-33
       - arch
       - gentoo
       - gentoo-systemd
@@ -148,7 +144,6 @@ suites:
     excludes:
       - opensuse-15
       - opensuse-tumbleweed
-      - fedora-33
       - arch
       - gentoo
       - gentoo-systemd
@@ -184,7 +179,6 @@ suites:
     excludes:
       - opensuse-15
       - opensuse-tumbleweed
-      - fedora-33
       - arch
       - gentoo
       - gentoo-systemd

From 92117f6625514cf481cda4524b1d8bc36a51b07e Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 26 Feb 2022 15:44:02 +0000
Subject: [PATCH 102/135] ci(kitchen): set `LEGACY` crypto policy on Fedora
 (get `35` working)

Using successfully in the `salt-image-builder` for almost a year now:

* https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/ac145f3022a13
---
 kitchen.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index a543310cb..bc27d4122 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -60,8 +60,8 @@ platforms:
   - name: fedora-34
     driver:
       provision_command: &fedora_provision_command
-        - dnf -y install procps-ng
-        - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
+        - dnf -y install procps-ng crypto-policies-scripts
+        - update-crypto-policies --set LEGACY
   - name: fedora-35
     driver:
       provision_command: *fedora_provision_command

From 438f06b9c786d87d44c2cf0fb4df28e2d6fd8cb0 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Tue, 15 Mar 2022 10:20:49 +0100
Subject: [PATCH 103/135] Bump version to 2022.03.15 release

---
 .pre-commit-config.yaml |  2 +-
 ChangeLog               | 12 ++++++++++++
 bootstrap-salt.sh       |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c48dae6a0..4bd53368c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,6 +27,6 @@ repos:
 
       - id: shellcheck
         name: Run ShellCheck against bootstrap-salt.sh
-        entry: koalaman/shellcheck-alpine:v0.6.0 shellcheck -s sh -f tty
+        entry: koalaman/shellcheck-alpine:v0.7.0 shellcheck -s sh -f tty
         files: 'bootstrap-salt\.sh'
         language: docker_image
diff --git a/ChangeLog b/ChangeLog
index 34b7f234e..bfffef074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 Version TBD (In Progress on the Develop Branch):
 
+Version 2022.03.15:
+	* Add detection and functions for AlmaLinux and Rocky Linux (myii) #1803
+	* Copy configs to correct config dirs (v3004+) (dafyddj) #1798
+	* Support Non-LTS Ubuntu 21.04 & 21.10 (blindpirate) #1793
+	* Use native repositories for Debian 11 (jpacura) #1615
+	* Keep all command-line parameters when UAC is enabled (Simon-TheUser) #1613
+	* Add support for Raspbian (Jille) #1612
+	* Add openrc to alpine:latest dependencies (krionbsd) #1609
+	* Add CentOS 7 base key (bryceml) #1608
+	* Fix git master install on alpine 3.12+ (Nascire) #1604
+	* Sort help alphabetically (krionbsd) #1601
+
 Version 2021.09.17:
 	* Re-add Ubuntu-16 support as it's still supported with 3001 and 3002 (krionbsd) #1594
 	* Add oncoming 3004 release (krionbsd) #1593
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 386cc318e..8b160d774 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -14,7 +14,7 @@
 #
 #          BUGS: https://github.com/saltstack/salt-bootstrap/issues
 #
-#     COPYRIGHT: (c) 2012-2021 by the SaltStack Team, see AUTHORS.rst for more
+#     COPYRIGHT: (c) 2012-2022 by the SaltStack Team, see AUTHORS.rst for more
 #                details.
 #
 #       LICENSE: Apache 2.0
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2021.09.17"
+__ScriptVersion="2022.03.15"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"

From 8df2941696dd80e4346d41775dfda6395eca3ce4 Mon Sep 17 00:00:00 2001
From: s0undt3ch <s0undt3ch@users.noreply.github.com>
Date: Tue, 15 Mar 2022 13:04:06 +0000
Subject: [PATCH 104/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 300ee786f..0c700dbfa 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-44fb623bac5b19cc2be01420458d3de8eea2a133dd8f13c135038494476b7f4e
+16a710e377c83fce3a256427a7813a9ff742bce842c45b16a1aa71f2f9f631fb
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 56f040aa6..6a3aac4c0 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-090d652cd6290debce0e3a4eded65086a4272e69446e711eb26f87160593b6a2
+8f65952c3435f441e7f793941d5162d3ec2033a9ef82722ff1da67a2ef860a2f

From 0cb75a5536dd67fcb99b20b53f4bc8f4ef9c62ce Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Thu, 19 May 2022 14:39:49 +0200
Subject: [PATCH 105/135] 2022.05.19 release

---
 .github/workflows/kitchen.macos.yml     |  132 +
 .github/workflows/kitchen.vagrant.yml   |    9 -
 .github/workflows/kitchen.windows.yml   |    1 +
 .github/workflows/main-branch-only.yml  |  557 +---
 .github/workflows/main.yml              | 3501 +++--------------------
 .github/workflows/templates/generate.py |  128 +-
 .github/workflows/templates/main.yml    |    5 +-
 .pre-commit-config.yaml                 |    2 +-
 README.rst                              |    2 +
 RELEASE.md                              |   10 +-
 bootstrap-salt.ps1                      |  120 +-
 bootstrap-salt.sh                       |   33 +-
 kitchen.macos.yml                       |   36 +
 kitchen.vagrant.yml                     |    2 +-
 kitchen.windows.yml                     |    6 +-
 kitchen.yml                             |   11 +-
 tests/conftest.py                       |    5 +
 tests/requirements.txt                  |    2 +-
 18 files changed, 849 insertions(+), 3713 deletions(-)
 create mode 100644 .github/workflows/kitchen.macos.yml
 create mode 100644 kitchen.macos.yml

diff --git a/.github/workflows/kitchen.macos.yml b/.github/workflows/kitchen.macos.yml
new file mode 100644
index 000000000..6ec70d66e
--- /dev/null
+++ b/.github/workflows/kitchen.macos.yml
@@ -0,0 +1,132 @@
+# yamllint disable rule:line-length
+---
+name: 'Kitchen (MacOS)'
+'on': ['push', 'pull_request']
+
+env:
+  KITCHEN_LOCAL_YAML: 'kitchen.macos.yml'
+
+jobs:
+  generate-actions-workflow:
+    name: 'Generate The Actions Workflow'
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: 'actions/checkout@v1'
+      - name: 'Set up Python 3.7'
+        uses: 'actions/setup-python@v1'
+        with:
+          python-version: 3.7
+      - name: 'Install Pre-Commit'
+        run: |
+          pip install -U pip
+          pip install pre-commit
+          pre-commit install
+      - name: 'Generate Workflow Actions'
+        run: |
+          pre-commit run -av generate-actions-workflow
+  lint:
+    name: 'Lint'
+    runs-on: 'ubuntu-latest'
+    needs: 'generate-actions-workflow'
+    container: 'koalaman/shellcheck-alpine:v0.6.0'
+    steps:
+      - uses: 'actions/checkout@v1'
+      - name: 'ShellCheck'
+        run: |
+          shellcheck -s sh -f tty bootstrap-salt.sh
+  test-12:
+    runs-on: 'macos-12'
+    timeout-minutes: 20
+    needs: 'lint'
+    strategy:
+      fail-fast: false
+      matrix:
+        instance:
+          - latest-macos-12
+          - py3-stable-3004-macos-12
+          - py3-stable-3003-macos-12
+          - py3-stable-3002-macos-12
+    steps:
+      - name: 'Check out code'
+        uses: 'actions/checkout@v2'
+      - name: 'Set up Bundler cache'
+        uses: 'actions/cache@v1'
+        with:
+          path: 'vendor/bundle'
+          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
+          restore-keys: "${{ runner.os }}-gems-"
+      - name: 'Run Bundler'
+        run: |
+          ruby --version
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: 'Install Python Dependencies'
+        run: |
+          pip3 install -U pip
+          pip3 install -r tests/requirements.txt
+      - name: 'Run Test Kitchen'
+        run: 'bundle exec kitchen test ${{ matrix.instance }}'
+  test-11:
+    runs-on: 'macos-11'
+    timeout-minutes: 20
+    needs: 'lint'
+    strategy:
+      fail-fast: false
+      matrix:
+        instance:
+          - latest-macos-11
+          - py3-stable-3004-macos-11
+          - py3-stable-3003-macos-11
+          - py3-stable-3002-macos-11
+    steps:
+      - name: 'Check out code'
+        uses: 'actions/checkout@v2'
+      - name: 'Set up Bundler cache'
+        uses: 'actions/cache@v1'
+        with:
+          path: 'vendor/bundle'
+          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
+          restore-keys: "${{ runner.os }}-gems-"
+      - name: 'Run Bundler'
+        run: |
+          ruby --version
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: 'Install Python Dependencies'
+        run: |
+          pip3 install -U pip
+          pip3 install -r tests/requirements.txt
+      - name: 'Run Test Kitchen'
+        run: 'bundle exec kitchen test ${{ matrix.instance }}'
+  test-1015:
+    runs-on: 'macos-10.15'
+    timeout-minutes: 20
+    needs: 'lint'
+    strategy:
+      fail-fast: false
+      matrix:
+        instance:
+          - latest-macos-1015
+          - py3-stable-3004-macos-1015
+          - py3-stable-3003-macos-1015
+          - py3-stable-3002-macos-1015
+    steps:
+      - name: 'Check out code'
+        uses: 'actions/checkout@v2'
+      - name: 'Set up Bundler cache'
+        uses: 'actions/cache@v1'
+        with:
+          path: 'vendor/bundle'
+          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
+          restore-keys: "${{ runner.os }}-gems-"
+      - name: 'Run Bundler'
+        run: |
+          ruby --version
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: 'Install Python Dependencies'
+        run: |
+          pip3 install -U pip
+          pip3 install -r tests/requirements.txt
+      - name: 'Run Test Kitchen'
+        run: 'bundle exec kitchen test ${{ matrix.instance }}'
diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 71fab7aa1..7ce5471fb 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -41,15 +41,6 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - py3-git-3002-freebsd-130
-          - py3-git-3002-freebsd-123
-          # - py3-git-3002-openbsd-6
-          - py3-git-3003-freebsd-130
-          - py3-git-3003-freebsd-123
-          # - py3-git-3003-openbsd-6
-          - py3-git-3004-freebsd-130
-          - py3-git-3004-freebsd-123
-          # - py3-git-3004-openbsd-6
           - py3-git-master-freebsd-130
           - py3-git-master-freebsd-123
           # - py3-git-master-openbsd-6
diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
index 572806e65..c3e6ff896 100644
--- a/.github/workflows/kitchen.windows.yml
+++ b/.github/workflows/kitchen.windows.yml
@@ -1,3 +1,4 @@
+# yamllint disable rule:line-length
 ---
 name: 'Kitchen (Windows)'
 'on': ['push', 'pull_request']
diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index 2f8c43748..6e13b051b 100644
--- a/.github/workflows/main-branch-only.yml
+++ b/.github/workflows/main-branch-only.yml
@@ -1,289 +1,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY!
 #
 # This file was generated by .github/workflows/templates/generate.py
+#
+# yamllint disable rule:line-length rule:empty-lines
+---
 
 name: Branch Testing
 
-on: [push]
+'on': [push]
 
 jobs:
 
-  py3-stable-3002-gentoo:
-    name: Gentoo v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-gentoo || bundle exec kitchen create py3-stable-3002-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-gentoo
-
-
-  py3-git-3002-gentoo:
-    name: Gentoo v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-gentoo || bundle exec kitchen create py3-git-3002-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-gentoo
-
-
-  py3-stable-3003-gentoo:
-    name: Gentoo v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-gentoo || bundle exec kitchen create py3-stable-3003-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-gentoo
-
-
-  py3-git-3003-gentoo:
-    name: Gentoo v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-gentoo || bundle exec kitchen create py3-git-3003-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-gentoo
-
-
-  py3-stable-3004-gentoo:
-    name: Gentoo v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-gentoo || bundle exec kitchen create py3-stable-3004-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-gentoo
-
-
-  py3-git-3004-gentoo:
-    name: Gentoo v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-gentoo || bundle exec kitchen create py3-git-3004-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-gentoo
-
-
   py3-git-master-gentoo:
     name: Gentoo Master Py3 Git
     runs-on: ubuntu-latest
@@ -376,282 +103,6 @@ jobs:
           bundle exec kitchen destroy latest-gentoo
 
 
-  py3-stable-3002-gentoo-systemd:
-    name: Gentoo (systemd) v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-gentoo-systemd || bundle exec kitchen create py3-stable-3002-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-gentoo-systemd
-
-
-  py3-git-3002-gentoo-systemd:
-    name: Gentoo (systemd) v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-gentoo-systemd || bundle exec kitchen create py3-git-3002-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-gentoo-systemd
-
-
-  py3-stable-3003-gentoo-systemd:
-    name: Gentoo (systemd) v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-gentoo-systemd || bundle exec kitchen create py3-stable-3003-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-gentoo-systemd
-
-
-  py3-git-3003-gentoo-systemd:
-    name: Gentoo (systemd) v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-gentoo-systemd || bundle exec kitchen create py3-git-3003-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-gentoo-systemd
-
-
-  py3-stable-3004-gentoo-systemd:
-    name: Gentoo (systemd) v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-gentoo-systemd || bundle exec kitchen create py3-stable-3004-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-gentoo-systemd
-
-
-  py3-git-3004-gentoo-systemd:
-    name: Gentoo (systemd) v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-gentoo-systemd || bundle exec kitchen create py3-git-3004-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-gentoo-systemd
-
-
   py3-git-master-gentoo-systemd:
     name: Gentoo (systemd) Master Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2078e099b..0deede808 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,10 +1,13 @@
 # DO NOT EDIT THIS FILE DIRECTLY!
 #
 # This file was generated by .github/workflows/templates/generate.py
+#
+# yamllint disable rule:line-length rule:empty-lines
+---
 
 name: Testing
 
-on: [push, pull_request]
+'on': [push, pull_request]
 
 jobs:
 
@@ -136,8 +139,8 @@ jobs:
           bundle exec kitchen destroy py3-git-3003-almalinux-8
 
 
-  py3-stable-3003-0-almalinux-8:
-    name: AlmaLinux 8 v3003.0 Py3 Stable
+  py3-stable-3004-almalinux-8:
+    name: AlmaLinux 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -170,20 +173,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-almalinux-8 || bundle exec kitchen create py3-stable-3003-0-almalinux-8
+          bundle exec kitchen create py3-stable-3004-almalinux-8 || bundle exec kitchen create py3-stable-3004-almalinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-almalinux-8
+          bundle exec kitchen verify py3-stable-3004-almalinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-almalinux-8
+          bundle exec kitchen destroy py3-stable-3004-almalinux-8
 
 
-  py3-stable-3004-almalinux-8:
-    name: AlmaLinux 8 v3004 Py3 Stable
+  py3-git-3004-almalinux-8:
+    name: AlmaLinux 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -216,20 +219,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-almalinux-8 || bundle exec kitchen create py3-stable-3004-almalinux-8
+          bundle exec kitchen create py3-git-3004-almalinux-8 || bundle exec kitchen create py3-git-3004-almalinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-almalinux-8
+          bundle exec kitchen verify py3-git-3004-almalinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-almalinux-8
+          bundle exec kitchen destroy py3-git-3004-almalinux-8
 
 
-  py3-git-3004-almalinux-8:
-    name: AlmaLinux 8 v3004 Py3 Git
+  py3-git-master-almalinux-8:
+    name: AlmaLinux 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -262,20 +265,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-almalinux-8 || bundle exec kitchen create py3-git-3004-almalinux-8
+          bundle exec kitchen create py3-git-master-almalinux-8 || bundle exec kitchen create py3-git-master-almalinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-almalinux-8
+          bundle exec kitchen verify py3-git-master-almalinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-almalinux-8
+          bundle exec kitchen destroy py3-git-master-almalinux-8
 
 
-  py3-stable-3004-0-almalinux-8:
-    name: AlmaLinux 8 v3004.0 Py3 Stable
+  latest-almalinux-8:
+    name: AlmaLinux 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -308,20 +311,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-almalinux-8 || bundle exec kitchen create py3-stable-3004-0-almalinux-8
+          bundle exec kitchen create latest-almalinux-8 || bundle exec kitchen create latest-almalinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-almalinux-8
+          bundle exec kitchen verify latest-almalinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-almalinux-8
+          bundle exec kitchen destroy latest-almalinux-8
 
 
-  py3-git-master-almalinux-8:
-    name: AlmaLinux 8 Master Py3 Git
+  py3-stable-3002-amazon-2:
+    name: Amazon 2 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -354,20 +357,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-almalinux-8 || bundle exec kitchen create py3-git-master-almalinux-8
+          bundle exec kitchen create py3-stable-3002-amazon-2 || bundle exec kitchen create py3-stable-3002-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-almalinux-8
+          bundle exec kitchen verify py3-stable-3002-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-almalinux-8
+          bundle exec kitchen destroy py3-stable-3002-amazon-2
 
 
-  latest-almalinux-8:
-    name: AlmaLinux 8 Latest packaged release
+  py3-stable-3003-amazon-2:
+    name: Amazon 2 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -400,20 +403,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-almalinux-8 || bundle exec kitchen create latest-almalinux-8
+          bundle exec kitchen create py3-stable-3003-amazon-2 || bundle exec kitchen create py3-stable-3003-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-almalinux-8
+          bundle exec kitchen verify py3-stable-3003-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-almalinux-8
+          bundle exec kitchen destroy py3-stable-3003-amazon-2
 
 
-  py3-stable-3002-amazon-2:
-    name: Amazon 2 v3002 Py3 Stable
+  py3-stable-3004-amazon-2:
+    name: Amazon 2 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -446,20 +449,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-amazon-2 || bundle exec kitchen create py3-stable-3002-amazon-2
+          bundle exec kitchen create py3-stable-3004-amazon-2 || bundle exec kitchen create py3-stable-3004-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-amazon-2
+          bundle exec kitchen verify py3-stable-3004-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-amazon-2
+          bundle exec kitchen destroy py3-stable-3004-amazon-2
 
 
-  py3-git-3002-amazon-2:
-    name: Amazon 2 v3002 Py3 Git
+  py3-git-master-amazon-2:
+    name: Amazon 2 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -492,20 +495,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-amazon-2 || bundle exec kitchen create py3-git-3002-amazon-2
+          bundle exec kitchen create py3-git-master-amazon-2 || bundle exec kitchen create py3-git-master-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-amazon-2
+          bundle exec kitchen verify py3-git-master-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-amazon-2
+          bundle exec kitchen destroy py3-git-master-amazon-2
 
 
-  py3-stable-3003-amazon-2:
-    name: Amazon 2 v3003 Py3 Stable
+  latest-amazon-2:
+    name: Amazon 2 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -538,20 +541,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-amazon-2 || bundle exec kitchen create py3-stable-3003-amazon-2
+          bundle exec kitchen create latest-amazon-2 || bundle exec kitchen create latest-amazon-2
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-amazon-2
+          bundle exec kitchen verify latest-amazon-2
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-amazon-2
+          bundle exec kitchen destroy latest-amazon-2
 
 
-  py3-git-3003-amazon-2:
-    name: Amazon 2 v3003 Py3 Git
+  py3-git-master-arch:
+    name: Arch Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -584,20 +587,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-amazon-2 || bundle exec kitchen create py3-git-3003-amazon-2
+          bundle exec kitchen create py3-git-master-arch || bundle exec kitchen create py3-git-master-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-amazon-2
+          bundle exec kitchen verify py3-git-master-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-amazon-2
+          bundle exec kitchen destroy py3-git-master-arch
 
 
-  py3-stable-3004-amazon-2:
-    name: Amazon 2 v3004 Py3 Stable
+  latest-arch:
+    name: Arch Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -630,20 +633,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-amazon-2 || bundle exec kitchen create py3-stable-3004-amazon-2
+          bundle exec kitchen create latest-arch || bundle exec kitchen create latest-arch
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-amazon-2
+          bundle exec kitchen verify latest-arch
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-amazon-2
+          bundle exec kitchen destroy latest-arch
 
 
-  py3-git-3004-amazon-2:
-    name: Amazon 2 v3004 Py3 Git
+  py3-stable-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -676,20 +679,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-amazon-2 || bundle exec kitchen create py3-git-3004-amazon-2
+          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-amazon-2
+          bundle exec kitchen verify py3-stable-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-amazon-2
+          bundle exec kitchen destroy py3-stable-3002-centos-7
 
 
-  py3-git-master-amazon-2:
-    name: Amazon 2 Master Py3 Git
+  py3-git-3002-centos-7:
+    name: CentOS 7 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -722,20 +725,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-amazon-2 || bundle exec kitchen create py3-git-master-amazon-2
+          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-amazon-2
+          bundle exec kitchen verify py3-git-3002-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-amazon-2
+          bundle exec kitchen destroy py3-git-3002-centos-7
 
 
-  latest-amazon-2:
-    name: Amazon 2 Latest packaged release
+  py3-stable-3003-centos-7:
+    name: CentOS 7 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -768,20 +771,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-amazon-2 || bundle exec kitchen create latest-amazon-2
+          bundle exec kitchen create py3-stable-3003-centos-7 || bundle exec kitchen create py3-stable-3003-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-amazon-2
+          bundle exec kitchen verify py3-stable-3003-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-amazon-2
+          bundle exec kitchen destroy py3-stable-3003-centos-7
 
 
-  py3-git-3002-arch:
-    name: Arch v3002 Py3 Git
+  py3-git-3003-centos-7:
+    name: CentOS 7 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -814,20 +817,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-arch || bundle exec kitchen create py3-git-3002-arch
+          bundle exec kitchen create py3-git-3003-centos-7 || bundle exec kitchen create py3-git-3003-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-arch
+          bundle exec kitchen verify py3-git-3003-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-arch
+          bundle exec kitchen destroy py3-git-3003-centos-7
 
 
-  py3-git-3003-arch:
-    name: Arch v3003 Py3 Git
+  py3-stable-3004-centos-7:
+    name: CentOS 7 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -860,20 +863,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-arch || bundle exec kitchen create py3-git-3003-arch
+          bundle exec kitchen create py3-stable-3004-centos-7 || bundle exec kitchen create py3-stable-3004-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-arch
+          bundle exec kitchen verify py3-stable-3004-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-arch
+          bundle exec kitchen destroy py3-stable-3004-centos-7
 
 
-  py3-git-master-arch:
-    name: Arch Master Py3 Git
+  py3-git-3004-centos-7:
+    name: CentOS 7 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -906,20 +909,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-arch || bundle exec kitchen create py3-git-master-arch
+          bundle exec kitchen create py3-git-3004-centos-7 || bundle exec kitchen create py3-git-3004-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-arch
+          bundle exec kitchen verify py3-git-3004-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-arch
+          bundle exec kitchen destroy py3-git-3004-centos-7
 
 
-  latest-arch:
-    name: Arch Latest packaged release
+  py3-git-master-centos-7:
+    name: CentOS 7 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -952,20 +955,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-arch || bundle exec kitchen create latest-arch
+          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-arch
+          bundle exec kitchen verify py3-git-master-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-arch
+          bundle exec kitchen destroy py3-git-master-centos-7
 
 
-  py3-stable-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Stable
+  latest-centos-7:
+    name: CentOS 7 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -998,20 +1001,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
+          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-centos-7
+          bundle exec kitchen verify latest-centos-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-7
+          bundle exec kitchen destroy latest-centos-7
 
 
-  py3-git-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Git
+  py3-stable-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1044,20 +1047,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
+          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-centos-7
+          bundle exec kitchen verify py3-stable-3003-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-centos-7
+          bundle exec kitchen destroy py3-stable-3003-centos-stream8
 
 
-  py3-stable-3002-0-centos-7:
-    name: CentOS 7 v3002.0 Py3 Stable
+  py3-git-3003-centos-stream8:
+    name: CentOS Stream 8 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1090,20 +1093,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-centos-7 || bundle exec kitchen create py3-stable-3002-0-centos-7
+          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-centos-7
+          bundle exec kitchen verify py3-git-3003-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-centos-7
+          bundle exec kitchen destroy py3-git-3003-centos-stream8
 
 
-  py3-stable-3003-centos-7:
-    name: CentOS 7 v3003 Py3 Stable
+  py3-stable-3004-centos-stream8:
+    name: CentOS Stream 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1136,20 +1139,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-centos-7 || bundle exec kitchen create py3-stable-3003-centos-7
+          bundle exec kitchen create py3-stable-3004-centos-stream8 || bundle exec kitchen create py3-stable-3004-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-centos-7
+          bundle exec kitchen verify py3-stable-3004-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-7
+          bundle exec kitchen destroy py3-stable-3004-centos-stream8
 
 
-  py3-git-3003-centos-7:
-    name: CentOS 7 v3003 Py3 Git
+  py3-git-3004-centos-stream8:
+    name: CentOS Stream 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1182,20 +1185,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-centos-7 || bundle exec kitchen create py3-git-3003-centos-7
+          bundle exec kitchen create py3-git-3004-centos-stream8 || bundle exec kitchen create py3-git-3004-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-centos-7
+          bundle exec kitchen verify py3-git-3004-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-centos-7
+          bundle exec kitchen destroy py3-git-3004-centos-stream8
 
 
-  py3-stable-3003-0-centos-7:
-    name: CentOS 7 v3003.0 Py3 Stable
+  py3-git-master-centos-stream8:
+    name: CentOS Stream 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1228,20 +1231,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-7 || bundle exec kitchen create py3-stable-3003-0-centos-7
+          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-7
+          bundle exec kitchen verify py3-git-master-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-7
+          bundle exec kitchen destroy py3-git-master-centos-stream8
 
 
-  py3-stable-3004-centos-7:
-    name: CentOS 7 v3004 Py3 Stable
+  latest-centos-stream8:
+    name: CentOS Stream 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1274,20 +1277,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-centos-7 || bundle exec kitchen create py3-stable-3004-centos-7
+          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-centos-7
+          bundle exec kitchen verify latest-centos-stream8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-7
+          bundle exec kitchen destroy latest-centos-stream8
 
 
-  py3-git-3004-centos-7:
-    name: CentOS 7 v3004 Py3 Git
+  py3-stable-3002-debian-10:
+    name: Debian 10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1320,20 +1323,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-centos-7 || bundle exec kitchen create py3-git-3004-centos-7
+          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-centos-7
+          bundle exec kitchen verify py3-stable-3002-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-centos-7
+          bundle exec kitchen destroy py3-stable-3002-debian-10
 
 
-  py3-stable-3004-0-centos-7:
-    name: CentOS 7 v3004.0 Py3 Stable
+  py3-stable-3003-debian-10:
+    name: Debian 10 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1366,20 +1369,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-centos-7 || bundle exec kitchen create py3-stable-3004-0-centos-7
+          bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-centos-7
+          bundle exec kitchen verify py3-stable-3003-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-centos-7
+          bundle exec kitchen destroy py3-stable-3003-debian-10
 
 
-  py3-git-master-centos-7:
-    name: CentOS 7 Master Py3 Git
+  py3-stable-3004-debian-10:
+    name: Debian 10 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1412,20 +1415,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
+          bundle exec kitchen create py3-stable-3004-debian-10 || bundle exec kitchen create py3-stable-3004-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-centos-7
+          bundle exec kitchen verify py3-stable-3004-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-centos-7
+          bundle exec kitchen destroy py3-stable-3004-debian-10
 
 
-  latest-centos-7:
-    name: CentOS 7 Latest packaged release
+  py3-git-master-debian-10:
+    name: Debian 10 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1458,20 +1461,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
+          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-centos-7
+          bundle exec kitchen verify py3-git-master-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-centos-7
+          bundle exec kitchen destroy py3-git-master-debian-10
 
 
-  py3-stable-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Stable
+  latest-debian-10:
+    name: Debian 10 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1504,20 +1507,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
+          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-centos-stream8
+          bundle exec kitchen verify latest-debian-10
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-stream8
+          bundle exec kitchen destroy latest-debian-10
 
 
-  py3-git-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Git
+  py3-stable-3004-debian-11:
+    name: Debian 11 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -1550,2596 +1553,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-centos-stream8
-
-
-  py3-stable-3003-0-centos-stream8:
-    name: CentOS Stream 8 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-centos-stream8 || bundle exec kitchen create py3-stable-3003-0-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-centos-stream8
-
-
-  py3-stable-3004-centos-stream8:
-    name: CentOS Stream 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-centos-stream8 || bundle exec kitchen create py3-stable-3004-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-stream8
-
-
-  py3-git-3004-centos-stream8:
-    name: CentOS Stream 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-centos-stream8 || bundle exec kitchen create py3-git-3004-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-centos-stream8
-
-
-  py3-stable-3004-0-centos-stream8:
-    name: CentOS Stream 8 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-centos-stream8 || bundle exec kitchen create py3-stable-3004-0-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-0-centos-stream8
-
-
-  py3-git-master-centos-stream8:
-    name: CentOS Stream 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-stream8
-
-
-  latest-centos-stream8:
-    name: CentOS Stream 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-stream8
-
-
-  py3-stable-3002-debian-10:
-    name: Debian 10 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-10
-
-
-  py3-git-3002-debian-10:
-    name: Debian 10 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-debian-10 || bundle exec kitchen create py3-git-3002-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-debian-10
-
-
-  py3-stable-3002-0-debian-10:
-    name: Debian 10 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-10 || bundle exec kitchen create py3-stable-3002-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-10
-
-
-  py3-stable-3003-debian-10:
-    name: Debian 10 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-10
-
-
-  py3-git-3003-debian-10:
-    name: Debian 10 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-debian-10 || bundle exec kitchen create py3-git-3003-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-debian-10
-
-
-  py3-stable-3003-0-debian-10:
-    name: Debian 10 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-10 || bundle exec kitchen create py3-stable-3003-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-10
-
-
-  py3-stable-3004-debian-10:
-    name: Debian 10 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-debian-10 || bundle exec kitchen create py3-stable-3004-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-10
-
-
-  py3-git-3004-debian-10:
-    name: Debian 10 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-debian-10 || bundle exec kitchen create py3-git-3004-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-debian-10
-
-
-  py3-stable-3004-0-debian-10:
-    name: Debian 10 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-debian-10 || bundle exec kitchen create py3-stable-3004-0-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-0-debian-10
-
-
-  py3-git-master-debian-10:
-    name: Debian 10 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-debian-10
-
-
-  latest-debian-10:
-    name: Debian 10 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-10
-
-
-  py3-stable-3004-debian-11:
-    name: Debian 11 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-debian-11 || bundle exec kitchen create py3-stable-3004-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-11
-
-
-  py3-git-3004-debian-11:
-    name: Debian 11 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-debian-11 || bundle exec kitchen create py3-git-3004-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-debian-11
-
-
-  py3-stable-3004-0-debian-11:
-    name: Debian 11 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-debian-11 || bundle exec kitchen create py3-stable-3004-0-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-0-debian-11
-
-
-  py3-git-master-debian-11:
-    name: Debian 11 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-debian-11
-
-
-  latest-debian-11:
-    name: Debian 11 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-11
-
-
-  py3-stable-3002-debian-9:
-    name: Debian 9 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-9
-
-
-  py3-git-3002-debian-9:
-    name: Debian 9 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-debian-9
-
-
-  py3-stable-3002-0-debian-9:
-    name: Debian 9 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-debian-9 || bundle exec kitchen create py3-stable-3002-0-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-0-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-0-debian-9
-
-
-  py3-stable-3003-debian-9:
-    name: Debian 9 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-9
-
-
-  py3-git-3003-debian-9:
-    name: Debian 9 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-debian-9
-
-
-  py3-stable-3003-0-debian-9:
-    name: Debian 9 v3003.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-0-debian-9 || bundle exec kitchen create py3-stable-3003-0-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-0-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-0-debian-9
-
-
-  py3-stable-3004-debian-9:
-    name: Debian 9 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-debian-9 || bundle exec kitchen create py3-stable-3004-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-9
-
-
-  py3-git-3004-debian-9:
-    name: Debian 9 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-debian-9 || bundle exec kitchen create py3-git-3004-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-debian-9
-
-
-  py3-stable-3004-0-debian-9:
-    name: Debian 9 v3004.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-0-debian-9 || bundle exec kitchen create py3-stable-3004-0-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-0-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-0-debian-9
-
-
-  py3-git-master-debian-9:
-    name: Debian 9 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-debian-9
-
-
-  latest-debian-9:
-    name: Debian 9 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-9
-
-
-  py3-git-3002-fedora-34:
-    name: Fedora 34 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-fedora-34 || bundle exec kitchen create py3-git-3002-fedora-34
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-fedora-34
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-34
-
-
-  py3-git-3003-fedora-34:
-    name: Fedora 34 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-fedora-34 || bundle exec kitchen create py3-git-3003-fedora-34
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-fedora-34
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-34
-
-
-  py3-git-3004-fedora-34:
-    name: Fedora 34 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-fedora-34 || bundle exec kitchen create py3-git-3004-fedora-34
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-fedora-34
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-fedora-34
-
-
-  py3-git-master-fedora-34:
-    name: Fedora 34 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-34
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-34
-
-
-  latest-fedora-34:
-    name: Fedora 34 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-34
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-34
-
-
-  py3-git-3002-fedora-35:
-    name: Fedora 35 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-fedora-35 || bundle exec kitchen create py3-git-3002-fedora-35
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-fedora-35
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-35
-
-
-  py3-git-3003-fedora-35:
-    name: Fedora 35 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-fedora-35 || bundle exec kitchen create py3-git-3003-fedora-35
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-fedora-35
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-fedora-35
-
-
-  py3-git-3004-fedora-35:
-    name: Fedora 35 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-fedora-35 || bundle exec kitchen create py3-git-3004-fedora-35
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-fedora-35
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-fedora-35
-
-
-  py3-git-master-fedora-35:
-    name: Fedora 35 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-fedora-35 || bundle exec kitchen create py3-git-master-fedora-35
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-35
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-35
-
-
-  latest-fedora-35:
-    name: Fedora 35 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-fedora-35 || bundle exec kitchen create latest-fedora-35
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-35
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-35
-
-
-  py3-git-3002-opensuse-15:
-    name: Opensuse 15 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-opensuse-15 || bundle exec kitchen create py3-git-3002-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-opensuse-15
-
-
-  py3-git-3003-opensuse-15:
-    name: Opensuse 15 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-opensuse-15 || bundle exec kitchen create py3-git-3003-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-opensuse-15
-
-
-  py3-git-3004-opensuse-15:
-    name: Opensuse 15 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-opensuse-15 || bundle exec kitchen create py3-git-3004-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-opensuse-15
-
-
-  py3-git-master-opensuse-15:
-    name: Opensuse 15 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-15
-
-
-  latest-opensuse-15:
-    name: Opensuse 15 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-opensuse-15
-
-
-  py3-git-3002-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-opensuse-tumbleweed || bundle exec kitchen create py3-git-3002-opensuse-tumbleweed
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-opensuse-tumbleweed
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed
-
-
-  py3-git-3003-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-opensuse-tumbleweed || bundle exec kitchen create py3-git-3003-opensuse-tumbleweed
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-opensuse-tumbleweed
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-opensuse-tumbleweed
-
-
-  py3-git-3004-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-opensuse-tumbleweed || bundle exec kitchen create py3-git-3004-opensuse-tumbleweed
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-opensuse-tumbleweed
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-opensuse-tumbleweed
-
-
-  py3-git-master-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
-
-
-  latest-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-opensuse-tumbleweed
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-opensuse-tumbleweed
-
-
-  py3-stable-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
-
-
-  py3-git-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
-
-
-  py3-stable-3002-0-oraclelinux-7:
-    name: Oracle Linux 7 v3002.0 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen create py3-stable-3004-debian-11 || bundle exec kitchen create py3-stable-3004-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen verify py3-stable-3004-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7
+          bundle exec kitchen destroy py3-stable-3004-debian-11
 
 
-  py3-stable-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Stable
+  py3-git-master-debian-11:
+    name: Debian 11 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4172,20 +1599,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
+          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
+          bundle exec kitchen verify py3-git-master-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
+          bundle exec kitchen destroy py3-git-master-debian-11
 
 
-  py3-git-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Git
+  latest-debian-11:
+    name: Debian 11 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4218,20 +1645,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
+          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-7
+          bundle exec kitchen verify latest-debian-11
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
+          bundle exec kitchen destroy latest-debian-11
 
 
-  py3-stable-3003-0-oraclelinux-7:
-    name: Oracle Linux 7 v3003.0 Py3 Stable
+  py3-stable-3002-debian-9:
+    name: Debian 9 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4264,20 +1691,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen verify py3-stable-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-7
+          bundle exec kitchen destroy py3-stable-3002-debian-9
 
 
-  py3-stable-3004-oraclelinux-7:
-    name: Oracle Linux 7 v3004 Py3 Stable
+  py3-git-3002-debian-9:
+    name: Debian 9 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4310,20 +1737,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-oraclelinux-7
+          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-oraclelinux-7
+          bundle exec kitchen verify py3-git-3002-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3002-debian-9
 
 
-  py3-git-3004-oraclelinux-7:
-    name: Oracle Linux 7 v3004 Py3 Git
+  py3-stable-3003-debian-9:
+    name: Debian 9 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4356,20 +1783,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-oraclelinux-7 || bundle exec kitchen create py3-git-3004-oraclelinux-7
+          bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-oraclelinux-7
+          bundle exec kitchen verify py3-stable-3003-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-oraclelinux-7
+          bundle exec kitchen destroy py3-stable-3003-debian-9
 
 
-  py3-stable-3004-0-oraclelinux-7:
-    name: Oracle Linux 7 v3004.0 Py3 Stable
+  py3-git-3003-debian-9:
+    name: Debian 9 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4402,20 +1829,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-7
+          bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-7
+          bundle exec kitchen verify py3-git-3003-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3003-debian-9
 
 
-  py3-git-master-oraclelinux-7:
-    name: Oracle Linux 7 Master Py3 Git
+  py3-stable-3004-debian-9:
+    name: Debian 9 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4448,20 +1875,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
+          bundle exec kitchen create py3-stable-3004-debian-9 || bundle exec kitchen create py3-stable-3004-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-7
+          bundle exec kitchen verify py3-stable-3004-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-7
+          bundle exec kitchen destroy py3-stable-3004-debian-9
 
 
-  latest-oraclelinux-7:
-    name: Oracle Linux 7 Latest packaged release
+  py3-git-3004-debian-9:
+    name: Debian 9 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4494,20 +1921,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
+          bundle exec kitchen create py3-git-3004-debian-9 || bundle exec kitchen create py3-git-3004-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-oraclelinux-7
+          bundle exec kitchen verify py3-git-3004-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-oraclelinux-7
+          bundle exec kitchen destroy py3-git-3004-debian-9
 
 
-  py3-stable-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Stable
+  py3-git-master-debian-9:
+    name: Debian 9 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4540,20 +1967,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8
+          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-debian-9
 
 
-  py3-git-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Git
+  latest-debian-9:
+    name: Debian 9 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4586,20 +2013,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8
+          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-8
+          bundle exec kitchen verify latest-debian-9
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-8
+          bundle exec kitchen destroy latest-debian-9
 
 
-  py3-stable-3002-0-oraclelinux-8:
-    name: Oracle Linux 8 v3002.0 Py3 Stable
+  py3-git-master-fedora-34:
+    name: Fedora 34 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4632,20 +2059,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-fedora-34
 
 
-  py3-stable-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Stable
+  latest-fedora-34:
+    name: Fedora 34 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4678,20 +2105,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
+          bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
+          bundle exec kitchen verify latest-fedora-34
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
+          bundle exec kitchen destroy latest-fedora-34
 
 
-  py3-git-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Git
+  py3-git-master-fedora-35:
+    name: Fedora 35 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4724,20 +2151,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
+          bundle exec kitchen create py3-git-master-fedora-35 || bundle exec kitchen create py3-git-master-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-fedora-35
 
 
-  py3-stable-3003-0-oraclelinux-8:
-    name: Oracle Linux 8 v3003.0 Py3 Stable
+  latest-fedora-35:
+    name: Fedora 35 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4770,20 +2197,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen create latest-fedora-35 || bundle exec kitchen create latest-fedora-35
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen verify latest-fedora-35
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-8
+          bundle exec kitchen destroy latest-fedora-35
 
 
-  py3-stable-3004-oraclelinux-8:
-    name: Oracle Linux 8 v3004 Py3 Stable
+  py3-git-master-fedora-36:
+    name: Fedora 36 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4816,20 +2243,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-oraclelinux-8
+          bundle exec kitchen create py3-git-master-fedora-36 || bundle exec kitchen create py3-git-master-fedora-36
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-fedora-36
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-fedora-36
 
 
-  py3-git-3004-oraclelinux-8:
-    name: Oracle Linux 8 v3004 Py3 Git
+  latest-fedora-36:
+    name: Fedora 36 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4862,20 +2289,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-oraclelinux-8 || bundle exec kitchen create py3-git-3004-oraclelinux-8
+          bundle exec kitchen create latest-fedora-36 || bundle exec kitchen create latest-fedora-36
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-oraclelinux-8
+          bundle exec kitchen verify latest-fedora-36
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-oraclelinux-8
+          bundle exec kitchen destroy latest-fedora-36
 
 
-  py3-stable-3004-0-oraclelinux-8:
-    name: Oracle Linux 8 v3004.0 Py3 Stable
+  py3-git-master-opensuse-15:
+    name: Opensuse 15 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4908,20 +2335,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-0-oraclelinux-8
+          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-opensuse-15
 
 
-  py3-git-master-oraclelinux-8:
-    name: Oracle Linux 8 Master Py3 Git
+  latest-opensuse-15:
+    name: Opensuse 15 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -4954,20 +2381,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-8 || bundle exec kitchen create py3-git-master-oraclelinux-8
+          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-8
+          bundle exec kitchen verify latest-opensuse-15
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-8
+          bundle exec kitchen destroy latest-opensuse-15
 
 
-  latest-oraclelinux-8:
-    name: Oracle Linux 8 Latest packaged release
+  py3-git-master-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5000,20 +2427,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-oraclelinux-8 || bundle exec kitchen create latest-oraclelinux-8
+          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-oraclelinux-8
+          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-oraclelinux-8
+          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
 
 
-  py3-stable-3004-rockylinux-8:
-    name: Rocky Linux 8 v3004 Py3 Stable
+  latest-opensuse-tumbleweed:
+    name: Opensuse Tumbleweed Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5046,20 +2473,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-rockylinux-8 || bundle exec kitchen create py3-stable-3004-rockylinux-8
+          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-rockylinux-8
+          bundle exec kitchen verify latest-opensuse-tumbleweed
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-rockylinux-8
+          bundle exec kitchen destroy latest-opensuse-tumbleweed
 
 
-  py3-git-3004-rockylinux-8:
-    name: Rocky Linux 8 v3004 Py3 Git
+  py3-stable-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5092,20 +2519,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-rockylinux-8 || bundle exec kitchen create py3-git-3004-rockylinux-8
+          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-rockylinux-8
+          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-rockylinux-8
+          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
 
 
-  py3-stable-3004-0-rockylinux-8:
-    name: Rocky Linux 8 v3004.0 Py3 Stable
+  py3-git-3002-oraclelinux-7:
+    name: Oracle Linux 7 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5138,20 +2565,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-rockylinux-8 || bundle exec kitchen create py3-stable-3004-0-rockylinux-8
+          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-rockylinux-8
+          bundle exec kitchen verify py3-git-3002-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-rockylinux-8
+          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
 
 
-  py3-git-master-rockylinux-8:
-    name: Rocky Linux 8 Master Py3 Git
+  py3-stable-3003-oraclelinux-7:
+    name: Oracle Linux 7 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5184,20 +2611,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-rockylinux-8 || bundle exec kitchen create py3-git-master-rockylinux-8
+          bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-rockylinux-8
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-rockylinux-8
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
 
 
-  latest-rockylinux-8:
-    name: Rocky Linux 8 Latest packaged release
+  py3-git-3003-oraclelinux-7:
+    name: Oracle Linux 7 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5230,20 +2657,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-rockylinux-8 || bundle exec kitchen create latest-rockylinux-8
+          bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-rockylinux-8
+          bundle exec kitchen verify py3-git-3003-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-rockylinux-8
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
 
 
-  py3-stable-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Stable
+  py3-stable-3004-oraclelinux-7:
+    name: Oracle Linux 7 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5276,20 +2703,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-ubuntu-1604
+          bundle exec kitchen create py3-stable-3004-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3004-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3004-oraclelinux-7
 
 
-  py3-git-3002-ubuntu-1604:
-    name: Ubuntu 16.04 v3002 Py3 Git
+  py3-git-3004-oraclelinux-7:
+    name: Oracle Linux 7 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5322,20 +2749,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1604 || bundle exec kitchen create py3-git-3002-ubuntu-1604
+          bundle exec kitchen create py3-git-3004-oraclelinux-7 || bundle exec kitchen create py3-git-3004-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1604
+          bundle exec kitchen verify py3-git-3004-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1604
+          bundle exec kitchen destroy py3-git-3004-oraclelinux-7
 
 
-  py3-stable-3002-0-ubuntu-1604:
-    name: Ubuntu 16.04 v3002.0 Py3 Stable
+  py3-git-master-oraclelinux-7:
+    name: Oracle Linux 7 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5368,20 +2795,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-1604 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen verify py3-git-master-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1604
+          bundle exec kitchen destroy py3-git-master-oraclelinux-7
 
 
-  py3-git-master-ubuntu-1604:
-    name: Ubuntu 16.04 Master Py3 Git
+  latest-oraclelinux-7:
+    name: Oracle Linux 7 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5414,20 +2841,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1604 || bundle exec kitchen create py3-git-master-ubuntu-1604
+          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1604
+          bundle exec kitchen verify latest-oraclelinux-7
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1604
+          bundle exec kitchen destroy latest-oraclelinux-7
 
 
-  latest-ubuntu-1604:
-    name: Ubuntu 16.04 Latest packaged release
+  py3-stable-3002-oraclelinux-8:
+    name: Oracle Linux 8 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5460,20 +2887,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1604 || bundle exec kitchen create latest-ubuntu-1604
+          bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1604
+          bundle exec kitchen verify py3-stable-3002-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1604
+          bundle exec kitchen destroy py3-stable-3002-oraclelinux-8
 
 
-  py3-stable-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Stable
+  py3-git-3002-oraclelinux-8:
+    name: Oracle Linux 8 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5506,20 +2933,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
+          bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
+          bundle exec kitchen verify py3-git-3002-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3002-oraclelinux-8
 
 
-  py3-git-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Git
+  py3-stable-3003-oraclelinux-8:
+    name: Oracle Linux 8 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5552,20 +2979,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
+          bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
 
 
-  py3-stable-3002-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3002.0 Py3 Stable
+  py3-git-3003-oraclelinux-8:
+    name: Oracle Linux 8 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5598,20 +3025,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen verify py3-git-3003-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
 
 
-  py3-stable-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Stable
+  py3-stable-3004-oraclelinux-8:
+    name: Oracle Linux 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5644,20 +3071,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
+          bundle exec kitchen create py3-stable-3004-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3004-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3004-oraclelinux-8
 
 
-  py3-git-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Git
+  py3-git-3004-oraclelinux-8:
+    name: Oracle Linux 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5690,20 +3117,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
+          bundle exec kitchen create py3-git-3004-oraclelinux-8 || bundle exec kitchen create py3-git-3004-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-1804
+          bundle exec kitchen verify py3-git-3004-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3004-oraclelinux-8
 
 
-  py3-stable-3003-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3003.0 Py3 Stable
+  py3-git-master-oraclelinux-8:
+    name: Oracle Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5736,20 +3163,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen create py3-git-master-oraclelinux-8 || bundle exec kitchen create py3-git-master-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen verify py3-git-master-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-1804
+          bundle exec kitchen destroy py3-git-master-oraclelinux-8
 
 
-  py3-stable-3004-ubuntu-1804:
-    name: Ubuntu 18.04 v3004 Py3 Stable
+  latest-oraclelinux-8:
+    name: Oracle Linux 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5782,20 +3209,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-ubuntu-1804
+          bundle exec kitchen create latest-oraclelinux-8 || bundle exec kitchen create latest-oraclelinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-1804
+          bundle exec kitchen verify latest-oraclelinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-1804
+          bundle exec kitchen destroy latest-oraclelinux-8
 
 
-  py3-git-3004-ubuntu-1804:
-    name: Ubuntu 18.04 v3004 Py3 Git
+  py3-stable-3004-rockylinux-8:
+    name: Rocky Linux 8 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5828,20 +3255,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-ubuntu-1804 || bundle exec kitchen create py3-git-3004-ubuntu-1804
+          bundle exec kitchen create py3-stable-3004-rockylinux-8 || bundle exec kitchen create py3-stable-3004-rockylinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-ubuntu-1804
+          bundle exec kitchen verify py3-stable-3004-rockylinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-ubuntu-1804
+          bundle exec kitchen destroy py3-stable-3004-rockylinux-8
 
 
-  py3-stable-3004-0-ubuntu-1804:
-    name: Ubuntu 18.04 v3004.0 Py3 Stable
+  py3-git-3004-rockylinux-8:
+    name: Rocky Linux 8 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5874,20 +3301,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-0-ubuntu-1804
+          bundle exec kitchen create py3-git-3004-rockylinux-8 || bundle exec kitchen create py3-git-3004-rockylinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-ubuntu-1804
+          bundle exec kitchen verify py3-git-3004-rockylinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-1804
+          bundle exec kitchen destroy py3-git-3004-rockylinux-8
 
 
-  py3-git-master-ubuntu-1804:
-    name: Ubuntu 18.04 Master Py3 Git
+  py3-git-master-rockylinux-8:
+    name: Rocky Linux 8 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5920,20 +3347,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
+          bundle exec kitchen create py3-git-master-rockylinux-8 || bundle exec kitchen create py3-git-master-rockylinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1804
+          bundle exec kitchen verify py3-git-master-rockylinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1804
+          bundle exec kitchen destroy py3-git-master-rockylinux-8
 
 
-  latest-ubuntu-1804:
-    name: Ubuntu 18.04 Latest packaged release
+  latest-rockylinux-8:
+    name: Rocky Linux 8 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -5966,20 +3393,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
+          bundle exec kitchen create latest-rockylinux-8 || bundle exec kitchen create latest-rockylinux-8
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-1804
+          bundle exec kitchen verify latest-rockylinux-8
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-1804
+          bundle exec kitchen destroy latest-rockylinux-8
 
 
-  py3-stable-3002-ubuntu-2004:
-    name: Ubuntu 20.04 v3002 Py3 Stable
+  py3-stable-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6012,20 +3439,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-ubuntu-2004
+          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
 
 
-  py3-git-3002-ubuntu-2004:
-    name: Ubuntu 20.04 v3002 Py3 Git
+  py3-git-3002-ubuntu-1804:
+    name: Ubuntu 18.04 v3002 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6058,20 +3485,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-2004 || bundle exec kitchen create py3-git-3002-ubuntu-2004
+          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-2004
+          bundle exec kitchen verify py3-git-3002-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-2004
+          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
 
 
-  py3-stable-3002-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3002.0 Py3 Stable
+  py3-stable-3003-ubuntu-1804:
+    name: Ubuntu 18.04 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6104,20 +3531,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-0-ubuntu-2004
+          bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-0-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
 
 
-  py3-stable-3003-ubuntu-2004:
-    name: Ubuntu 20.04 v3003 Py3 Stable
+  py3-git-3003-ubuntu-1804:
+    name: Ubuntu 18.04 v3003 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6150,20 +3577,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-ubuntu-2004
+          bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-2004
+          bundle exec kitchen verify py3-git-3003-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-2004
+          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
 
 
-  py3-git-3003-ubuntu-2004:
-    name: Ubuntu 20.04 v3003 Py3 Git
+  py3-stable-3004-ubuntu-1804:
+    name: Ubuntu 18.04 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6196,20 +3623,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-2004 || bundle exec kitchen create py3-git-3003-ubuntu-2004
+          bundle exec kitchen create py3-stable-3004-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3004-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-1804
 
 
-  py3-stable-3003-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3003.0 Py3 Stable
+  py3-git-3004-ubuntu-1804:
+    name: Ubuntu 18.04 v3004 Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6242,20 +3669,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2004
+          bundle exec kitchen create py3-git-3004-ubuntu-1804 || bundle exec kitchen create py3-git-3004-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2004
+          bundle exec kitchen verify py3-git-3004-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2004
+          bundle exec kitchen destroy py3-git-3004-ubuntu-1804
 
 
-  py3-stable-3004-ubuntu-2004:
-    name: Ubuntu 20.04 v3004 Py3 Stable
+  py3-git-master-ubuntu-1804:
+    name: Ubuntu 18.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6288,20 +3715,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-2004 || bundle exec kitchen create py3-stable-3004-ubuntu-2004
+          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-2004
+          bundle exec kitchen verify py3-git-master-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-2004
+          bundle exec kitchen destroy py3-git-master-ubuntu-1804
 
 
-  py3-git-3004-ubuntu-2004:
-    name: Ubuntu 20.04 v3004 Py3 Git
+  latest-ubuntu-1804:
+    name: Ubuntu 18.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6334,20 +3761,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-ubuntu-2004 || bundle exec kitchen create py3-git-3004-ubuntu-2004
+          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-ubuntu-2004
+          bundle exec kitchen verify latest-ubuntu-1804
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-ubuntu-2004
+          bundle exec kitchen destroy latest-ubuntu-1804
 
 
-  py3-stable-3004-0-ubuntu-2004:
-    name: Ubuntu 20.04 v3004.0 Py3 Stable
+  py3-stable-3002-ubuntu-2004:
+    name: Ubuntu 20.04 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6380,20 +3807,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3004-0-ubuntu-2004
+          bundle exec kitchen create py3-stable-3002-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2004
 
 
-  py3-git-master-ubuntu-2004:
-    name: Ubuntu 20.04 Master Py3 Git
+  py3-stable-3003-ubuntu-2004:
+    name: Ubuntu 20.04 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6426,20 +3853,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-2004 || bundle exec kitchen create py3-git-master-ubuntu-2004
+          bundle exec kitchen create py3-stable-3003-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3003-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-2004
 
 
-  latest-ubuntu-2004:
-    name: Ubuntu 20.04 Latest packaged release
+  py3-stable-3004-ubuntu-2004:
+    name: Ubuntu 20.04 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6472,20 +3899,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-2004 || bundle exec kitchen create latest-ubuntu-2004
+          bundle exec kitchen create py3-stable-3004-ubuntu-2004 || bundle exec kitchen create py3-stable-3004-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-2004
+          bundle exec kitchen verify py3-stable-3004-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-2004
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-2004
 
 
-  py3-stable-3002-ubuntu-2110:
-    name: Ubuntu 21.10 v3002 Py3 Stable
+  py3-git-master-ubuntu-2004:
+    name: Ubuntu 20.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6518,20 +3945,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110
+          bundle exec kitchen create py3-git-master-ubuntu-2004 || bundle exec kitchen create py3-git-master-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-2110
+          bundle exec kitchen verify py3-git-master-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-2110
+          bundle exec kitchen destroy py3-git-master-ubuntu-2004
 
 
-  py3-git-3002-ubuntu-2110:
-    name: Ubuntu 21.10 v3002 Py3 Git
+  latest-ubuntu-2004:
+    name: Ubuntu 20.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6564,20 +3991,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-2110 || bundle exec kitchen create py3-git-3002-ubuntu-2110
+          bundle exec kitchen create latest-ubuntu-2004 || bundle exec kitchen create latest-ubuntu-2004
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-2110
+          bundle exec kitchen verify latest-ubuntu-2004
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-2110
+          bundle exec kitchen destroy latest-ubuntu-2004
 
 
-  py3-stable-3003-ubuntu-2110:
-    name: Ubuntu 21.10 v3003 Py3 Stable
+  py3-stable-3002-ubuntu-2110:
+    name: Ubuntu 21.10 v3002 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6610,20 +4037,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-ubuntu-2110
+          bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-2110
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-2110
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2110
 
 
-  py3-git-3003-ubuntu-2110:
-    name: Ubuntu 21.10 v3003 Py3 Git
+  py3-stable-3003-ubuntu-2110:
+    name: Ubuntu 21.10 v3003 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6656,20 +4083,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-2110 || bundle exec kitchen create py3-git-3003-ubuntu-2110
+          bundle exec kitchen create py3-stable-3003-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-2110
+          bundle exec kitchen verify py3-stable-3003-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-2110
+          bundle exec kitchen destroy py3-stable-3003-ubuntu-2110
 
 
-  py3-stable-3003-0-ubuntu-2110:
-    name: Ubuntu 21.10 v3003.0 Py3 Stable
+  py3-stable-3004-ubuntu-2110:
+    name: Ubuntu 21.10 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6702,20 +4129,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3003-0-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2110
+          bundle exec kitchen create py3-stable-3004-ubuntu-2110 || bundle exec kitchen create py3-stable-3004-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3003-0-ubuntu-2110
+          bundle exec kitchen verify py3-stable-3004-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2110
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-2110
 
 
-  py3-stable-3004-ubuntu-2110:
-    name: Ubuntu 21.10 v3004 Py3 Stable
+  py3-git-master-ubuntu-2110:
+    name: Ubuntu 21.10 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6748,20 +4175,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-2110 || bundle exec kitchen create py3-stable-3004-ubuntu-2110
+          bundle exec kitchen create py3-git-master-ubuntu-2110 || bundle exec kitchen create py3-git-master-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-2110
+          bundle exec kitchen verify py3-git-master-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-2110
+          bundle exec kitchen destroy py3-git-master-ubuntu-2110
 
 
-  py3-git-3004-ubuntu-2110:
-    name: Ubuntu 21.10 v3004 Py3 Git
+  latest-ubuntu-2110:
+    name: Ubuntu 21.10 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6794,20 +4221,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-3004-ubuntu-2110 || bundle exec kitchen create py3-git-3004-ubuntu-2110
+          bundle exec kitchen create latest-ubuntu-2110 || bundle exec kitchen create latest-ubuntu-2110
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-3004-ubuntu-2110
+          bundle exec kitchen verify latest-ubuntu-2110
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-3004-ubuntu-2110
+          bundle exec kitchen destroy latest-ubuntu-2110
 
 
-  py3-stable-3004-0-ubuntu-2110:
-    name: Ubuntu 21.10 v3004.0 Py3 Stable
+  py3-stable-3004-ubuntu-2204:
+    name: Ubuntu 22.04 v3004 Py3 Stable
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6840,20 +4267,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-stable-3004-0-ubuntu-2110 || bundle exec kitchen create py3-stable-3004-0-ubuntu-2110
+          bundle exec kitchen create py3-stable-3004-ubuntu-2204 || bundle exec kitchen create py3-stable-3004-ubuntu-2204
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-stable-3004-0-ubuntu-2110
+          bundle exec kitchen verify py3-stable-3004-ubuntu-2204
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-stable-3004-0-ubuntu-2110
+          bundle exec kitchen destroy py3-stable-3004-ubuntu-2204
 
 
-  py3-git-master-ubuntu-2110:
-    name: Ubuntu 21.10 Master Py3 Git
+  py3-git-master-ubuntu-2204:
+    name: Ubuntu 22.04 Master Py3 Git
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6886,20 +4313,20 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create py3-git-master-ubuntu-2110 || bundle exec kitchen create py3-git-master-ubuntu-2110
+          bundle exec kitchen create py3-git-master-ubuntu-2204 || bundle exec kitchen create py3-git-master-ubuntu-2204
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-2110
+          bundle exec kitchen verify py3-git-master-ubuntu-2204
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-2110
+          bundle exec kitchen destroy py3-git-master-ubuntu-2204
 
 
-  latest-ubuntu-2110:
-    name: Ubuntu 21.10 Latest packaged release
+  latest-ubuntu-2204:
+    name: Ubuntu 22.04 Latest packaged release
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -6932,13 +4359,13 @@ jobs:
 
       - name: Create Test Container
         run: |
-          bundle exec kitchen create latest-ubuntu-2110 || bundle exec kitchen create latest-ubuntu-2110
+          bundle exec kitchen create latest-ubuntu-2204 || bundle exec kitchen create latest-ubuntu-2204
 
       - name: Test Bootstrap In Test Container
         run: |
-          bundle exec kitchen verify latest-ubuntu-2110
+          bundle exec kitchen verify latest-ubuntu-2204
 
       - name: Destroy Test Container
         if: always()
         run: |
-          bundle exec kitchen destroy latest-ubuntu-2110
+          bundle exec kitchen destroy latest-ubuntu-2204
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 4ceaaba3c..2b1cc1f60 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -16,6 +16,7 @@
     "debian-9",
     "fedora-34",
     "fedora-35",
+    "fedora-36",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -23,16 +24,17 @@
     "oraclelinux-7",
     "oraclelinux-8",
     "rockylinux-8",
-    "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 OSX = WINDOWS = []
 
 STABLE_DISTROS = [
     "almalinux-8",
     "amazon-2",
+    "arch",
     "centos-7",
     "centos-stream8",
     "debian-10",
@@ -40,81 +42,128 @@
     "debian-9",
     "fedora-34",
     "fedora-35",
+    "fedora-36",
     "gentoo",
     "gentoo-systemd",
+    "opensuse-15",
+    "opensuse-tumbleweed",
     "oraclelinux-7",
     "oraclelinux-8",
     "rockylinux-8",
-    "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_3002 = [
     "almalinux-8",
+    "arch",
     "centos-stream8",
-    "rockylinux-8",
     "debian-11",
+    "fedora-34",
+    "fedora-35",
+    "fedora-36",
+    "gentoo",
+    "gentoo-systemd",
+    "opensuse-15",
+    "opensuse-tumbleweed",
+    "rockylinux-8",
+    "ubuntu-2204",
 ]
 
-BLACKLIST_3002_0 = [
+BLACKLIST_GIT_3002 = [
     "almalinux-8",
     "amazon-2",
+    "arch",
     "centos-stream8",
+    "debian-10",
     "debian-11",
+    "fedora-34",
+    "fedora-35",
+    "fedora-36",
     "gentoo",
     "gentoo-systemd",
+    "opensuse-15",
+    "opensuse-tumbleweed",
     "rockylinux-8",
+    "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_3003 = [
-    "rockylinux-8",
-    "ubuntu-1604",
+    "arch",
     "debian-11",
+    "fedora-34",
+    "fedora-35",
+    "fedora-36",
+    "gentoo",
+    "gentoo-systemd",
+    "opensuse-15",
+    "opensuse-tumbleweed",
+    "rockylinux-8",
+    "ubuntu-2204",
 ]
 
-BLACKLIST_3003_0 = [
+BLACKLIST_GIT_3003 = [
     "amazon-2",
+    "arch",
+    "debian-10",
+    "debian-11",
+    "fedora-34",
+    "fedora-35",
+    "fedora-36",
     "gentoo",
     "gentoo-systemd",
+    "opensuse-15",
+    "opensuse-tumbleweed",
     "rockylinux-8",
-    "ubuntu-1604",
-    "debian-11"
+    "ubuntu-2004",
+    "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_3004 = [
-    "ubuntu-1604",
     "arch",
+    "fedora-34",
+    "fedora-35",
+    "fedora-36",
+    "gentoo",
+    "gentoo-systemd",
+    "opensuse-15",
+    "opensuse-tumbleweed",
 ]
 
-BLACKLIST_3004_0 = [
+BLACKLIST_GIT_3004 = [
     "amazon-2",
+    "arch",
+    "debian-10",
+    "debian-11",
+    "fedora-34",
+    "fedora-35",
+    "fedora-36",
     "gentoo",
     "gentoo-systemd",
-    "ubuntu-1604",
-    "arch",
+    "opensuse-15",
+    "opensuse-tumbleweed",
+    "ubuntu-2004",
+    "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 SALT_BRANCHES = [
     "3002",
-    "3002-0",
     "3003",
-    "3003-0",
     "3004",
-    "3004-0",
     "master",
     "latest",
 ]
 
 BRANCH_DISPLAY_NAMES = {
     "3002": "v3002",
-    "3002-0": "v3002.0",
     "3003": "v3003",
-    "3003-0": "v3003.0",
     "3004": "v3004",
-    "3004-0": "v3004.0",
     "master": "Master",
     "latest": "Latest",
 }
@@ -134,6 +183,7 @@
     "debian-9": "Debian 9",
     "fedora-34": "Fedora 34",
     "fedora-35": "Fedora 35",
+    "fedora-36": "Fedora 36",
     "gentoo": "Gentoo",
     "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
@@ -141,10 +191,10 @@
     "oraclelinux-7": "Oracle Linux 7",
     "oraclelinux-8": "Oracle Linux 8",
     "rockylinux-8": "Rocky Linux 8",
-    "ubuntu-1604": "Ubuntu 16.04",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2110": "Ubuntu 21.10",
+    "ubuntu-2204": "Ubuntu 22.04",
 }
 
 TIMEOUT_DEFAULT = 20
@@ -223,28 +273,28 @@ def generate_test_jobs():
                             # Fedora does not keep old builds around
                             continue
 
+                    BLACKLIST = {
+                        "3002": BLACKLIST_3002,
+                        "3003": BLACKLIST_3003,
+                        "3004": BLACKLIST_3004,
+                    }
                     if bootstrap_type == "git":
+                        BLACKLIST = {
+                            "3002": BLACKLIST_GIT_3002,
+                            "3003": BLACKLIST_GIT_3003,
+                            "3004": BLACKLIST_GIT_3004,
+                        }
+
                         # .0 versions are a virtual version for pinning to the first point release of a major release, such as 3002, there is no git version.
                         if branch.endswith("-0"):
                             continue
 
-                    if branch == "3002" and distro in BLACKLIST_3002:
-                        continue
-
-                    if branch == "3002-0" and distro in BLACKLIST_3002_0:
+                    if (
+                        branch in ("3002", "3003", "3004")
+                        and distro in BLACKLIST[branch]
+                    ):
                         continue
 
-                    if branch == "3003" and distro in BLACKLIST_3003:
-                        continue
-
-                    if branch == "3003-0" and distro in BLACKLIST_3003_0:
-                        continue
-
-                    if branch == "3004" and distro in BLACKLIST_3004:
-                        continue
-
-                    if branch == "3004-0" and distro in BLACKLIST_3004_0:
-                        continue
                     if distro in LINUX_DISTROS:
                         template = "linux.yml"
                     elif distro in OSX:
@@ -289,7 +339,9 @@ def generate_test_jobs():
                     rfh.read()
                     .format(
                         jobs="{pre_commit}{lint}{test}".format(
-                            lint=lint_job, test=test_jobs, pre_commit=pre_commit_job,
+                            lint=lint_job,
+                            test=test_jobs,
+                            pre_commit=pre_commit_job,
                         ),
                         on="push, pull_request",
                         name="Testing",
@@ -304,7 +356,9 @@ def generate_test_jobs():
                 "{}\n".format(
                     rfh.read()
                     .format(
-                        jobs="{test}".format(test=branch_only_test_jobs,),
+                        jobs="{test}".format(
+                            test=branch_only_test_jobs,
+                        ),
                         on="push",
                         name="Branch Testing",
                     )
diff --git a/.github/workflows/templates/main.yml b/.github/workflows/templates/main.yml
index 327536c29..5686c002e 100644
--- a/.github/workflows/templates/main.yml
+++ b/.github/workflows/templates/main.yml
@@ -1,10 +1,13 @@
 # DO NOT EDIT THIS FILE DIRECTLY!
 #
 # This file was generated by .github/workflows/templates/generate.py
+#
+# yamllint disable rule:line-length rule:empty-lines
+---
 
 name: {name}
 
-on: [{on}]
+'on': [{on}]
 
 jobs:
 {jobs}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4bd53368c..2cdb73a84 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
       - id: end-of-file-fixer     # Makes sure files end in a newline and only a newline.
 
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 22.3.0
     hooks:
       - id: black
 
diff --git a/README.rst b/README.rst
index 5c68fb6ed..6b134de8c 100644
--- a/README.rst
+++ b/README.rst
@@ -32,6 +32,8 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+=======
+- 2022.03.15: ``8f65952c3435f441e7f793941d5162d3ec2033a9ef82722ff1da67a2ef860a2f``
 - 2021.09.17: ``090d652cd6290debce0e3a4eded65086a4272e69446e711eb26f87160593b6a2``
 - 2021.09.14: ``30fdcba972f449630b4f13492cb5525e69e08fa2cdb66a6dc78f1536ad279e52``
 - 2021.08.19: ``ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806``
diff --git a/RELEASE.md b/RELEASE.md
index 64db0f04c..8c36c5618 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -4,12 +4,12 @@
 - Go through the changes since last release, add them to changelog.
 - Add any new authors to the AUTHORS file.
 - If there's a new Salt release(major), update the script to add support for it.
-- Bump version for release
+- Bump version for release.
 - Open PR against develop with these changes.
-- Once the above PR is merged, open a PR against stable with the changes from develop
-- Once the above PR is merged, wait until an automatic PR is opened against develop which updates the checksums.
+- Once the above PR is merged, open a PR against stable with the changes from develop.
+- Once the above PR is merged, wait until an automatic PR is opened against stable which updates the checksums.
 - Once the above PR is merged, tag the release `v{version-here}` and push the tag.
-- Wait until an automatic PR is opened against the develop branch updating the release informtion. Merge it.
-- Check that an automated PR was opened against the salt repo updating the bootstrap script.
+- Wait until an automatic PR is opened against the develop branch updating the checksums in `README.rst`. Merge it.
+- Check that an automated PR was opened against the salt repo updating the bootstrap script, located in `salt/cloud/deploy/bootstrap-salt.sh`
 
 - Victory!
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index fb6e22a3a..468732a3c 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -1,11 +1,11 @@
 <#
 .SYNOPSIS
-    A simple Powershell script to download and install a salt minion on windows.
+    A simple Powershell script to download and install a Salt minion on Windows.
 
 .DESCRIPTION
-    The script will download the official salt package from saltstack. It will
+    The script will download the official Salt package from SaltProject. It will
     install a specific package version and accept parameters for the master and
-    minion ids. Finally, it can stop and set the windows service to "manual" for
+    minion ids. Finally, it can stop and set the Windows service to "manual" for
     local testing.
 
 .EXAMPLE
@@ -18,8 +18,9 @@
 
 .EXAMPLE
     ./bootstrap-salt.ps1 -pythonVersion 3
-    Specifies the Python version of the installer. Can be "2" or "3". Defaults to "2".
-    Python 3 installers are only available for Salt 2017.7.0 and newer.
+    Specifies the Python version of the installer. Can be "2" or "3". Defaults
+    to "2". Python 3 installers are only available for Salt 2017.7.0 and newer.
+    Starting with Python 3002 only Python 3 installers are available.
 
 .EXAMPLE
     ./bootstrap-salt.ps1 -runservice false
@@ -71,36 +72,36 @@
 #>
 
 #===============================================================================
-# Commandlet Binding
+# Bind Parameters
 #===============================================================================
 [CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
+param(
+    [Parameter(Mandatory=$false, ValueFromPipeline=$True)]
     # Doesn't support versions prior to "YYYY.M.R-B"
     # Supports new version and latest
     # Option 1 means case insensitive
     [ValidatePattern('^(\d{4}(\.\d{1,2}){0,2}(\-\d{1})?)|(latest)$', Options=1)]
-    [string]$version = '',
+    [string]$Version = '',
 
-    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
+    [Parameter(Mandatory=$false, ValueFromPipeline=$True)]
     # Doesn't support Python versions prior to "2017.7.0"
     [ValidateSet("2","3")]
-    [string]$pythonVersion = "3",
+    [string]$PythonVersion = "3",
 
-    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
+    [Parameter(Mandatory=$false, ValueFromPipeline=$True)]
     [ValidateSet("true","false")]
-    [string]$runservice = "true",
+    [string]$RunService = "true",
 
-    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
-    [string]$minion = "not-specified",
+    [Parameter(Mandatory=$false, ValueFromPipeline=$True)]
+    [string]$Minion = "not-specified",
 
-    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
-    [string]$master = "not-specified",
+    [Parameter(Mandatory=$false, ValueFromPipeline=$True)]
+    [string]$Master = "not-specified",
 
-    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
-    [string]$repourl= "https://repo.saltproject.io/windows",
+    [Parameter(Mandatory=$false, ValueFromPipeline=$True)]
+    [string]$RepoUrl= "https://repo.saltproject.io/windows",
 
-    [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
+    [Parameter(Mandatory=$false, ValueFromPipeline=$True)]
     [switch]$ConfigureOnly
 )
 
@@ -125,8 +126,8 @@ function Get-IsUacEnabled
 #===============================================================================
 # Check for Elevated Privileges
 #===============================================================================
-If (!(Get-IsAdministrator)) {
-    If (Get-IsUacEnabled) {
+if (!(Get-IsAdministrator)) {
+    if (Get-IsUacEnabled) {
         # We are not running "as Administrator" - so relaunch as administrator
         # Create a new process object that starts PowerShell
         $newProcess = new-object System.Diagnostics.ProcessStartInfo "PowerShell";
@@ -149,10 +150,10 @@ If (!(Get-IsAdministrator)) {
         [System.Diagnostics.Process]::Start($newProcess);
 
         # Exit from the current, unelevated, process
-        Exit
+        exit
     }
-    Else {
-        Throw "You must be administrator to run this script"
+    else {
+        throw "You must be administrator to run this script"
     }
 }
 
@@ -166,15 +167,15 @@ Write-Verbose "master: $master"
 Write-Verbose "minion: $minion"
 Write-Verbose "repourl: $repourl"
 
-If ($runservice.ToLower() -eq "true") {
+if ($runservice.ToLower() -eq "true") {
     Write-Verbose "Windows service will be set to run"
     [bool]$runservice = $True
 }
-ElseIf ($runservice.ToLower() -eq "false") {
+elseif ($runservice.ToLower() -eq "false") {
     Write-Verbose "Windows service will be stopped and set to manual"
     [bool]$runservice = $False
 }
-Else {
+else {
     # Param passed in wasn't clear so defaulting to true.
     Write-Verbose "Windows service defaulting to run automatically"
     [bool]$runservice = $True
@@ -186,22 +187,28 @@ Else {
 
 $ConfiguredAnything = $False
 
+$RootDir = "C:\salt"
 $SaltRegKey = "HKLM:\SOFTWARE\Salt Project\Salt"
-$RootDir = If ((Get-ItemProperty $SaltRegKey).root_dir -ne $null) {
-    (Get-ItemProperty $SaltRegKey).root_dir
-} Else {
-    "C:\salt"
+if (Test-Path -Path $SaltRegKey) {
+    if ($null -ne (Get-ItemProperty $SaltRegKey).root_dir) {
+        $RootDir = (Get-ItemProperty $SaltRegKey).root_dir
+    }
 }
+
 $ConfDir = "$RootDir\conf"
 $PkiDir = "$ConfDir\pki\minion"
+Write-Verbose "ConfDir: $ConfDir"
 
 # Create C:\tmp\
 New-Item C:\tmp\ -ItemType directory -Force | Out-Null
 
-# Copy Vagrant Files to their proper location. Vagrant files will be placed
-# in C:\tmp
+#===============================================================================
+# Copy Vagrant Files to their proper location.
+#===============================================================================
+
+# Vagrant files will be placed in C:\tmp
 # Check if minion keys have been uploaded, copy to correct location
-If (Test-Path C:\tmp\minion.pem) {
+if (Test-Path C:\tmp\minion.pem) {
     New-Item $PkiDir -ItemType Directory -Force | Out-Null
     Copy-Item -Path C:\tmp\minion.pem -Destination $PkiDir -Force | Out-Null
     Copy-Item -Path C:\tmp\minion.pub -Destination $PkiDir -Force | Out-Null
@@ -211,20 +218,20 @@ If (Test-Path C:\tmp\minion.pem) {
 # Check if minion config has been uploaded
 # This should be done before the installer is run so that it can be updated with
 # id: and master: settings when the installer runs
-If (Test-Path C:\tmp\minion) {
+if (Test-Path C:\tmp\minion) {
     New-Item $ConfDir -ItemType Directory -Force | Out-Null
     Copy-Item -Path C:\tmp\minion -Destination $ConfDir -Force | Out-Null
     $ConfiguredAnything = $True
 }
 
 # Check if grains config has been uploaded
-If (Test-Path C:\tmp\grains) {
+if (Test-Path C:\tmp\grains) {
     New-Item $ConfDir -ItemType Directory -Force | Out-Null
     Copy-Item -Path C:\tmp\grains -Destination $ConfDir -Force | Out-Null
     $ConfiguredAnything = $True
 }
 
-If ($ConfigureOnly -and !$ConfiguredAnything) {
+if ($ConfigureOnly -and !$ConfiguredAnything) {
     Write-Output "No configuration or keys were copied over. No configuration was done!"
     exit 0
 }
@@ -232,31 +239,30 @@ If ($ConfigureOnly -and !$ConfiguredAnything) {
 #===============================================================================
 # Detect architecture
 #===============================================================================
-If ([IntPtr]::Size -eq 4) {
+if ([IntPtr]::Size -eq 4) {
     $arch = "x86"
-}
-Else {
+} else {
     $arch = "AMD64"
 }
 
 #===============================================================================
 # Use version "Latest" if no version is passed
 #===============================================================================
-If ((!$version) -or ($version.ToLower() -eq 'latest')){
-    $versionSection = "Latest-Py$pythonVersion"
+if ((!$version) -or ($version.ToLower() -eq 'latest')){
+    $versionSection = "Latest-Py$PythonVersion"
 } else {
     $versionSection = $version
     $year = $version.Substring(0, 4)
-    If ([int]$year -ge 2017) {
-        If ($pythonVersion -eq "3") {
+    if ([int]$year -ge 2017) {
+        if ($PythonVersion -eq "3") {
             $versionSection = "$version-Py3"
-        } Else {
+        } else {
             $versionSection = "$version-Py2"
         }
     }
 }
 
-If (!$ConfigureOnly) {
+if (!$ConfigureOnly) {
     #===============================================================================
     # Download minion setup file
     #===============================================================================
@@ -275,9 +281,9 @@ If (!$ConfigureOnly) {
     # - master: salt
     # - Start the service
     $parameters = ""
-    If($minion -ne "not-specified") {$parameters = "/minion-name=$minion"}
-    If($master -ne "not-specified") {$parameters = "$parameters /master=$master"}
-    If($runservice -eq $false) {$parameters = "$parameters /start-service=0"}
+    if($minion -ne "not-specified") {$parameters = "/minion-name=$minion"}
+    if($master -ne "not-specified") {$parameters = "$parameters /master=$master"}
+    if($runservice -eq $false) {$parameters = "$parameters /start-service=0"}
 
     #===============================================================================
     # Install minion silently
@@ -291,12 +297,12 @@ If (!$ConfigureOnly) {
     #===============================================================================
     # Wait for salt-minion service to be registered before trying to start it
     $service = Get-Service salt-minion -ErrorAction SilentlyContinue
-    While (!$service) {
+    while (!$service) {
       Start-Sleep -s 2
       $service = Get-Service salt-minion -ErrorAction SilentlyContinue
     }
 
-    If($runservice) {
+    if($runservice) {
         # Start service
         Write-Output "Starting the Salt minion service"
         Start-Service -Name "salt-minion" -ErrorAction SilentlyContinue
@@ -304,7 +310,7 @@ If (!$ConfigureOnly) {
         # Check if service is started, otherwise retry starting the
         # service 4 times.
         $try = 0
-        While (($service.Status -ne "Running") -and ($try -ne 4)) {
+        while (($service.Status -ne "Running") -and ($try -ne 4)) {
             Start-Service -Name "salt-minion" -ErrorAction SilentlyContinue
             $service = Get-Service salt-minion -ErrorAction SilentlyContinue
             Start-Sleep -s 2
@@ -313,12 +319,12 @@ If (!$ConfigureOnly) {
 
         # If the salt-minion service is still not running, something probably
         # went wrong and user intervention is required - report failure.
-        If ($service.Status -eq "Stopped") {
+        if ($service.Status -eq "Stopped") {
             Write-Output -NoNewline "Failed to start salt minion"
             exit 1
         }
     }
-    Else {
+    else {
         Write-Output -NoNewline "Stopping salt minion and setting it to 'Manual'"
         Set-Service "salt-minion" -StartupType "Manual"
         Stop-Service "salt-minion"
@@ -328,9 +334,9 @@ If (!$ConfigureOnly) {
 #===============================================================================
 # Script Complete
 #===============================================================================
-If ($ConfigureOnly) {
+if ($ConfigureOnly) {
     Write-Output "Salt minion successfully configured"
 }
-Else {
+else {
     Write-Output "Salt minion successfully installed"
 }
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 8b160d774..b0d6d686a 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2022.03.15"
+__ScriptVersion="2022.05.19"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"
@@ -572,7 +572,7 @@ fi
 echoinfo "Running version: ${__ScriptVersion}"
 echoinfo "Executed by: ${CALLER}"
 echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'"
-#echowarn "Running the unstable version of ${__ScriptName}"
+echowarn "Running the unstable version of ${__ScriptName}"
 
 # Define installation type
 if [ "$#" -gt 0 ];then
@@ -1466,6 +1466,9 @@ __ubuntu_codename_translation() {
         "21")
             DISTRO_CODENAME="hirsute"
             ;;
+        "22")
+            DISTRO_CODENAME="jammy"
+            ;;
         *)
             DISTRO_CODENAME="trusty"
             ;;
@@ -1492,6 +1495,7 @@ __debian_derivatives_translation() {
     devuan_1_debian_base="8.0"
     devuan_2_debian_base="9.0"
     kali_1_debian_base="7.0"
+    kali_2021_debian_base="10.0"
     linuxmint_1_debian_base="8.0"
     raspbian_8_debian_base="8.0"
     raspbian_9_debian_base="9.0"
@@ -2925,7 +2929,8 @@ __enable_universe_repository() {
 __install_saltstack_ubuntu_repository() {
     # Workaround for latest non-LTS Ubuntu
     if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
-        [ "$DISTRO_MAJOR_VERSION" -eq 21 ]; then
+        # remove 22 version when salt packages for 22.04 are available
+        [ "$DISTRO_MAJOR_VERSION" -eq 21 ] ||  [ "$DISTRO_MAJOR_VERSION" -eq 22 ]; then
         echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
         UBUNTU_VERSION=20.04
         UBUNTU_CODENAME="focal"
@@ -3039,7 +3044,7 @@ install_ubuntu_stable_deps() {
 
     if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then
         if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then
-            if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ]; then
+            if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ] || [ "$DISTRO_MAJOR_VERSION" -ge 22 ]; then
                 __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1
             else
                 __apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&
@@ -3120,6 +3125,9 @@ install_ubuntu_git_deps() {
         fi
     else
         __PACKAGES="python${PY_PKG_VER}-dev python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
+        if [ "$DISTRO_MAJOR_VERSION" -ge 22 ]; then
+            __PACKAGES="${__PACKAGES} g++"
+        fi
         # shellcheck disable=SC2086
         __apt_get_install_noinput ${__PACKAGES} || return 1
     fi
@@ -3768,6 +3776,13 @@ install_debian_git_post() {
     done
 }
 
+install_debian_2021_post() {
+    # Kali 2021 (debian derivative) disables all network services by default
+    # Using archlinux post function to enable salt systemd services
+    install_arch_linux_post || return 1
+    return 0
+}
+
 install_debian_restart_daemons() {
     [ "$_START_DAEMONS" -eq $BS_FALSE ] && return 0
 
@@ -3983,6 +3998,9 @@ install_fedora_git_deps() {
             done
     else
         __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
+        if [ "${DISTRO_VERSION}" -ge 35 ]; then
+            __PACKAGES="${__PACKAGES} gcc-c++"
+        fi
         # shellcheck disable=SC2086
         __dnf_install_noinput ${__PACKAGES} || return 1
     fi
@@ -4028,6 +4046,11 @@ install_fedora_git_post() {
 
         __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
 
+        # Salt executables are located under `/usr/local/bin/` on Fedora 36+
+        if [ "${DISTRO_VERSION}" -ge 36 ]; then
+          sed -i -e 's:/usr/bin/:/usr/local/bin/:g' /lib/systemd/system/salt-*.service
+        fi
+
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
 
@@ -6140,7 +6163,7 @@ install_openbsd_git_deps() {
     __git_clone_and_checkout || return 1
 
     if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then
-        pkg_add -I -v py-pip py-setuptools
+        pkg_add -I -v py3-pip py3-setuptools
     fi
 
     #
diff --git a/kitchen.macos.yml b/kitchen.macos.yml
new file mode 100644
index 000000000..1d89edbc9
--- /dev/null
+++ b/kitchen.macos.yml
@@ -0,0 +1,36 @@
+---
+driver:
+  name: exec
+
+provisioner:
+  sudo: true
+  salt_bootstrap_options: -MP stable %s
+  salt_call_command: /opt/salt/bin/salt-call
+  init_environment: |
+    echo 'auto_accept: true' > /tmp/auto-accept-keys.conf
+    sudo mkdir -p /etc/salt/master.d
+    sudo mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf
+    brew install coreutils
+    sh -c 't=$(gshuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
+
+platforms:
+  - name: macos-12
+  - name: macos-11
+  - name: macos-1015
+
+suites:
+  - name: py3-stable-3002
+    provisioner:
+      salt_version: 3002.8
+  - name: py3-stable-3003
+    provisioner:
+      salt_version: 3003.4
+  - name: py3-stable-3004
+    provisioner:
+      salt_version: 3004.1
+  - name: latest
+    provisioner:
+      salt_version: latest
+
+verifier:
+  command: pytest --cache-clear -v -s -ra --log-cli-level=debug -k "not test_ping" tests/integration/
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 0d855e75b..1674a225b 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -9,8 +9,8 @@ driver:
   gui: false
   ssh:
     shell: /bin/sh
-  <% unless ENV['CI'] %>
   linked_clone: true
+  <% unless ENV['CI'] %>
   synced_folders:
     - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
       - '/vagrant'
diff --git a/kitchen.windows.yml b/kitchen.windows.yml
index b858f6061..0c5b882f5 100644
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@@ -19,13 +19,13 @@ platforms:
 suites:
   - name: py3-stable-3002
     provisioner:
-      salt_version: 3002
+      salt_version: 3002.8-1
   - name: py3-stable-3003
     provisioner:
-      salt_version: 3003
+      salt_version: 3003.4-1
   - name: py3-stable-3004
     provisioner:
-      salt_version: 3004
+      salt_version: 3004.1-1
   - name: latest
     provisioner:
       salt_version: latest
diff --git a/kitchen.yml b/kitchen.yml
index bc27d4122..1196a7e2f 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -65,6 +65,9 @@ platforms:
   - name: fedora-35
     driver:
       provision_command: *fedora_provision_command
+  - name: fedora-36
+    driver:
+      provision_command: *fedora_provision_command
   - name: gentoo
     driver:
       image: gentoo/stage3:latest
@@ -97,6 +100,11 @@ platforms:
   - name: oraclelinux-8
   - name: oraclelinux-7
   - name: rockylinux-8
+  - name: ubuntu-22.04
+    driver:
+      run_command: /lib/systemd/systemd
+      provision_command:
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: ubuntu-21.10
     driver:
       run_command: /lib/systemd/systemd
@@ -106,9 +114,6 @@ platforms:
   - name: ubuntu-18.04
     driver:
       run_command: /lib/systemd/systemd
-  - name: ubuntu-16.04
-    driver_config:
-      run_command: /lib/systemd/systemd
 
 suites:
   - name: py3-git-3002
diff --git a/tests/conftest.py b/tests/conftest.py
index 2f60c28db..6c47deb1d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -9,6 +9,11 @@
 
 @pytest.fixture(scope="session")
 def host():
+    if os.environ.get("RUNNER_OS", "") == "macOS":
+        # Adjust the `PATH` so that the `salt-call` executable can be found
+        os.environ["PATH"] = "/opt/salt/bin{}{}".format(os.pathsep, os.environ["PATH"])
+        return testinfra.get_host("local://", sudo=True)
+
     if os.environ.get("KITCHEN_USERNAME") == "vagrant" or "windows" in os.environ.get(
         "KITCHEN_INSTANCE"
     ):
diff --git a/tests/requirements.txt b/tests/requirements.txt
index cabcdeecb..c76dfdd4c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,4 @@
-testinfra
+pytest-testinfra
 paramiko
 pywinrm; sys.platform == 'win32'
 six>=1.10.0

From bc2d8f2b207e6bc5481c48134680c4035a6bb5cc Mon Sep 17 00:00:00 2001
From: krionbsd <krionbsd@users.noreply.github.com>
Date: Thu, 19 May 2022 13:25:52 +0000
Subject: [PATCH 106/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 0c700dbfa..98194c8e4 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-16a710e377c83fce3a256427a7813a9ff742bce842c45b16a1aa71f2f9f631fb
+cf6ed1efa3464b53ff98673de9d99422dce123956177e28eb748dbb2d08f9ad0
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 6a3aac4c0..453e27e4a 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-8f65952c3435f441e7f793941d5162d3ec2033a9ef82722ff1da67a2ef860a2f
+e92e1df6930285cf23eda188bee3cfa3dd6c577b4fb7aa91b29213ad820199b1

From 2a1ba7fb098f63af26f8a93e79f6e08d41e397e6 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 12 Aug 2022 13:46:48 +0100
Subject: [PATCH 107/135] Remove old workflows that did not get removed by the
 merge from develop

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 .github/workflows/kitchen.macos.yml    |  132 -
 .github/workflows/kitchen.vagrant.yml  |   73 -
 .github/workflows/kitchen.windows.yml  |  149 -
 .github/workflows/main-branch-only.yml |  195 --
 .github/workflows/main.yml             | 4371 ------------------------
 5 files changed, 4920 deletions(-)
 delete mode 100644 .github/workflows/kitchen.macos.yml
 delete mode 100644 .github/workflows/kitchen.vagrant.yml
 delete mode 100644 .github/workflows/kitchen.windows.yml
 delete mode 100644 .github/workflows/main-branch-only.yml
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/kitchen.macos.yml b/.github/workflows/kitchen.macos.yml
deleted file mode 100644
index 6ec70d66e..000000000
--- a/.github/workflows/kitchen.macos.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-# yamllint disable rule:line-length
----
-name: 'Kitchen (MacOS)'
-'on': ['push', 'pull_request']
-
-env:
-  KITCHEN_LOCAL_YAML: 'kitchen.macos.yml'
-
-jobs:
-  generate-actions-workflow:
-    name: 'Generate The Actions Workflow'
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: 'actions/checkout@v1'
-      - name: 'Set up Python 3.7'
-        uses: 'actions/setup-python@v1'
-        with:
-          python-version: 3.7
-      - name: 'Install Pre-Commit'
-        run: |
-          pip install -U pip
-          pip install pre-commit
-          pre-commit install
-      - name: 'Generate Workflow Actions'
-        run: |
-          pre-commit run -av generate-actions-workflow
-  lint:
-    name: 'Lint'
-    runs-on: 'ubuntu-latest'
-    needs: 'generate-actions-workflow'
-    container: 'koalaman/shellcheck-alpine:v0.6.0'
-    steps:
-      - uses: 'actions/checkout@v1'
-      - name: 'ShellCheck'
-        run: |
-          shellcheck -s sh -f tty bootstrap-salt.sh
-  test-12:
-    runs-on: 'macos-12'
-    timeout-minutes: 20
-    needs: 'lint'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - latest-macos-12
-          - py3-stable-3004-macos-12
-          - py3-stable-3003-macos-12
-          - py3-stable-3002-macos-12
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Install Python Dependencies'
-        run: |
-          pip3 install -U pip
-          pip3 install -r tests/requirements.txt
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen test ${{ matrix.instance }}'
-  test-11:
-    runs-on: 'macos-11'
-    timeout-minutes: 20
-    needs: 'lint'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - latest-macos-11
-          - py3-stable-3004-macos-11
-          - py3-stable-3003-macos-11
-          - py3-stable-3002-macos-11
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Install Python Dependencies'
-        run: |
-          pip3 install -U pip
-          pip3 install -r tests/requirements.txt
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen test ${{ matrix.instance }}'
-  test-1015:
-    runs-on: 'macos-10.15'
-    timeout-minutes: 20
-    needs: 'lint'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - latest-macos-1015
-          - py3-stable-3004-macos-1015
-          - py3-stable-3003-macos-1015
-          - py3-stable-3002-macos-1015
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Install Python Dependencies'
-        run: |
-          pip3 install -U pip
-          pip3 install -r tests/requirements.txt
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen test ${{ matrix.instance }}'
diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
deleted file mode 100644
index 7ce5471fb..000000000
--- a/.github/workflows/kitchen.vagrant.yml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-name: 'Kitchen Vagrant (FreeBSD & OpenBSD)'
-'on': ['push', 'pull_request']
-
-env:
-  KITCHEN_LOCAL_YAML: 'kitchen.vagrant.yml'
-
-jobs:
-  generate-actions-workflow:
-    name: 'Generate The Actions Workflow'
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: 'actions/checkout@v1'
-      - name: 'Set up Python 3.7'
-        uses: 'actions/setup-python@v1'
-        with:
-          python-version: 3.7
-      - name: 'Install Pre-Commit'
-        run: |
-          pip install -U pip
-          pip install pre-commit
-          pre-commit install
-      - name: 'Generate Workflow Actions'
-        run: |
-          pre-commit run -av generate-actions-workflow
-  lint:
-    name: 'Lint'
-    runs-on: 'ubuntu-latest'
-    needs: 'generate-actions-workflow'
-    container: 'koalaman/shellcheck-alpine:v0.6.0'
-    steps:
-      - uses: 'actions/checkout@v1'
-      - name: 'ShellCheck'
-        run: |
-          shellcheck -s sh -f tty bootstrap-salt.sh
-  test:
-    runs-on: 'macos-10.15'
-    timeout-minutes: 20
-    needs: 'lint'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - py3-git-master-freebsd-130
-          - py3-git-master-freebsd-123
-          # - py3-git-master-openbsd-6
-          - latest-freebsd-130
-          - latest-freebsd-123
-          - latest-openbsd-6
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Set up Python 3.7'
-        uses: 'actions/setup-python@v1'
-        with:
-          python-version: '3.7'
-      - name: 'Install Python Dependencies'
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen test ${{ matrix.instance }}'
diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
deleted file mode 100644
index c3e6ff896..000000000
--- a/.github/workflows/kitchen.windows.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-# yamllint disable rule:line-length
----
-name: 'Kitchen (Windows)'
-'on': ['push', 'pull_request']
-
-env:
-  machine_user: kitchen
-  machine_pass: Password1
-  machine_port: 5985
-  KITCHEN_LOCAL_YAML: 'kitchen.windows.yml'
-
-jobs:
-  generate-actions-workflow:
-    name: 'Generate The Actions Workflow'
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: 'actions/checkout@v1'
-      - name: 'Set up Python 3.7'
-        uses: 'actions/setup-python@v1'
-        with:
-          python-version: 3.7
-      - name: 'Install Pre-Commit'
-        run: |
-          pip install -U pip
-          pip install pre-commit
-          pre-commit install
-      - name: 'Generate Workflow Actions'
-        run: |
-          pre-commit run -av generate-actions-workflow
-  lint:
-    name: 'Lint'
-    runs-on: 'ubuntu-latest'
-    needs: 'generate-actions-workflow'
-    container: 'koalaman/shellcheck-alpine:v0.6.0'
-    steps:
-      - uses: 'actions/checkout@v1'
-      - name: 'ShellCheck'
-        run: |
-          shellcheck -s sh -f tty bootstrap-salt.sh
-  test-2022:
-    runs-on: 'windows-2022'
-    timeout-minutes: 20
-    needs: 'lint'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - py3-stable-3002-windows-2022
-          - py3-stable-3003-windows-2022
-          - py3-stable-3004-windows-2022
-          - latest-windows-2022
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Install Chef'
-        uses: 'actionshub/chef-install@1.1.0'
-        with:
-          project: 'chef'
-          version: '16.10.8'
-      - name: 'Add Chef bindir to PATH'
-        uses: 'myci-actions/export-env-var-powershell@1'
-        with:
-          name: 'PATH'
-          value: "C:\\opscode\\chef\\bin;\
-                  C:\\opscode\\chef\\embedded\\bin;$env:PATH"
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Set up test user'
-        run: |
-          $password = ConvertTo-SecureString $env:machine_pass -AsPlainText -Force
-          New-LocalUser $env:machine_user -Password $password
-          Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user
-      - name: 'Set up WinRM'
-        run: |
-          Set-WSManQuickConfig -Force
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Set up Python 3.7'
-        uses: 'actions/setup-python@v1'
-        with:
-          python-version: '3.7'
-      - name: 'Install Python Dependencies'
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen test ${{ matrix.instance }}'
-  test-2019:
-    runs-on: 'windows-2019'
-    timeout-minutes: 20
-    needs: 'lint'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - py3-stable-3002-windows-2019
-          - py3-stable-3003-windows-2019
-          - py3-stable-3004-windows-2019
-          - latest-windows-2019
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Install Chef'
-        uses: 'actionshub/chef-install@1.1.0'
-        with:
-          project: 'chef'
-          version: '16.10.8'
-      - name: 'Add Chef bindir to PATH'
-        uses: 'myci-actions/export-env-var-powershell@1'
-        with:
-          name: 'PATH'
-          value: "C:\\opscode\\chef\\bin;\
-                  C:\\opscode\\chef\\embedded\\bin;$env:PATH"
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Set up test user'
-        run: |
-          $password = ConvertTo-SecureString $env:machine_pass -AsPlainText -Force
-          New-LocalUser $env:machine_user -Password $password
-          Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user
-      - name: 'Set up WinRM'
-        run: |
-          Set-WSManQuickConfig -Force
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Set up Python 3.7'
-        uses: 'actions/setup-python@v1'
-        with:
-          python-version: '3.7'
-      - name: 'Install Python Dependencies'
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen test ${{ matrix.instance }}'
diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
deleted file mode 100644
index 6e13b051b..000000000
--- a/.github/workflows/main-branch-only.yml
+++ /dev/null
@@ -1,195 +0,0 @@
-# DO NOT EDIT THIS FILE DIRECTLY!
-#
-# This file was generated by .github/workflows/templates/generate.py
-#
-# yamllint disable rule:line-length rule:empty-lines
----
-
-name: Branch Testing
-
-'on': [push]
-
-jobs:
-
-  py3-git-master-gentoo:
-    name: Gentoo Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-gentoo || bundle exec kitchen create py3-git-master-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-gentoo
-
-
-  latest-gentoo:
-    name: Gentoo Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-gentoo || bundle exec kitchen create latest-gentoo
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-gentoo
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-gentoo
-
-
-  py3-git-master-gentoo-systemd:
-    name: Gentoo (systemd) Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-gentoo-systemd || bundle exec kitchen create py3-git-master-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-gentoo-systemd
-
-
-  latest-gentoo-systemd:
-    name: Gentoo (systemd) Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-gentoo-systemd || bundle exec kitchen create latest-gentoo-systemd
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-gentoo-systemd
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-gentoo-systemd
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 0deede808..000000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,4371 +0,0 @@
-# DO NOT EDIT THIS FILE DIRECTLY!
-#
-# This file was generated by .github/workflows/templates/generate.py
-#
-# yamllint disable rule:line-length rule:empty-lines
----
-
-name: Testing
-
-'on': [push, pull_request]
-
-jobs:
-
-  generate-actions-workflow:
-    name: Generate The Actions Workflow
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Pre-Commit
-        run: |
-          pip install -U pip
-          pip install pre-commit
-          pre-commit install
-
-      - name: Generate Workflow Actions
-        run: |
-          pre-commit run -av generate-actions-workflow
-
-
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-
-    needs: generate-actions-workflow
-
-    container: koalaman/shellcheck-alpine:v0.6.0
-    steps:
-      - uses: actions/checkout@v1
-      - name: ShellCheck
-        run: |
-          shellcheck -s sh -f tty bootstrap-salt.sh
-
-
-  py3-stable-3003-almalinux-8:
-    name: AlmaLinux 8 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-almalinux-8 || bundle exec kitchen create py3-stable-3003-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-almalinux-8
-
-
-  py3-git-3003-almalinux-8:
-    name: AlmaLinux 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-almalinux-8 || bundle exec kitchen create py3-git-3003-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-almalinux-8
-
-
-  py3-stable-3004-almalinux-8:
-    name: AlmaLinux 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-almalinux-8 || bundle exec kitchen create py3-stable-3004-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-almalinux-8
-
-
-  py3-git-3004-almalinux-8:
-    name: AlmaLinux 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-almalinux-8 || bundle exec kitchen create py3-git-3004-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-almalinux-8
-
-
-  py3-git-master-almalinux-8:
-    name: AlmaLinux 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-almalinux-8 || bundle exec kitchen create py3-git-master-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-almalinux-8
-
-
-  latest-almalinux-8:
-    name: AlmaLinux 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-almalinux-8 || bundle exec kitchen create latest-almalinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-almalinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-almalinux-8
-
-
-  py3-stable-3002-amazon-2:
-    name: Amazon 2 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-amazon-2 || bundle exec kitchen create py3-stable-3002-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-amazon-2
-
-
-  py3-stable-3003-amazon-2:
-    name: Amazon 2 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-amazon-2 || bundle exec kitchen create py3-stable-3003-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-amazon-2
-
-
-  py3-stable-3004-amazon-2:
-    name: Amazon 2 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-amazon-2 || bundle exec kitchen create py3-stable-3004-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-amazon-2
-
-
-  py3-git-master-amazon-2:
-    name: Amazon 2 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-amazon-2 || bundle exec kitchen create py3-git-master-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-amazon-2
-
-
-  latest-amazon-2:
-    name: Amazon 2 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-amazon-2 || bundle exec kitchen create latest-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-amazon-2
-
-
-  py3-git-master-arch:
-    name: Arch Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-arch || bundle exec kitchen create py3-git-master-arch
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-arch
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-arch
-
-
-  latest-arch:
-    name: Arch Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-arch || bundle exec kitchen create latest-arch
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-arch
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-arch
-
-
-  py3-stable-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-centos-7
-
-
-  py3-git-3002-centos-7:
-    name: CentOS 7 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-centos-7
-
-
-  py3-stable-3003-centos-7:
-    name: CentOS 7 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-centos-7 || bundle exec kitchen create py3-stable-3003-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-7
-
-
-  py3-git-3003-centos-7:
-    name: CentOS 7 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-centos-7 || bundle exec kitchen create py3-git-3003-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-centos-7
-
-
-  py3-stable-3004-centos-7:
-    name: CentOS 7 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-centos-7 || bundle exec kitchen create py3-stable-3004-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-7
-
-
-  py3-git-3004-centos-7:
-    name: CentOS 7 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-centos-7 || bundle exec kitchen create py3-git-3004-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-centos-7
-
-
-  py3-git-master-centos-7:
-    name: CentOS 7 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-7 || bundle exec kitchen create py3-git-master-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-7
-
-
-  latest-centos-7:
-    name: CentOS 7 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-7 || bundle exec kitchen create latest-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-7
-
-
-  py3-stable-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-centos-stream8 || bundle exec kitchen create py3-stable-3003-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-centos-stream8
-
-
-  py3-git-3003-centos-stream8:
-    name: CentOS Stream 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-centos-stream8 || bundle exec kitchen create py3-git-3003-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-centos-stream8
-
-
-  py3-stable-3004-centos-stream8:
-    name: CentOS Stream 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-centos-stream8 || bundle exec kitchen create py3-stable-3004-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-centos-stream8
-
-
-  py3-git-3004-centos-stream8:
-    name: CentOS Stream 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-centos-stream8 || bundle exec kitchen create py3-git-3004-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-centos-stream8
-
-
-  py3-git-master-centos-stream8:
-    name: CentOS Stream 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-centos-stream8 || bundle exec kitchen create py3-git-master-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-centos-stream8
-
-
-  latest-centos-stream8:
-    name: CentOS Stream 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-centos-stream8 || bundle exec kitchen create latest-centos-stream8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-stream8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-stream8
-
-
-  py3-stable-3002-debian-10:
-    name: Debian 10 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-10
-
-
-  py3-stable-3003-debian-10:
-    name: Debian 10 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-10
-
-
-  py3-stable-3004-debian-10:
-    name: Debian 10 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-debian-10 || bundle exec kitchen create py3-stable-3004-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-10
-
-
-  py3-git-master-debian-10:
-    name: Debian 10 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-debian-10 || bundle exec kitchen create py3-git-master-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-debian-10
-
-
-  latest-debian-10:
-    name: Debian 10 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-10
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-10
-
-
-  py3-stable-3004-debian-11:
-    name: Debian 11 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-debian-11 || bundle exec kitchen create py3-stable-3004-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-11
-
-
-  py3-git-master-debian-11:
-    name: Debian 11 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-debian-11 || bundle exec kitchen create py3-git-master-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-debian-11
-
-
-  latest-debian-11:
-    name: Debian 11 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-debian-11 || bundle exec kitchen create latest-debian-11
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-11
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-11
-
-
-  py3-stable-3002-debian-9:
-    name: Debian 9 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-debian-9
-
-
-  py3-git-3002-debian-9:
-    name: Debian 9 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-debian-9
-
-
-  py3-stable-3003-debian-9:
-    name: Debian 9 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-debian-9
-
-
-  py3-git-3003-debian-9:
-    name: Debian 9 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-debian-9
-
-
-  py3-stable-3004-debian-9:
-    name: Debian 9 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-debian-9 || bundle exec kitchen create py3-stable-3004-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-debian-9
-
-
-  py3-git-3004-debian-9:
-    name: Debian 9 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-debian-9 || bundle exec kitchen create py3-git-3004-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-debian-9
-
-
-  py3-git-master-debian-9:
-    name: Debian 9 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-debian-9 || bundle exec kitchen create py3-git-master-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-debian-9
-
-
-  latest-debian-9:
-    name: Debian 9 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-debian-9 || bundle exec kitchen create latest-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-9
-
-
-  py3-git-master-fedora-34:
-    name: Fedora 34 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-34
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-34
-
-
-  latest-fedora-34:
-    name: Fedora 34 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-34
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-34
-
-
-  py3-git-master-fedora-35:
-    name: Fedora 35 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-fedora-35 || bundle exec kitchen create py3-git-master-fedora-35
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-35
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-35
-
-
-  latest-fedora-35:
-    name: Fedora 35 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-fedora-35 || bundle exec kitchen create latest-fedora-35
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-35
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-35
-
-
-  py3-git-master-fedora-36:
-    name: Fedora 36 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-fedora-36 || bundle exec kitchen create py3-git-master-fedora-36
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-36
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-36
-
-
-  latest-fedora-36:
-    name: Fedora 36 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-fedora-36 || bundle exec kitchen create latest-fedora-36
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-36
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-36
-
-
-  py3-git-master-opensuse-15:
-    name: Opensuse 15 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-opensuse-15 || bundle exec kitchen create py3-git-master-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-15
-
-
-  latest-opensuse-15:
-    name: Opensuse 15 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-opensuse-15 || bundle exec kitchen create latest-opensuse-15
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-opensuse-15
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-opensuse-15
-
-
-  py3-git-master-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-opensuse-tumbleweed || bundle exec kitchen create py3-git-master-opensuse-tumbleweed
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-opensuse-tumbleweed
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-opensuse-tumbleweed
-
-
-  latest-opensuse-tumbleweed:
-    name: Opensuse Tumbleweed Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-opensuse-tumbleweed || bundle exec kitchen create latest-opensuse-tumbleweed
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-opensuse-tumbleweed
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-opensuse-tumbleweed
-
-
-  py3-stable-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-7
-
-
-  py3-git-3002-oraclelinux-7:
-    name: Oracle Linux 7 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-7
-
-
-  py3-stable-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-7
-
-
-  py3-git-3003-oraclelinux-7:
-    name: Oracle Linux 7 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-7
-
-
-  py3-stable-3004-oraclelinux-7:
-    name: Oracle Linux 7 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-oraclelinux-7 || bundle exec kitchen create py3-stable-3004-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-oraclelinux-7
-
-
-  py3-git-3004-oraclelinux-7:
-    name: Oracle Linux 7 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-oraclelinux-7 || bundle exec kitchen create py3-git-3004-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-oraclelinux-7
-
-
-  py3-git-master-oraclelinux-7:
-    name: Oracle Linux 7 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-7 || bundle exec kitchen create py3-git-master-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-7
-
-
-  latest-oraclelinux-7:
-    name: Oracle Linux 7 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-oraclelinux-7 || bundle exec kitchen create latest-oraclelinux-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-oraclelinux-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-oraclelinux-7
-
-
-  py3-stable-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-oraclelinux-8
-
-
-  py3-git-3002-oraclelinux-8:
-    name: Oracle Linux 8 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-oraclelinux-8
-
-
-  py3-stable-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-oraclelinux-8
-
-
-  py3-git-3003-oraclelinux-8:
-    name: Oracle Linux 8 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-oraclelinux-8
-
-
-  py3-stable-3004-oraclelinux-8:
-    name: Oracle Linux 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-oraclelinux-8 || bundle exec kitchen create py3-stable-3004-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-oraclelinux-8
-
-
-  py3-git-3004-oraclelinux-8:
-    name: Oracle Linux 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-oraclelinux-8 || bundle exec kitchen create py3-git-3004-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-oraclelinux-8
-
-
-  py3-git-master-oraclelinux-8:
-    name: Oracle Linux 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-oraclelinux-8 || bundle exec kitchen create py3-git-master-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-oraclelinux-8
-
-
-  latest-oraclelinux-8:
-    name: Oracle Linux 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-oraclelinux-8 || bundle exec kitchen create latest-oraclelinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-oraclelinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-oraclelinux-8
-
-
-  py3-stable-3004-rockylinux-8:
-    name: Rocky Linux 8 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-rockylinux-8 || bundle exec kitchen create py3-stable-3004-rockylinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-rockylinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-rockylinux-8
-
-
-  py3-git-3004-rockylinux-8:
-    name: Rocky Linux 8 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-rockylinux-8 || bundle exec kitchen create py3-git-3004-rockylinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-rockylinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-rockylinux-8
-
-
-  py3-git-master-rockylinux-8:
-    name: Rocky Linux 8 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-rockylinux-8 || bundle exec kitchen create py3-git-master-rockylinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-rockylinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-rockylinux-8
-
-
-  latest-rockylinux-8:
-    name: Rocky Linux 8 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-rockylinux-8 || bundle exec kitchen create latest-rockylinux-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-rockylinux-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-rockylinux-8
-
-
-  py3-stable-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-1804
-
-
-  py3-git-3002-ubuntu-1804:
-    name: Ubuntu 18.04 v3002 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-ubuntu-1804
-
-
-  py3-stable-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-1804
-
-
-  py3-git-3003-ubuntu-1804:
-    name: Ubuntu 18.04 v3003 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3003-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3003-ubuntu-1804
-
-
-  py3-stable-3004-ubuntu-1804:
-    name: Ubuntu 18.04 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-1804 || bundle exec kitchen create py3-stable-3004-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-1804
-
-
-  py3-git-3004-ubuntu-1804:
-    name: Ubuntu 18.04 v3004 Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-3004-ubuntu-1804 || bundle exec kitchen create py3-git-3004-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3004-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3004-ubuntu-1804
-
-
-  py3-git-master-ubuntu-1804:
-    name: Ubuntu 18.04 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-ubuntu-1804 || bundle exec kitchen create py3-git-master-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-1804
-
-
-  latest-ubuntu-1804:
-    name: Ubuntu 18.04 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-ubuntu-1804 || bundle exec kitchen create latest-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-ubuntu-1804
-
-
-  py3-stable-3002-ubuntu-2004:
-    name: Ubuntu 20.04 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-ubuntu-2004
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-2004
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-2004
-
-
-  py3-stable-3003-ubuntu-2004:
-    name: Ubuntu 20.04 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-ubuntu-2004
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-2004
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-2004
-
-
-  py3-stable-3004-ubuntu-2004:
-    name: Ubuntu 20.04 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-2004 || bundle exec kitchen create py3-stable-3004-ubuntu-2004
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-2004
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-2004
-
-
-  py3-git-master-ubuntu-2004:
-    name: Ubuntu 20.04 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-ubuntu-2004 || bundle exec kitchen create py3-git-master-ubuntu-2004
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-2004
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-2004
-
-
-  latest-ubuntu-2004:
-    name: Ubuntu 20.04 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-ubuntu-2004 || bundle exec kitchen create latest-ubuntu-2004
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-ubuntu-2004
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-ubuntu-2004
-
-
-  py3-stable-3002-ubuntu-2110:
-    name: Ubuntu 21.10 v3002 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3002-ubuntu-2110
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3002-ubuntu-2110
-
-
-  py3-stable-3003-ubuntu-2110:
-    name: Ubuntu 21.10 v3003 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3003-ubuntu-2110 || bundle exec kitchen create py3-stable-3003-ubuntu-2110
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3003-ubuntu-2110
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3003-ubuntu-2110
-
-
-  py3-stable-3004-ubuntu-2110:
-    name: Ubuntu 21.10 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-2110 || bundle exec kitchen create py3-stable-3004-ubuntu-2110
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-2110
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-2110
-
-
-  py3-git-master-ubuntu-2110:
-    name: Ubuntu 21.10 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-ubuntu-2110 || bundle exec kitchen create py3-git-master-ubuntu-2110
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-2110
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-2110
-
-
-  latest-ubuntu-2110:
-    name: Ubuntu 21.10 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-ubuntu-2110 || bundle exec kitchen create latest-ubuntu-2110
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-ubuntu-2110
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-ubuntu-2110
-
-
-  py3-stable-3004-ubuntu-2204:
-    name: Ubuntu 22.04 v3004 Py3 Stable
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-stable-3004-ubuntu-2204 || bundle exec kitchen create py3-stable-3004-ubuntu-2204
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3004-ubuntu-2204
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3004-ubuntu-2204
-
-
-  py3-git-master-ubuntu-2204:
-    name: Ubuntu 22.04 Master Py3 Git
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create py3-git-master-ubuntu-2204 || bundle exec kitchen create py3-git-master-ubuntu-2204
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-ubuntu-2204
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-ubuntu-2204
-
-
-  latest-ubuntu-2204:
-    name: Ubuntu 22.04 Latest packaged release
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.6.x
-
-      - name: Install Bundler
-        run: |
-          gem install bundler
-
-      - name: Setup Bundle
-        run: |
-          bundle install --with docker --without opennebula ec2 windows vagrant
-
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-
-      - name: Install Python Dependencies
-        run: |
-          pip install -U pip
-          pip install -r tests/requirements.txt
-
-      - name: Create Test Container
-        run: |
-          bundle exec kitchen create latest-ubuntu-2204 || bundle exec kitchen create latest-ubuntu-2204
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-ubuntu-2204
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-ubuntu-2204

From 5333af4c9efdf279c9bb7c0aa953badb72d813d7 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 12 Aug 2022 15:07:20 +0100
Subject: [PATCH 108/135] Remove conflicts

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 kitchen.macos.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/kitchen.macos.yml b/kitchen.macos.yml
index dea3c212a..845bace22 100644
--- a/kitchen.macos.yml
+++ b/kitchen.macos.yml
@@ -19,20 +19,10 @@ platforms:
   - name: macos-1015
 
 suites:
-<<<<<<< HEAD
-  - name: py3-stable-3002
-    provisioner:
-      salt_version: 3002.8
-  - name: py3-stable-3003
-    provisioner:
-      salt_version: 3003.4
-  - name: py3-stable-3004
-=======
   - name: stable-3003
     provisioner:
       salt_version: 3003.4
   - name: stable-3004
->>>>>>> origin/develop
     provisioner:
       salt_version: 3004.1
   - name: latest

From 5511dff5a1310675e431d494068de8541bd5bf8c Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 12 Aug 2022 17:40:29 +0100
Subject: [PATCH 109/135] Stable releases on stable branches

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 bootstrap-salt.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 7537a0976..6163dcce3 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -584,7 +584,6 @@ fi
 echoinfo "Running version: ${__ScriptVersion}"
 echoinfo "Executed by: ${CALLER}"
 echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'"
-echowarn "Running the unstable version of ${__ScriptName}"
 
 # Define installation type
 if [ "$#" -gt 0 ];then

From 10b9a9cb8dcbb7bae762865ae201a2f90e7fa079 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 12 Aug 2022 17:41:29 +0100
Subject: [PATCH 110/135] No locked Gemfile

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 Gemfile.lock | 124 ---------------------------------------------------
 1 file changed, 124 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 92cd27045..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,124 +0,0 @@
-GIT
-  remote: https://github.com/test-kitchen/kitchen-docker.git
-  revision: 8d2a6f04e77b76bc9f77e0bb8cc52542743b7b6a
-  specs:
-    kitchen-docker (2.11.0)
-      test-kitchen (>= 1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    bcrypt_pbkdf (1.1.0)
-    builder (3.2.4)
-    chef-utils (17.9.52)
-      concurrent-ruby
-    concurrent-ruby (1.1.9)
-    ed25519 (1.3.0)
-    erubi (1.10.0)
-    ffi (1.15.5)
-    gssapi (1.3.1)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashie (5.0.0)
-    httpclient (2.8.3)
-    kitchen-salt (0.7.2)
-      hashie (>= 3.5)
-      test-kitchen (>= 1.4)
-    kitchen-vagrant (1.11.0)
-      test-kitchen (>= 1.4, < 4)
-    license-acceptance (2.1.13)
-      pastel (~> 0.7)
-      tomlrb (>= 1.2, < 3.0)
-      tty-box (~> 0.6)
-      tty-prompt (~> 0.20)
-    little-plugger (1.1.4)
-    logging (2.3.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.14)
-    mixlib-install (3.12.16)
-      mixlib-shellout
-      mixlib-versioning
-      thor
-    mixlib-shellout (3.2.5)
-      chef-utils
-    mixlib-versioning (1.2.12)
-    multi_json (1.15.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
-    net-ssh-gateway (2.0.0)
-      net-ssh (>= 4.0.0)
-    nori (2.6.0)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
-    rubyntlm (0.6.3)
-    rubyzip (2.3.2)
-    strings (0.2.1)
-      strings-ansi (~> 0.2)
-      unicode-display_width (>= 1.5, < 3.0)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.2.0)
-    test-kitchen (3.2.2)
-      bcrypt_pbkdf (~> 1.0)
-      chef-utils (>= 16.4.35)
-      ed25519 (~> 1.2)
-      license-acceptance (>= 1.0.11, < 3.0)
-      mixlib-install (~> 3.6)
-      mixlib-shellout (>= 1.2, < 4.0)
-      net-scp (>= 1.1, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
-      net-ssh-gateway (>= 1.2, < 3.0)
-      thor (>= 0.19, < 2.0)
-      winrm (~> 2.0)
-      winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.1)
-    thor (1.2.1)
-    tomlrb (2.0.1)
-    tty-box (0.7.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
-      tty-cursor (~> 0.7)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.1)
-    unicode-display_width (2.1.0)
-    unicode_utils (1.4.0)
-    winrm (2.3.6)
-      builder (>= 2.1.2)
-      erubi (~> 1.8)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.3)
-      erubi (~> 1.8)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.3.5)
-      erubi (~> 1.8)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 2.0)
-      winrm (~> 2.0)
-    wisper (2.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  kitchen-docker!
-  kitchen-salt (>= 0.7.2)
-  kitchen-vagrant
-  test-kitchen (>= 3.2.2)
-
-BUNDLED WITH
-   2.1.2

From 635f4ced6d2fbd9aa4ca5d11ceffa0536f4a8032 Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of @s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 Aug 2022 22:08:21 +0000
Subject: [PATCH 111/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 453e27e4a..82bfb554f 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-e92e1df6930285cf23eda188bee3cfa3dd6c577b4fb7aa91b29213ad820199b1
+af922699c1a2bb3b89b6dac04397389999df1b3416b8d0b5c93766412f14c95c

From 99a13b2f3061e980d91ade8de57240d7d8925b5d Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of @s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:17:52 +0000
Subject: [PATCH 112/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 82bfb554f..076c5341d 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-af922699c1a2bb3b89b6dac04397389999df1b3416b8d0b5c93766412f14c95c
+d0686c2daeed18bb726e58eef75a69afe9ee56a1a23b2c32cd4e87d6005638e2

From 03f4f9dcf728d8678d08b4936ad2da9e579b5a0e Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of @garethgreenaway"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 17:47:33 +0000
Subject: [PATCH 113/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 98194c8e4..768d0b146 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-cf6ed1efa3464b53ff98673de9d99422dce123956177e28eb748dbb2d08f9ad0
+2bcc4b583d6617ff6563a74d6bb7640ff0502da8d97fce19173546c9f8e05fce
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 076c5341d..354f8c058 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-d0686c2daeed18bb726e58eef75a69afe9ee56a1a23b2c32cd4e87d6005638e2
+994bf7e8bd92fe6d70d291c7562aff299f5651046b4e76dfa506cee0d9bb0843

From de228419363a53b487205a0bee8281a1ca8f714f Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Fri, 21 Apr 2023 16:57:22 +0000
Subject: [PATCH 114/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 768d0b146..35d3147fe 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-2bcc4b583d6617ff6563a74d6bb7640ff0502da8d97fce19173546c9f8e05fce
+e070b2582c42f7a5dd29f193d13ccb9625cc5a158866ddac235d873801b74f9e
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 354f8c058..4809ccc40 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-994bf7e8bd92fe6d70d291c7562aff299f5651046b4e76dfa506cee0d9bb0843
+e364428aa7a25f8e2c5e18e36e222351724c6cf35a1d57158f3357cde1e0a0f0

From ba3f9328ac5ae4013427c5f55a1c899e07f9f2b0 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Wed, 26 Apr 2023 18:45:01 +0000
Subject: [PATCH 115/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 4809ccc40..176b822de 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-e364428aa7a25f8e2c5e18e36e222351724c6cf35a1d57158f3357cde1e0a0f0
+516fa9cc2e258cb8484ff360b9674b46918f657985c21ca9301e42a3dd263d60

From 3dcbea6a438cb5cd8a9b388c67aee3702c615110 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Wed, 28 Jun 2023 20:27:54 +0000
Subject: [PATCH 116/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 176b822de..f4e7df061 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-516fa9cc2e258cb8484ff360b9674b46918f657985c21ca9301e42a3dd263d60
+f45f5da8abee27ef385131f5cfa9382d3a15863d0a05688a0404d2f057b27776

From 3d95a10eff2ac55d80c748e1c1a279dd59fa37cd Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 25 Jul 2023 20:05:18 +0000
Subject: [PATCH 117/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index f4e7df061..556cb0af3 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-f45f5da8abee27ef385131f5cfa9382d3a15863d0a05688a0404d2f057b27776
+eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323

From 01bce219417ad9eb98f28565e73bb22a59112092 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 3 Aug 2023 16:31:23 +0000
Subject: [PATCH 118/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 35d3147fe..f2141fe25 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-e070b2582c42f7a5dd29f193d13ccb9625cc5a158866ddac235d873801b74f9e
+06f0751b4e9b68f467a94d8d5d1e3f04b6d29091ba26e15cc6ee4271de51aee5
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 556cb0af3..0bae29b87 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-eaaaadaed40fe2e791d59a9e48f24449428a35ca61782d9139f1272c05524323
+963e559bdb85adecfbbec2c3b81190392bc59b24992e4491e919cd748eeafcb8

From bc8cb646a1d1fd63e322250f07338fe88cccb11a Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 7 Nov 2023 18:36:22 +0000
Subject: [PATCH 119/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 0bae29b87..326761ce0 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-963e559bdb85adecfbbec2c3b81190392bc59b24992e4491e919cd748eeafcb8
+91f8a3bfb8b14476f7793c7f20cec7bfc638c10c073786f9a8904a858a929784

From 459b5e676d2243a4b1b449546647ef88c42cbd98 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 16 Nov 2023 19:52:17 +0000
Subject: [PATCH 120/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 326761ce0..3d9e25f68 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-91f8a3bfb8b14476f7793c7f20cec7bfc638c10c073786f9a8904a858a929784
+3757ed82161113fed4c711fd7332e922265eeeb54e6e4f657a08ea82d57cc3a2

From 772a618f4da5cd18d3e27d2954f5dcdb4cd71dd1 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 4 Jan 2024 22:33:05 +0000
Subject: [PATCH 121/135] Update sha256 checksums

---
 bootstrap-salt.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 3d9e25f68..ad75b37cd 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-3757ed82161113fed4c711fd7332e922265eeeb54e6e4f657a08ea82d57cc3a2
+cebcbc67895e238d1cf0024922a7fe5c772b9aaba346490c8fa6193bb0d993d4

From cbcbd3c28725f8d2b60e4d91dd754f69afd7238b Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Wed, 3 Apr 2024 15:16:49 +0000
Subject: [PATCH 122/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index f2141fe25..ba41f2ef1 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-06f0751b4e9b68f467a94d8d5d1e3f04b6d29091ba26e15cc6ee4271de51aee5
+ed23d890cd3b8316c84a74951de512000598a2f404c89a26b53ede8c1c5b8b68
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index ad75b37cd..7c2480cf5 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-cebcbc67895e238d1cf0024922a7fe5c772b9aaba346490c8fa6193bb0d993d4
+450ba5cde4af8d6cb5c56c66791f87b918bcda70ccdfb10abf3cc294143c8073

From 1f055fce161e615796c2bce770b605f1cfd293f3 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Fri, 12 Jul 2024 15:22:49 +0000
Subject: [PATCH 123/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index ba41f2ef1..c3c79e62f 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-ed23d890cd3b8316c84a74951de512000598a2f404c89a26b53ede8c1c5b8b68
+a6583a9183d52171c633041b8fe2ad634be79e5864ff4c2a7ae838cf779345e6
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 7c2480cf5..4b0cc8758 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-450ba5cde4af8d6cb5c56c66791f87b918bcda70ccdfb10abf3cc294143c8073
+526f4a5383db308081a120e26988679238ca6add4bf7a82120cbe71d57ab826e

From ec20b9a7dbd18f9c55103d63c43727d3ddbc50ab Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 16 Jul 2024 15:12:30 +0000
Subject: [PATCH 124/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index c3c79e62f..41f7bb6cb 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-a6583a9183d52171c633041b8fe2ad634be79e5864ff4c2a7ae838cf779345e6
+a1ee8ded8ad557d2c9cd405a6f264a2327767c1ffbb8eefa92490780d66da5f2
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 4b0cc8758..6e0ed28aa 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-526f4a5383db308081a120e26988679238ca6add4bf7a82120cbe71d57ab826e
+4f76d1549c71d696a605f97645d8633b6269c4d9ae54b1fbdfedca1dcf893e7a

From fa25b2e73436bd2298dde071ce30e4e21b9aff5d Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 18 Jul 2024 16:20:59 +0000
Subject: [PATCH 125/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 41f7bb6cb..64f002451 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-a1ee8ded8ad557d2c9cd405a6f264a2327767c1ffbb8eefa92490780d66da5f2
+f4f68a889633f0e84533946f555487fcb2a194635078a37e84bc3de4fe24db34
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 6e0ed28aa..71e5b7aef 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-4f76d1549c71d696a605f97645d8633b6269c4d9ae54b1fbdfedca1dcf893e7a
+92a74e7ff8a9032a7713c2b3955991d66aaca08a4eb9494ce3dd66b5044f6bc3

From 5e3c4e2f01398bd946e4b7b869d5507bfad87d3e Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 23 Jul 2024 21:46:06 +0000
Subject: [PATCH 126/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 64f002451..98b0c68a7 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-f4f68a889633f0e84533946f555487fcb2a194635078a37e84bc3de4fe24db34
+5425946c22b05c96f19fbdfc856479fc3c4331d47d1f4c856b0831fa97019400
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 71e5b7aef..a9c50d44b 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-92a74e7ff8a9032a7713c2b3955991d66aaca08a4eb9494ce3dd66b5044f6bc3
+7212b6b497b5c3d2bf15bfe5301625ec7bc1bf3e2949cd47d8e2073614935bf8

From 1c54e2f3d7c3087b829ee22b7a6411eaa9f024f2 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 24 Sep 2024 21:40:51 +0000
Subject: [PATCH 127/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 98b0c68a7..ad0bbb21a 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-5425946c22b05c96f19fbdfc856479fc3c4331d47d1f4c856b0831fa97019400
+dce1aae3a0a0cc8bcc3073a0a19c46816d073b67295722f417d88f39bfaf4d5e
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index a9c50d44b..bbc0a620f 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-7212b6b497b5c3d2bf15bfe5301625ec7bc1bf3e2949cd47d8e2073614935bf8
+88e4e4cad4b115a7b721dd9c21d5ee5df390b5b73b63de48f99399146f43f371

From 0624dcd0dd4559e412fa1583f1246b6fe1c87068 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 7 Nov 2024 21:41:52 +0000
Subject: [PATCH 128/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index ad0bbb21a..79b66e20e 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-dce1aae3a0a0cc8bcc3073a0a19c46816d073b67295722f417d88f39bfaf4d5e
+a88c402f944d3260c5bf3c42f1f2bd82dc6350d208b11f06820ebfb8993d0b15
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index bbc0a620f..2130f4ecc 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-88e4e4cad4b115a7b721dd9c21d5ee5df390b5b73b63de48f99399146f43f371
+70a9783649e129985563d1a86cf28b8984499643e62ae1dc47dc008bd204fcbb

From 70b197665099d3f082f97827e0c97e396798bde7 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 21 Nov 2024 22:10:22 +0000
Subject: [PATCH 129/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 79b66e20e..ee12ca6ec 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-a88c402f944d3260c5bf3c42f1f2bd82dc6350d208b11f06820ebfb8993d0b15
+5fa5c8bdfe1259c4b2da530604a0e3ea0458c011b5810a3e50b4298883a2d2d7
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 2130f4ecc..cc70ec89d 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-70a9783649e129985563d1a86cf28b8984499643e62ae1dc47dc008bd204fcbb
+ddf624c3a94d721da3f7629402a6c7ecc9dd96d13c1ead2a626314e97cee982a

From 6e86781af1fa6388d1250aeb9b43a5c17034fe8c Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 26 Nov 2024 16:40:54 +0000
Subject: [PATCH 130/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index ee12ca6ec..e2f4fbe67 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-5fa5c8bdfe1259c4b2da530604a0e3ea0458c011b5810a3e50b4298883a2d2d7
+a47a4bc63227abe1496ea34e0bb8979c93a3244abbafedaec2040cef3bd88f41
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index cc70ec89d..5795e7e34 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-ddf624c3a94d721da3f7629402a6c7ecc9dd96d13c1ead2a626314e97cee982a
+832c7a20b96e1df171d715323df9afff8a11aef42d15598c007f240bc89d723c

From f8cac033b9fb8ffa7c070fb16172323d82e2a3b4 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Wed, 27 Nov 2024 18:57:06 +0000
Subject: [PATCH 131/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index e2f4fbe67..826b7aa5a 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-a47a4bc63227abe1496ea34e0bb8979c93a3244abbafedaec2040cef3bd88f41
+f7998f1ff703bf3935670c02fe234507ee3e7af93a0880195e186f3b9d07a97f
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 5795e7e34..40bf2ed9a 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-832c7a20b96e1df171d715323df9afff8a11aef42d15598c007f240bc89d723c
+e972bd1ef01d09cd1d9294374ef974c9e3dd9a2aee37cf3859144585fd8bf1d0

From b08a1f31b899625d95310b4c2200ed9ecc55f9ca Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Fri, 29 Nov 2024 17:58:26 +0000
Subject: [PATCH 132/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 826b7aa5a..c2b32d5bf 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-f7998f1ff703bf3935670c02fe234507ee3e7af93a0880195e186f3b9d07a97f
+839c02a7a850c880ff7f01befe591328bc5a65f668209be7230e0297a4b46262
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 40bf2ed9a..a739021d3 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-e972bd1ef01d09cd1d9294374ef974c9e3dd9a2aee37cf3859144585fd8bf1d0
+0ac87384dee051aceded69704485a5de0e4a308551a462b10c262111b57acff0

From bf45a8469a72db5f950cda999e7b38c8fed498e5 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Mon, 9 Dec 2024 23:10:50 +0000
Subject: [PATCH 133/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index c2b32d5bf..2ba83066c 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-839c02a7a850c880ff7f01befe591328bc5a65f668209be7230e0297a4b46262
+a2d789351f1bd31075c2bf0c52b52ffb168713fc3aee9756ba5b52eb43085293
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index a739021d3..f04d28dc8 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-0ac87384dee051aceded69704485a5de0e4a308551a462b10c262111b57acff0
+44f9405a6d9622ad8fa7c93e83a52e01ca328f27e4e9dea4a52268c6a22dbe6d

From 12b7f81cd291876ac63ae5099b41979bbb5ea27f Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 12 Dec 2024 20:17:10 +0000
Subject: [PATCH 134/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index 2ba83066c..ad629358d 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-a2d789351f1bd31075c2bf0c52b52ffb168713fc3aee9756ba5b52eb43085293
+c905ea93aceb447240f6e8347828df63c6749022a85b9b8413c9a1549808410c
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index f04d28dc8..622dd535c 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-44f9405a6d9622ad8fa7c93e83a52e01ca328f27e4e9dea4a52268c6a22dbe6d
+7cc91adfa5a15ff57d203dc2b79608c773efc639d4e9bf03861198903e11becd

From ea5430d746616057abd5434412d7ecacc25410f0 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Mon, 24 Feb 2025 22:10:14 +0000
Subject: [PATCH 135/135] Update sha256 checksums

---
 bootstrap-salt.ps1.sha256 | 2 +-
 bootstrap-salt.sh.sha256  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1.sha256 b/bootstrap-salt.ps1.sha256
index ad629358d..86723d71b 100644
--- a/bootstrap-salt.ps1.sha256
+++ b/bootstrap-salt.ps1.sha256
@@ -1 +1 @@
-c905ea93aceb447240f6e8347828df63c6749022a85b9b8413c9a1549808410c
+68c3350791c717b9c6392eef11d4defcf4a0b4efb4d61ebaf9ca60bb51cdfd91
diff --git a/bootstrap-salt.sh.sha256 b/bootstrap-salt.sh.sha256
index 622dd535c..64bfac0c7 100644
--- a/bootstrap-salt.sh.sha256
+++ b/bootstrap-salt.sh.sha256
@@ -1 +1 @@
-7cc91adfa5a15ff57d203dc2b79608c773efc639d4e9bf03861198903e11becd
+a0e3a58fc6358a7c6f708ee4910229e72fbdab7161819514b0696146a2edb62d