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

---
 .github/workflows/main.yml              | 2300 +++++++++++++++++------
 .github/workflows/templates/generate.py |   40 +-
 .kitchen.yml                            |   80 +-
 3 files changed, 1746 insertions(+), 674 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a0fefb4..f3f7b37 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -458,6 +458,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3001-0-amazon-2
 
 
+  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-git-3002-amazon-2:
+    name: Amazon 2 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-amazon-2 || bundle exec kitchen create py3-git-3002-amazon-2
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-amazon-2
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-amazon-2
+
+
+  py3-stable-3002-0-amazon-2:
+    name: Amazon 2 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-amazon-2 || bundle exec kitchen create py3-stable-3002-0-amazon-2
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-amazon-2
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-amazon-2
+
+
   py3-git-master-amazon-2:
     name: Amazon 2 Master Py3 Git
     runs-on: ubuntu-latest
@@ -642,6 +780,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3001-arch
 
 
+  py3-git-3002-arch:
+    name: Arch 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-arch || bundle exec kitchen create py3-git-3002-arch
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-arch
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-arch
+
+
   py3-git-master-arch:
     name: Arch Master Py3 Git
     runs-on: ubuntu-latest
@@ -688,144 +872,6 @@ jobs:
           bundle exec kitchen destroy py3-git-master-arch
 
 
-  py2-stable-2019-2-centos-6:
-    name: CentOS 6 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-centos-6 || bundle exec kitchen create py2-stable-2019-2-centos-6
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-stable-2019-2-centos-6
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-stable-2019-2-centos-6
-
-
-  py2-git-2019-2-centos-6:
-    name: CentOS 6 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-centos-6 || bundle exec kitchen create py2-git-2019-2-centos-6
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-git-2019-2-centos-6
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-git-2019-2-centos-6
-
-
-  latest-centos-6:
-    name: CentOS 6 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-6 || bundle exec kitchen create latest-centos-6
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-centos-6
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-centos-6
-
-
   py2-stable-2019-2-centos-7:
     name: CentOS 7 v2019.2 Py2 Stable
     runs-on: ubuntu-latest
@@ -1240,6 +1286,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3001-0-centos-7
 
 
+  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-3002-0-centos-7:
+    name: CentOS 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-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-3002-0-centos-7
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-centos-7
+
+
   py3-git-master-centos-7:
     name: CentOS 7 Master Py3 Git
     runs-on: ubuntu-latest
@@ -1654,6 +1838,144 @@ jobs:
           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
@@ -2068,6 +2390,144 @@ jobs:
           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
@@ -2160,144 +2620,6 @@ jobs:
           bundle exec kitchen destroy latest-debian-10
 
 
-  py2-stable-2019-2-debian-8:
-    name: Debian 8 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-debian-8 || bundle exec kitchen create py2-stable-2019-2-debian-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-stable-2019-2-debian-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-stable-2019-2-debian-8
-
-
-  py2-git-2019-2-debian-8:
-    name: Debian 8 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-debian-8 || bundle exec kitchen create py2-git-2019-2-debian-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-git-2019-2-debian-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-git-2019-2-debian-8
-
-
-  latest-debian-8:
-    name: Debian 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-debian-8 || bundle exec kitchen create latest-debian-8
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-debian-8
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-debian-8
-
-
   py2-stable-2019-2-debian-9:
     name: Debian 9 v2019.2 Py2 Stable
     runs-on: ubuntu-latest
@@ -2712,6 +3034,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3001-0-debian-9
 
 
+  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-git-master-debian-9:
     name: Debian 9 Master Py3 Git
     runs-on: ubuntu-latest
@@ -2804,328 +3264,6 @@ jobs:
           bundle exec kitchen destroy latest-debian-9
 
 
-  py3-git-2019-2-fedora-30:
-    name: Fedora 30 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-fedora-30 || bundle exec kitchen create py3-git-2019-2-fedora-30
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-fedora-30
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-fedora-30
-
-
-  latest-fedora-30:
-    name: Fedora 30 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-30 || bundle exec kitchen create latest-fedora-30
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-30
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-30
-
-
-  py3-git-2019-2-fedora-31:
-    name: Fedora 31 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-fedora-31 || bundle exec kitchen create py3-git-2019-2-fedora-31
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-fedora-31
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-fedora-31
-
-
-  py3-git-3000-fedora-31:
-    name: Fedora 31 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-fedora-31 || bundle exec kitchen create py3-git-3000-fedora-31
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-fedora-31
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-fedora-31
-
-
-  py3-git-3001-fedora-31:
-    name: Fedora 31 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-fedora-31 || bundle exec kitchen create py3-git-3001-fedora-31
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-fedora-31
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-31
-
-
-  py3-git-master-fedora-31:
-    name: Fedora 31 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-31 || bundle exec kitchen create py3-git-master-fedora-31
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-31
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-31
-
-
-  latest-fedora-31:
-    name: Fedora 31 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-31 || bundle exec kitchen create latest-fedora-31
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-31
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-31
-
-
   py3-git-3001-fedora-32:
     name: Fedora 32 v3001 Py3 Git
     runs-on: ubuntu-latest
@@ -3172,6 +3310,52 @@ jobs:
           bundle exec kitchen destroy py3-git-3001-fedora-32
 
 
+  py3-git-3002-fedora-32:
+    name: Fedora 32 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-32 || bundle exec kitchen create py3-git-3002-fedora-32
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-fedora-32
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-fedora-32
+
+
   py3-git-master-fedora-32:
     name: Fedora 32 Master Py3 Git
     runs-on: ubuntu-latest
@@ -3264,6 +3448,190 @@ jobs:
           bundle exec kitchen destroy latest-fedora-32
 
 
+  py3-git-3001-fedora-33:
+    name: Fedora 33 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-fedora-33 || bundle exec kitchen create py3-git-3001-fedora-33
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-fedora-33
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-fedora-33
+
+
+  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-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-stable-2019-2-gentoo:
     name: Gentoo v2019.2 Py3 Stable
     runs-on: ubuntu-latest
@@ -3586,6 +3954,144 @@ jobs:
           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
@@ -4000,6 +4506,144 @@ jobs:
           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
@@ -4230,6 +4874,52 @@ jobs:
           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
@@ -4736,6 +5426,144 @@ jobs:
           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
@@ -5242,6 +6070,144 @@ jobs:
           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-git-master-ubuntu-1804:
     name: Ubuntu 18.04 Master Py3 Git
     runs-on: ubuntu-latest
@@ -5472,6 +6438,144 @@ jobs:
           bundle exec kitchen destroy py3-stable-3001-0-ubuntu-2004
 
 
+  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-git-3002-ubuntu-2004:
+    name: Ubuntu 20.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-2004 || bundle exec kitchen create py3-git-3002-ubuntu-2004
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-ubuntu-2004
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-ubuntu-2004
+
+
+  py3-stable-3002-0-ubuntu-2004:
+    name: Ubuntu 20.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-2004 || bundle exec kitchen create py3-stable-3002-0-ubuntu-2004
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-0-ubuntu-2004
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-0-ubuntu-2004
+
+
   py3-git-master-ubuntu-2004:
     name: Ubuntu 20.04 Master Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 422dbb3..695ff3b 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -9,15 +9,12 @@ LINUX_DISTROS = [
 #    '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 @@ OSX = WINDOWS = []
 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 @@ STABLE_DISTROS = [
 PY2_BLACKLIST = [
     'centos-8',
     'debian-10',
-    'fedora-30',
-    'fedora-31',
     'fedora-32',
+    'fedora-33',
     'gentoo',
     'gentoo-systemd',
     'opensuse-15',
@@ -60,15 +53,15 @@ PY2_BLACKLIST = [
 
 PY3_BLACKLIST = [
     'amazon-1',
-    'centos-6',
-    'debian-8',
 ]
 
 BLACKLIST_2019 = [
+    'fedora-33',
     'ubuntu-2004',
 ]
 
 BLACKLIST_3000 = [
+    'fedora-33',
     'ubuntu-2004',
 ]
 
@@ -77,21 +70,19 @@ SALT_BRANCHES = [
     '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 @@ DISTRO_DISPLAY_NAMES = {
     '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 37fd749..a12ae12 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
-    driver_config:
-      image: fedora:31
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
-        - dnf -y install procps-ng
   - name: fedora-32
     driver_config:
       image: fedora:32
       run_command: /usr/lib/systemd/systemd
       provision_command:
         - dnf -y install procps-ng
+  - name: fedora-33
+    driver_config:
+      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 e83c3cf226831ea6e67a323d90960dc0bab8deb6 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Tue, 8 Dec 2020 22:22:46 +0000
Subject: [PATCH 02/54] 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 0000000..d04e1bc
--- /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 f3f7b37..2a26233 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 fefde64..60a6600 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 695ff3b..96d1caa 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -6,170 +6,186 @@ import datetime
 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 51e000d..e956676 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 1ad20c3..327536c 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 a12ae12..a95aff0 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 d285259..c48dae6 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 a5e262f..5f0e1b6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -7,28 +7,38 @@ import logging
 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 07112e0..81ed135 100644
--- a/tests/integration/test_installation.py
+++ b/tests/integration/test_installation.py
@@ -9,16 +9,16 @@ log = logging.getLogger(__name__)
 
 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 52a48123a851a6ed343072626502ceb36d7617e8 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 9 Dec 2020 05:20:25 +0000
Subject: [PATCH 03/54] 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 5f0e1b6..090131b 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 81ed135..a2309c0 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 07470e147e7bef3760a387352e1845183b97fbc3 Mon Sep 17 00:00:00 2001
From: Joseph Pacura <jpacura96@gmail.com>
Date: Fri, 4 Dec 2020 17:15:02 -0500
Subject: [PATCH 04/54] 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 903ecb0..d188a79 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 a21b8bd..95b075b 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 57932fdb31619b36e4741c1420a86d1ca5abff85 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 9 Dec 2020 05:19:06 +0000
Subject: [PATCH 05/54] 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 2a26233..6ff6256 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 96d1caa..8036336 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -12,6 +12,7 @@ LINUX_DISTROS = [
     "centos-7",
     "centos-8",
     "debian-10",
+    "debian-11",
     "debian-9",
     "fedora-32",
     "fedora-33",
@@ -30,6 +31,7 @@ STABLE_DISTROS = [
     "centos-7",
     "centos-8",
     "debian-10",
+    "debian-11",
     "debian-9",
     "fedora-32",
     "fedora-33",
@@ -43,6 +45,7 @@ STABLE_DISTROS = [
 PY2_BLACKLIST = [
     "centos-8",
     "debian-10",
+    "debian-11",
     "fedora-32",
     "fedora-33",
     "gentoo",
@@ -56,15 +59,29 @@ PY3_BLACKLIST = [
 ]
 
 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 @@ DISTRO_DISPLAY_NAMES = {
     "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 a95aff0..55c8579 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 f310b9f094d084106286ad5aca6a5657ba07d0eb 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 06/54] 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 55c8579..7bf537b 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 95b075b..1fc4965 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
+    _PYEXE=${_PY_EXE}
+
+    if [ "$_PY_EXE" = "python3" ] || [ -z "$_PY_EXE" ]; then
+        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
 
-    # 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 [ "${_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 9e0d1168c2a8e3091a264b373ea51a49505bdb93 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 07/54] 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 d04e1bc..b1e9564 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 8036336..f3bb1b4 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -76,10 +76,14 @@ BLACKLIST_3001 = [
 
 BLACKLIST_3001_0 = [
     "debian-11",
+    "gentoo",
+    "gentoo-systemd",
 ]
 
 BLACKLIST_3002_0 = [
     "debian-11",
+    "gentoo",
+    "gentoo-systemd",
 ]
 
 SALT_BRANCHES = [
@@ -131,8 +135,8 @@ DISTRO_DISPLAY_NAMES = {
 
 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 7bf537b..ef18b9a 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 75cda1ef4d2dc3b187586090a5bc916994f72c5e 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 08/54] 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 b1e9564..fa471b6 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 f3bb1b4..0010c23 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -135,8 +135,8 @@ DISTRO_DISPLAY_NAMES = {
 
 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 1fc4965..8d84175 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 2fd501de8c8c6c8b887c0d758956e83b1ffa808a Mon Sep 17 00:00:00 2001
From: ScriptAutomate <derek@icanteven.io>
Date: Tue, 15 Dec 2020 17:34:01 -0600
Subject: [PATCH 09/54] Adding examples using stable; adding help output

---
 README.rst | 175 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 162 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index d188a79..be62e57 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,6 +206,20 @@ Run the script without any parameters to get latest stable Salt packages for you
 Install using curl
 ~~~~~~~~~~~~~~~~~~
 
+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 -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
+  sudo sh bootstrap-salt.sh git v3002.2
+
 Using ``curl`` to install latest development version from GitHub:
 
 .. code:: console
@@ -92,13 +227,6 @@ Using ``curl`` to install latest development version from GitHub:
   curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
   sudo sh bootstrap-salt.sh git master
 
-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
-
 To install a specific branch from a Git fork:
 
 .. code:: console
@@ -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 da0f0733edf121d9b5e1bd5a8219309c38e975d9 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 10/54] 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 ef18b9a..56a0716 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 8d84175..f0ed384 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 1e57d84a0bb9431df49820d723be93c30b5e991e 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 11/54] 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 f0ed384..93da5ea 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 a78cc3c2443f88d4db52aff9ebbe71204d48492e Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 12 Jan 2021 08:33:51 -0700
Subject: [PATCH 12/54] 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 93da5ea..b72dacf 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 5dbf2973bfb8487e852c2f675a30e3ad52e456a0 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Thu, 21 Jan 2021 22:44:46 +0000
Subject: [PATCH 13/54] 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 c9c70bb..365e122 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 0ee7b0a..259448d 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 31ccb14..1dd656b 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 be62e57..10ea386 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 ffd3912..826b701 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 93da5ea..64349d0 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"
@@ -6320,7 +6320,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"
@@ -7452,7 +7452,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 236884c19fb79d6066c3a3b1cd0f71cb7ea72646 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Thu, 21 Jan 2021 23:19:34 +0000
Subject: [PATCH 14/54] update supported oses

---
 .github/workflows/main-branch-only.yml  |  184 ----
 .github/workflows/main.yml              | 1196 -----------------------
 .github/workflows/templates/generate.py |   21 -
 .kitchen.yml                            |   59 --
 4 files changed, 1460 deletions(-)

diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml
index fa471b6..8134361 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 6ff6256..b4dce55 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,190 +44,6 @@ jobs:
           shellcheck -s sh -f tty bootstrap-salt.sh
 
 
-  py2-stable-2019-2-amazon-2:
-    name: Amazon 2 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-amazon-2 || bundle exec kitchen create py2-stable-2019-2-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-stable-2019-2-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-stable-2019-2-amazon-2
-
-
-  py2-git-2019-2-amazon-2:
-    name: Amazon 2 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-amazon-2 || bundle exec kitchen create py2-git-2019-2-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-git-2019-2-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-git-2019-2-amazon-2
-
-
-  py3-stable-2019-2-amazon-2:
-    name: Amazon 2 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-amazon-2 || bundle exec kitchen create py3-stable-2019-2-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-amazon-2
-
-
-  py3-git-2019-2-amazon-2:
-    name: Amazon 2 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-amazon-2 || bundle exec kitchen create py3-git-2019-2-amazon-2
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-amazon-2
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-amazon-2
-
-
   py3-stable-3000-amazon-2:
     name: Amazon 2 v3000 Py3 Stable
     runs-on: ubuntu-latest
@@ -688,52 +504,6 @@ jobs:
           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
-
-
   py3-git-3001-arch:
     name: Arch v3001 Py3 Git
     runs-on: ubuntu-latest
@@ -872,190 +642,6 @@ jobs:
           bundle exec kitchen destroy py3-git-master-arch
 
 
-  py2-stable-2019-2-centos-7:
-    name: CentOS 7 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-centos-7 || bundle exec kitchen create py2-stable-2019-2-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-stable-2019-2-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-stable-2019-2-centos-7
-
-
-  py2-git-2019-2-centos-7:
-    name: CentOS 7 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-centos-7 || bundle exec kitchen create py2-git-2019-2-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-git-2019-2-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-git-2019-2-centos-7
-
-
-  py3-stable-2019-2-centos-7:
-    name: CentOS 7 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-7 || bundle exec kitchen create py3-stable-2019-2-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-centos-7
-
-
-  py3-git-2019-2-centos-7:
-    name: CentOS 7 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-7 || bundle exec kitchen create py3-git-2019-2-centos-7
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-centos-7
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-centos-7
-
-
   py3-stable-3000-centos-7:
     name: CentOS 7 v3000 Py3 Stable
     runs-on: ubuntu-latest
@@ -1516,98 +1102,6 @@ jobs:
           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
@@ -2068,98 +1562,6 @@ jobs:
           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
@@ -2804,190 +2206,6 @@ jobs:
           bundle exec kitchen destroy latest-debian-11
 
 
-  py2-stable-2019-2-debian-9:
-    name: Debian 9 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-debian-9 || bundle exec kitchen create py2-stable-2019-2-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-stable-2019-2-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-stable-2019-2-debian-9
-
-
-  py2-git-2019-2-debian-9:
-    name: Debian 9 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-debian-9 || bundle exec kitchen create py2-git-2019-2-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-git-2019-2-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-git-2019-2-debian-9
-
-
-  py3-stable-2019-2-debian-9:
-    name: Debian 9 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-9 || bundle exec kitchen create py3-stable-2019-2-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-debian-9
-
-
-  py3-git-2019-2-debian-9:
-    name: Debian 9 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-9 || bundle exec kitchen create py3-git-2019-2-debian-9
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-debian-9
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-debian-9
-
-
   py3-stable-3000-debian-9:
     name: Debian 9 v3000 Py3 Stable
     runs-on: ubuntu-latest
@@ -3816,52 +3034,6 @@ jobs:
           bundle exec kitchen destroy latest-fedora-33
 
 
-  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
@@ -4092,190 +3264,6 @@ jobs:
           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-stable-3000-ubuntu-1604:
     name: Ubuntu 16.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
@@ -4736,190 +3724,6 @@ jobs:
           bundle exec kitchen destroy latest-ubuntu-1604
 
 
-  py2-stable-2019-2-ubuntu-1804:
-    name: Ubuntu 18.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-1804 || bundle exec kitchen create py2-stable-2019-2-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-stable-2019-2-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-stable-2019-2-ubuntu-1804
-
-
-  py2-git-2019-2-ubuntu-1804:
-    name: Ubuntu 18.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-1804 || bundle exec kitchen create py2-git-2019-2-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py2-git-2019-2-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py2-git-2019-2-ubuntu-1804
-
-
-  py3-stable-2019-2-ubuntu-1804:
-    name: Ubuntu 18.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-1804 || bundle exec kitchen create py3-stable-2019-2-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-2019-2-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-2019-2-ubuntu-1804
-
-
-  py3-git-2019-2-ubuntu-1804:
-    name: Ubuntu 18.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-1804 || bundle exec kitchen create py3-git-2019-2-ubuntu-1804
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-2019-2-ubuntu-1804
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-2019-2-ubuntu-1804
-
-
   py3-stable-3000-ubuntu-1804:
     name: Ubuntu 18.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 0010c23..ed215cd 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -6,7 +6,6 @@ import datetime
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 LINUX_DISTROS = [
-    #'amazon-1',
     "amazon-2",
     "arch",
     "centos-7",
@@ -26,7 +25,6 @@ LINUX_DISTROS = [
 OSX = WINDOWS = []
 
 STABLE_DISTROS = [
-    "amazon-1",
     "amazon-2",
     "centos-7",
     "centos-8",
@@ -54,16 +52,6 @@ PY2_BLACKLIST = [
     "ubuntu-2004",
 ]
 
-PY3_BLACKLIST = [
-    "amazon-1",
-]
-
-BLACKLIST_2019 = [
-    "debian-11",
-    "fedora-33",
-    "ubuntu-2004",
-]
-
 BLACKLIST_3000 = [
     "debian-11",
     "fedora-33",
@@ -87,7 +75,6 @@ BLACKLIST_3002_0 = [
 ]
 
 SALT_BRANCHES = [
-    "2019-2",
     "3000",
     "3001",
     "3001-0",
@@ -98,7 +85,6 @@ SALT_BRANCHES = [
 ]
 
 BRANCH_DISPLAY_NAMES = {
-    "2019-2": "v2019.2",
     "3000": "v3000",
     "3001": "v3001",
     "3001-0": "v3001.0",
@@ -115,7 +101,6 @@ LATEST_PKG_BLACKLIST = [
 ]
 
 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 56a0716..0b74e52 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 9c1b61e2720c587ad5058b25243ade40cd6c3b18 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Fri, 22 Jan 2021 16:18:35 +0000
Subject: [PATCH 15/54] 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 64349d0..2c4d438 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 8556d005d60abb67b313b7f52ca30328177906a3 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Fri, 22 Jan 2021 16:53:10 +0000
Subject: [PATCH 16/54] 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 2c4d438..c13d14a 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 4310738bc4cf3b89b2873c0d66f71cbf0888edff Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 20 Jan 2021 09:43:08 +0000
Subject: [PATCH 17/54] 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 b4dce55..057d4e5 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 ed215cd..d6643dc 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -18,6 +18,7 @@ LINUX_DISTROS = [
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
+    "opensuse-tumbleweed",
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
@@ -49,12 +50,14 @@ PY2_BLACKLIST = [
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
+    "opensuse-tumbleweed",
     "ubuntu-2004",
 ]
 
 BLACKLIST_3000 = [
     "debian-11",
     "fedora-33",
+    "opensuse-tumbleweed",
     "ubuntu-2004",
 ]
 
@@ -113,6 +116,7 @@ DISTRO_DISPLAY_NAMES = {
     "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 0b74e52..ffe2d4c 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 8400773..f8fc647 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 f311d100ad40896f2f4484400456e3c62e71e950 Mon Sep 17 00:00:00 2001
From: Joseph Pacura <jpacura96@gmail.com>
Date: Fri, 22 Jan 2021 19:33:18 -0500
Subject: [PATCH 18/54] 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 10ea386..1c80e0d 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 f8fc647..0d07ca9 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 ce070e8ed3902b3d0ce3632bf5bfec2c8ef08a3b Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Tue, 19 Jan 2021 20:15:09 +0000
Subject: [PATCH 19/54] feat(ps1): implement configure only option (for
 Vagrant)

---
 bootstrap-salt.ps1 | 138 ++++++++++++++++++++++++++-------------------
 1 file changed, 79 insertions(+), 59 deletions(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 826b701..2e98e48 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)
+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"}
+    #===============================================================================
+    # 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
+    #===============================================================================
+    # 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
-
-    # Check if service is started, otherwise retry starting the
-    # service 4 times.
-    $try = 0
-    While (($service.Status -ne "Running") -and ($try -ne 4)) {
+    If($runservice) {
+        # Start service
+        Write-Output "Starting the Salt minion service"
         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
+        # 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
+        }
+    }
+    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 bfd160cf4afeec4a0e883255ae34478a35564160 Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Mon, 4 Jan 2021 16:33:22 +0000
Subject: [PATCH 20/54] 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 2e98e48..2557e85 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 617ab7d21e68e295a7df89599045875472ab3bc0 Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Mon, 4 Jan 2021 16:41:35 +0000
Subject: [PATCH 21/54] 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 2557e85..33621a8 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 50e478de8bfc688bf83f88f6d8892719e710f8be Mon Sep 17 00:00:00 2001
From: Dafydd Jones <dafydd@techneg.it>
Date: Wed, 3 Feb 2021 19:48:36 +0000
Subject: [PATCH 22/54] 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 33621a8..a0d7042 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 7f07c643ccf654e227c243d447fed24b2e58a611 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 10 Feb 2021 14:26:58 +0000
Subject: [PATCH 23/54] 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 0d07ca9..0d3115d 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 e6d4ccc8edbd2b278c0137c783bfa752cd3d1553 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 13 Feb 2021 13:41:20 +0000
Subject: [PATCH 24/54] 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 057d4e5..1299874 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 d6643dc..68cbde9 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -19,6 +19,7 @@ LINUX_DISTROS = [
     "gentoo-systemd",
     "opensuse-15",
     "opensuse-tumbleweed",
+    "oraclelinux-7",
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
@@ -36,6 +37,7 @@ STABLE_DISTROS = [
     "fedora-33",
     "gentoo",
     "gentoo-systemd",
+    "oraclelinux-7",
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
@@ -117,6 +119,7 @@ DISTRO_DISPLAY_NAMES = {
     "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 ffe2d4c..88d2524 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 757f4b61693f723b14ce2fb97a1f8accd082d1d7 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 13 Feb 2021 13:43:15 +0000
Subject: [PATCH 25/54] 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 48d9908..bf18766 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 a2a83237f362a09dbcca355f9ac53d353acc34fb Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 10 Feb 2021 23:40:06 +0000
Subject: [PATCH 26/54] use https for fetching gem

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

diff --git a/Gemfile b/Gemfile
index 2d4b90b..1b67396 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 70eb5a9d1a6d5863348a240a7e4b01232259b880 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 21 Oct 2020 16:12:53 +0100
Subject: [PATCH 27/54] 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 1fed5fe..8e98526 100644
--- a/.github/workflows/checksums.yml
+++ b/.github/workflows/checksums.yml
@@ -1,4 +1,4 @@
-name: Scripts-Checksums
+name: Checksums
 
 on:
   push:

From c86c25519b28b343be8a174bed6b2aef3c04e62d Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 21 Oct 2020 16:32:32 +0100
Subject: [PATCH 28/54] 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 8e98526..091e3a6 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 248d2bb..c00c5cd 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 76a8cf40d69f025e6ffe33d8fdd8a4500fa4592c Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 21 Oct 2020 16:35:57 +0100
Subject: [PATCH 29/54] Update RELEASE.md

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

diff --git a/RELEASE.md b/RELEASE.md
index b182c1a..c6b561a 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 c889fbd6b04e677c98d26cf950f673469c1b436d Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 07:24:38 +0000
Subject: [PATCH 30/54] Update AUTHORS and ChangeLog

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

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 365e122..0499fcc 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 33fc270..3e6a2c3 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 bf1d69181b82cac696fbc0ce85e63c49ac465860 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 07:27:15 +0000
Subject: [PATCH 31/54] 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 0d3115d..24221f0 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 855a99a4a54d1a127e63fd9e003eb80e22dcb7d8 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 07:25:01 +0000
Subject: [PATCH 32/54] 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 24221f0..acee355 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 7dcce90c90dcfff4e2a87107b7403494d5773a3b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 2 Mar 2021 10:56:00 +0000
Subject: [PATCH 33/54] Fix release version in ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 3e6a2c3..05b738c 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 c4876217aa430e05d955863c8a1ec03239f3fe34 Mon Sep 17 00:00:00 2001
From: s0undt3ch <s0undt3ch@users.noreply.github.com>
Date: Tue, 2 Mar 2021 13:19:38 +0000
Subject: [PATCH 34/54] Update README.rst with 2021.03.02 release sha256sum

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

diff --git a/README.rst b/README.rst
index 1c80e0d..15e3595 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.03.02: ``91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758``
 - 2020.10.20: ``b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2``
 - 2020.10.19: ``f6c3e2c52f98d115809044b09062219369957caf30228b594033f0543e202c52``
 - 2020.06.23: ``1d07db867c195c864d0ae70664524f2099cc9a46872953293c67c3f239d4f4f5``

From 34285b854a13fbb4b0863798d71f35e972306c96 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 24 Mar 2021 16:26:13 +0000
Subject: [PATCH 35/54] fix(arch): remove `python2-futures` package (moved to
 AUR)

The `stable latest` build in the `salt-image-builder` started failing.

* https://gitlab.com/myii/salt-image-builder/-/jobs/1124156923

```
error: target not found: python2-futures
 core is up to date
 extra is up to date
 community is up to date
 * ERROR: Failed to run install_arch_linux_stable()!!!
```

The package has been moved to AUR:

* https://aur.archlinux.org/packages/python2-futures/
* https://aur.archlinux.org/cgit/aur.git/commit/?h=python2-futures&id=06dea3ff2267d052dbc3779c9a93d31766769c6b
  - `import from community`

The build is passing again with this workaround applied using `sed`:

* https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/83efb01cb8d12bfed121b003233afc7000300f06
* https://gitlab.com/myii/salt-image-builder/-/jobs/1124687557
---
 bootstrap-salt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index acee355..b4b3de1 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5633,7 +5633,7 @@ install_arch_linux_git_deps() {
     if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
         pacman -R --noconfirm python2-distribute
         pacman -Su --noconfirm --needed python2-crypto python2-setuptools python2-jinja \
-            python2-m2crypto python2-futures python2-markupsafe python2-msgpack python2-psutil \
+            python2-m2crypto python2-markupsafe python2-msgpack python2-psutil \
             python2-pyzmq zeromq python2-requests python2-systemd || return 1
 
         if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then
@@ -5675,7 +5675,7 @@ install_arch_linux_stable() {
     pacman -S --noconfirm --needed bash || return 1
     pacman -Su --noconfirm || return 1
     # We can now resume regular salt update
-    pacman -Syu --noconfirm salt python2-futures || return 1
+    pacman -Syu --noconfirm salt || return 1
     return 0
 }
 

From 055e51e5b4647cac86aca764e80f0fe6b1c827e2 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 24 Mar 2021 16:44:41 +0000
Subject: [PATCH 36/54] ci(arch): add CI for `latest-arch`

---
 .github/workflows/main.yml              | 46 +++++++++++++++++++++++++
 .github/workflows/templates/generate.py |  4 +--
 kitchen.yml                             |  2 --
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1299874..b6144db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -642,6 +642,52 @@ jobs:
           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-3000-centos-7:
     name: CentOS 7 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 68cbde9..4b5dfbf 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -101,9 +101,7 @@ BRANCH_DISPLAY_NAMES = {
 
 STABLE_BRANCH_BLACKLIST = []
 
-LATEST_PKG_BLACKLIST = [
-    "arch",  # No packages are built
-]
+LATEST_PKG_BLACKLIST = []
 
 DISTRO_DISPLAY_NAMES = {
     "amazon-2": "Amazon 2",
diff --git a/kitchen.yml b/kitchen.yml
index 88d2524..d6b96c9 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -229,8 +229,6 @@ suites:
     provisioner:
       salt_version: latest
       salt_bootstrap_options: -MP stable %s
-    excludes:
-      - arch
 
 verifier:
   name: shell

From 388ef93cf28a4a900ce58d3e4aed07e6720013e9 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 14 Apr 2021 09:38:46 +0100
Subject: [PATCH 37/54] ci(kitchen): use new Arch Linux image (previous is
 deprecated)

* https://hub.docker.com/r/archlinux/base
  - Deprecated. Use new image at https://hub.docker.com/r/archlinux/archlinux
---
 kitchen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitchen.yml b/kitchen.yml
index d6b96c9..9a406a9 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -37,7 +37,7 @@ platforms:
         - yum -y install procps-ng
   - name: arch
     driver_config:
-      image: archlinux/base
+      image: archlinux/archlinux
       run_command: /usr/lib/systemd/systemd
       provision_command:
         - pacman -Syu --noconfirm --needed systemd grep awk procps which

From ca0669c78d9341af46ea5cbb2f9602092fd0e727 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 23 Apr 2021 22:55:38 +0100
Subject: [PATCH 38/54] feat(fedora): add CI for Fedora 34 & 35

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b6144db..666a81b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3080,6 +3080,374 @@ jobs:
           bundle exec kitchen destroy latest-fedora-33
 
 
+  py3-git-3001-fedora-34:
+    name: Fedora 34 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-fedora-34 || bundle exec kitchen create py3-git-3001-fedora-34
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-fedora-34
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-fedora-34
+
+
+  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-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-3001-fedora-35:
+    name: Fedora 35 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-fedora-35 || bundle exec kitchen create py3-git-3001-fedora-35
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3001-fedora-35
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3001-fedora-35
+
+
+  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-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-3000-opensuse-15:
     name: Opensuse 15 v3000 Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 4b5dfbf..3633ab1 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -15,6 +15,8 @@ LINUX_DISTROS = [
     "debian-9",
     "fedora-32",
     "fedora-33",
+    "fedora-34",
+    "fedora-35",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -35,6 +37,8 @@ STABLE_DISTROS = [
     "debian-9",
     "fedora-32",
     "fedora-33",
+    "fedora-34",
+    "fedora-35",
     "gentoo",
     "gentoo-systemd",
     "oraclelinux-7",
@@ -49,6 +53,8 @@ PY2_BLACKLIST = [
     "debian-11",
     "fedora-32",
     "fedora-33",
+    "fedora-34",
+    "fedora-35",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -59,6 +65,8 @@ PY2_BLACKLIST = [
 BLACKLIST_3000 = [
     "debian-11",
     "fedora-33",
+    "fedora-34",
+    "fedora-35",
     "opensuse-tumbleweed",
     "ubuntu-2004",
 ]
@@ -113,6 +121,8 @@ DISTRO_DISPLAY_NAMES = {
     "debian-9": "Debian 9",
     "fedora-32": "Fedora 32",
     "fedora-33": "Fedora 33",
+    "fedora-34": "Fedora 34",
+    "fedora-35": "Fedora 35",
     "gentoo": "Gentoo",
     "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
diff --git a/kitchen.yml b/kitchen.yml
index 9a406a9..a24d32a 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -73,6 +73,20 @@ platforms:
       provision_command:
         - dnf -y install procps-ng
         - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
+  - name: fedora-34
+    driver_config:
+      image: fedora:34
+      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: fedora-35
+    driver_config:
+      image: fedora:35
+      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: ksmanis/stage3:latest

From db924b4e81d1db066ec5aadda052d3af05e996c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= <ivo.jansky@gmail.com>
Date: Sat, 1 May 2021 14:59:26 +0200
Subject: [PATCH 39/54] Gentoo - relax setuptools version upper bound
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ivo Jánský <ivo.jansky@gmail.com>
---
 bootstrap-salt.sh | 11 ++++++++---
 kitchen.yml       |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b4b3de1..3cc175e 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2739,9 +2739,14 @@ EOM
         echodebug "Installed pip version: $(${_pip_cmd} --version)"
     fi
 
-    # We also lock setuptools to <45 which is the latest release to support both py2 and py3
-    echodebug "Running '${_pip_cmd} install wheel setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<45'"
-    ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<45"
+    _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
+    if [ "$_PY_MAJOR_VERSION" -eq 2 ]; then
+        # We also lock setuptools to <45 which is the latest release to support both py2 and py3
+        _setuptools_dep="${_setuptools_dep},<45"
+    fi
+
+    echodebug "Running '${_pip_cmd} install wheel ${_setuptools_dep}'"
+    ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}"
 
     echoinfo "Installing salt using ${_py_exe}"
     cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1
diff --git a/kitchen.yml b/kitchen.yml
index a24d32a..873c9a2 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -89,13 +89,13 @@ platforms:
         - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
   - name: gentoo
     driver_config:
-      image: ksmanis/stage3:latest
+      image: gentoo/stage3:latest
       run_command: /sbin/init
       provision_command:
         - rc-update add sshd default
   - name: gentoo-systemd
     driver_config:
-      image: ksmanis/stage3:systemd
+      image: gentoo/stage3:systemd
       run_command: /lib/systemd/systemd
       provision_command:
         - systemctl enable sshd.service

From a12ffd379cc3328aa67ec1273c366455e131a810 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Fri, 7 May 2021 18:32:42 +0200
Subject: [PATCH 40/54] Add a stubber support for Ubuntu 21.04 non-LTS to use
 Ubuntu 20.04 packages.

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 3cc175e..1ac3931 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1457,6 +1457,9 @@ __ubuntu_codename_translation() {
         "20")
             DISTRO_CODENAME="focal"
             ;;
+        "21")
+            DISTRO_CODENAME="hirsute"
+            ;;
         *)
             DISTRO_CODENAME="trusty"
             ;;
@@ -2911,7 +2914,7 @@ __enable_universe_repository() {
 }
 
 __install_saltstack_ubuntu_repository() {
-    # Workaround for latest non-LTS ubuntu
+    # Workaround for non-LTS ubuntu 20.10
     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=20.04
@@ -2921,6 +2924,16 @@ __install_saltstack_ubuntu_repository() {
         UBUNTU_CODENAME=${DISTRO_CODENAME}
     fi
 
+    # Workaround for latest non-LTS ubuntu 21.04
+    if { [ "$DISTRO_MAJOR_VERSION" -eq 21 ] && [ "$DISTRO_MINOR_VERSION" -eq 04 ]; }; 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"
+    else
+        UBUNTU_VERSION=${DISTRO_VERSION}
+        UBUNTU_CODENAME=${DISTRO_CODENAME}
+    fi
+
     # Install downloader backend for GPG keys fetching
     __PACKAGES='wget'
 
@@ -3035,7 +3048,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 ]; then
+            if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ]; 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 &&

From e610e6dba0b474372a7549846585d46047d762a9 Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Fri, 7 May 2021 18:47:57 +0200
Subject: [PATCH 41/54] shorten bits

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 1ac3931..d16d4f0 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2914,18 +2914,9 @@ __enable_universe_repository() {
 }
 
 __install_saltstack_ubuntu_repository() {
-    # Workaround for non-LTS ubuntu 20.10
-    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=20.04
-        UBUNTU_CODENAME="focal"
-    else
-        UBUNTU_VERSION=${DISTRO_VERSION}
-        UBUNTU_CODENAME=${DISTRO_CODENAME}
-    fi
-
-    # Workaround for latest non-LTS ubuntu 21.04
-    if { [ "$DISTRO_MAJOR_VERSION" -eq 21 ] && [ "$DISTRO_MINOR_VERSION" -eq 04 ]; }; then
+    # 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
         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 68417f7fdab80c52fdd2740b3fef9386e8a8215d Mon Sep 17 00:00:00 2001
From: krionbsd <krion@FreeBSD.org>
Date: Sat, 8 May 2021 11:21:14 +0200
Subject: [PATCH 42/54] Add FreeBSD versions to README

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

diff --git a/README.rst b/README.rst
index 15e3595..c0fba69 100644
--- a/README.rst
+++ b/README.rst
@@ -521,7 +521,7 @@ UNIX systems
 **BSD**:
 
 - OpenBSD (``pip`` installation)
-- FreeBSD 11/12
+- FreeBSD 11/12/13/14-CURRENT
 
 **SunOS**:
 

From 600d789cfb10d291d27d661932f3c161b0313cfe Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@freebsd.org>
Date: Mon, 10 May 2021 18:24:37 +0200
Subject: [PATCH 43/54] Add Ubuntu 21.04 to CI (#1560)

* Add Ubuntu 21.04 to CI
---
 .github/workflows/main.yml              | 184 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   8 ++
 kitchen.yml                             |   8 ++
 3 files changed, 200 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 666a81b..d0695c8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5608,3 +5608,187 @@ jobs:
         if: always()
         run: |
           bundle exec kitchen destroy latest-ubuntu-2004
+
+
+  py3-stable-3002-ubuntu-2104:
+    name: Ubuntu 21.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-2104 || bundle exec kitchen create py3-stable-3002-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-stable-3002-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-stable-3002-ubuntu-2104
+
+
+  py3-git-3002-ubuntu-2104:
+    name: Ubuntu 21.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-2104 || bundle exec kitchen create py3-git-3002-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-ubuntu-2104
+
+
+  py3-git-master-ubuntu-2104:
+    name: Ubuntu 21.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-2104 || bundle exec kitchen create py3-git-master-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-ubuntu-2104
+
+
+  latest-ubuntu-2104:
+    name: Ubuntu 21.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-2104 || bundle exec kitchen create latest-ubuntu-2104
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify latest-ubuntu-2104
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy latest-ubuntu-2104
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 3633ab1..8e9356d 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -25,6 +25,7 @@ LINUX_DISTROS = [
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
+    "ubuntu-2104",
 ]
 OSX = WINDOWS = []
 
@@ -45,6 +46,7 @@ STABLE_DISTROS = [
     "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
+    "ubuntu-2104",
 ]
 
 PY2_BLACKLIST = [
@@ -60,6 +62,7 @@ PY2_BLACKLIST = [
     "opensuse-15",
     "opensuse-tumbleweed",
     "ubuntu-2004",
+    "ubuntu-2104",
 ]
 
 BLACKLIST_3000 = [
@@ -69,22 +72,26 @@ BLACKLIST_3000 = [
     "fedora-35",
     "opensuse-tumbleweed",
     "ubuntu-2004",
+    "ubuntu-2104",
 ]
 
 BLACKLIST_3001 = [
     "debian-11",
+    "ubuntu-2104",
 ]
 
 BLACKLIST_3001_0 = [
     "debian-11",
     "gentoo",
     "gentoo-systemd",
+    "ubuntu-2104",
 ]
 
 BLACKLIST_3002_0 = [
     "debian-11",
     "gentoo",
     "gentoo-systemd",
+    "ubuntu-2104",
 ]
 
 SALT_BRANCHES = [
@@ -131,6 +138,7 @@ DISTRO_DISPLAY_NAMES = {
     "ubuntu-1604": "Ubuntu 16.04",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
+    "ubuntu-2104": "Ubuntu 21.04",
 }
 
 TIMEOUT_DEFAULT = 20
diff --git a/kitchen.yml b/kitchen.yml
index 873c9a2..1214d68 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -122,6 +122,9 @@ platforms:
   - name: oraclelinux-7
     driver_config:
       run_command: /usr/lib/systemd/systemd
+  - name: ubuntu-21.04
+    driver_config:
+      run_command: /lib/systemd/systemd
   - name: ubuntu-20.04
     driver_config:
       run_command: /lib/systemd/systemd
@@ -164,6 +167,7 @@ suites:
       - gentoo
       - gentoo-systemd
       - ubuntu-2004
+      - ubuntu-2104
 
   - name: py3-git-3000
     provisioner:
@@ -173,6 +177,7 @@ suites:
       - debian-11
       - opensuse-tumbleweed
       - ubuntu-2004
+      - ubuntu-2104
   - name: py3-git-3001
     provisioner:
       salt_version: 3001
@@ -191,6 +196,7 @@ suites:
       - opensuse-tumbleweed
       - arch
       - ubuntu-2004
+      - ubuntu-2104
   - name: py3-stable-3001-0
     provisioner:
       salt_version: 3001
@@ -204,6 +210,7 @@ suites:
       - arch
       - gentoo
       - gentoo-systemd
+      - ubuntu-2104
   - name: py3-stable-3001
     provisioner:
       salt_version: 3001
@@ -213,6 +220,7 @@ suites:
       - opensuse-15
       - opensuse-tumbleweed
       - arch
+      - ubuntu-2104
   - name: py3-stable-3002-0
     provisioner:
       salt_version: 3002

From 0b1c203986b040c45c51c16d1e8da3e8e2d80894 Mon Sep 17 00:00:00 2001
From: Joe Eacott <jeacott@vmware.com>
Date: Mon, 10 May 2021 15:22:00 -0600
Subject: [PATCH 44/54] change curl command to fetch_url func

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d16d4f0..defc2e7 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -7525,7 +7525,7 @@ install_macosx_git_deps() {
 install_macosx_stable() {
     install_macosx_stable_deps || return 1
 
-    /usr/bin/curl "${SALTPKGCONFURL}" > "/tmp/${PKG}" || return 1
+    __fetch_url "/tmp/${PKG}" "${SALTPKGCONFURL}" || return 1
 
     /usr/sbin/installer -pkg "/tmp/${PKG}" -target / || return 1
 

From ca56699343ed3caf58309edf0fcdc78e0a55062f Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Fri, 14 May 2021 22:09:21 +0000
Subject: [PATCH 45/54] use salt.list instead of saltstack.list similar to the
 instructions on https://repo.saltproject.io

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index defc2e7..8776a78 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2948,7 +2948,7 @@ __install_saltstack_ubuntu_repository() {
 
     # SaltStack's stable 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
+    echo "$__REPO_ARCH_DEB $SALTSTACK_UBUNTU_URL $UBUNTU_CODENAME main" > /etc/apt/sources.list.d/salt.list
 
     __apt_key_fetch "$SALTSTACK_UBUNTU_URL/salt-archive-keyring.gpg" || return 1
 
@@ -3391,7 +3391,7 @@ __install_saltstack_debian_repository() {
 
     # amd64 is just a part of repository URI, 32-bit pkgs are hosted under the same location
     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"
+    echo "$__REPO_ARCH_DEB $SALTSTACK_DEBIAN_URL $DEBIAN_CODENAME main" > "/etc/apt/sources.list.d/salt.list"
 
     __apt_key_fetch "$SALTSTACK_DEBIAN_URL/salt-archive-keyring.gpg" || return 1
 

From 1c6a78b746d62797fd545bd7040609aa26871d0f Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Fri, 14 May 2021 22:27:40 +0000
Subject: [PATCH 46/54] use salt.repo instead of saltstack.repo or others

This makes it more similar to the instructions on https://repo.saltproject.io
---
 bootstrap-salt.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 8776a78..b840163 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4137,7 +4137,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}/"
     gpg_key="SALTSTACK-GPG-KEY.pub"
-    repo_file="/etc/yum.repos.d/saltstack.repo"
+    repo_file="/etc/yum.repos.d/salt.repo"
 
     if [ ! -s "$repo_file" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then
         cat <<_eof > "$repo_file"
@@ -4155,7 +4155,7 @@ _eof
         __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 "salt.repo already exists, ignoring salt version argument."
         echowarn "Use -F (forced overwrite) to install $repo_rev."
     fi
 
@@ -5212,7 +5212,7 @@ install_amazon_linux_ami_deps() {
     fi
 
     if [ $_DISABLE_REPOS -eq $BS_FALSE ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then
-        __REPO_FILENAME="saltstack-repo.repo"
+        __REPO_FILENAME="salt.repo"
 
         # Set a few vars to make life easier.
         if [ $_USEAWS -eq $BS_TRUE ]; then
@@ -5447,13 +5447,13 @@ install_amazon_linux_ami_2_deps() {
     fi
 
     if [ $_DISABLE_REPOS -eq $BS_FALSE ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then
-        __REPO_FILENAME="saltstack-repo.repo"
+        __REPO_FILENAME="salt.repo"
         __PY_VERSION_REPO="yum"
         PY_PKG_VER=""
         repo_label="saltstack-repo"
         repo_name="SaltStack repo for Amazon Linux 2"
         if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
-            __REPO_FILENAME="saltstack-py3-repo.repo"
+            __REPO_FILENAME="salt.repo"
             __PY_VERSION_REPO="py3"
             PY_PKG_VER=3
             repo_label="saltstack-py3-repo"

From df29ae3a00abf5a78759188a403b879630816edd Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 28 Mar 2021 10:35:03 +0100
Subject: [PATCH 47/54] feat(bsd): add CI testing using Kitchen's `vagrant`
 driver

---
 .github/workflows/kitchen.vagrant.yml | 87 +++++++++++++++++++++++++++
 Gemfile                               |  4 ++
 kitchen.vagrant.yml                   | 47 +++++++++++++++
 kitchen.yml                           | 32 ++++++++++
 4 files changed, 170 insertions(+)
 create mode 100644 .github/workflows/kitchen.vagrant.yml
 create mode 100644 kitchen.vagrant.yml

diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
new file mode 100644
index 0000000..92e5e9c
--- /dev/null
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -0,0 +1,87 @@
+---
+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-3000-freebsd-130
+          - py3-git-3000-freebsd-122
+          - py3-git-3000-freebsd-114
+          # - py3-git-3000-openbsd-6
+          - py3-git-3001-freebsd-130
+          - py3-git-3001-freebsd-122
+          - py3-git-3001-freebsd-114
+          # - py3-git-3001-openbsd-6
+          - py3-git-3002-freebsd-130
+          - py3-git-3002-freebsd-122
+          - py3-git-3002-freebsd-114
+          # - py3-git-3002-openbsd-6
+          - py3-git-master-freebsd-130
+          - py3-git-master-freebsd-122
+          - py3-git-master-freebsd-114
+          # - py3-git-master-openbsd-6
+          - latest-freebsd-130
+          - latest-freebsd-122
+          - latest-freebsd-114
+          - 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/Gemfile b/Gemfile
index 1b67396..ecb686d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,3 +3,7 @@ source "https://rubygems.org"
 gem 'test-kitchen', '>= 2.0.1'
 gem 'kitchen-salt', '>= 0.5'
 gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker.git'
+
+group :vagrant do
+  gem 'kitchen-vagrant'
+end
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
new file mode 100644
index 0000000..7c80b54
--- /dev/null
+++ b/kitchen.vagrant.yml
@@ -0,0 +1,47 @@
+---
+driver:
+  name: vagrant
+  vm_hostname: salt
+  username: vagrant
+  cache_directory: false
+  customize:
+    usbxhci: 'off'
+  gui: false
+  linked_clone: true
+  ssh:
+    shell: /bin/sh
+
+provisioner:
+  init_environment: |
+    echo 'auto_accept: true' > /tmp/auto-accept-keys.conf
+    sudo mkdir -p /usr/local/etc/salt/master.d
+    sudo mv /tmp/auto-accept-keys.conf /usr/local/etc/salt/master.d/auto-accept-keys.conf
+    sudo pkg install -y shuf
+    sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
+  sudo: true
+
+platforms:
+  - name: freebsd-130
+    driver:
+      box: bento/freebsd-13.0
+  - name: freebsd-122
+    driver:
+      box: bento/freebsd-12.2
+  - name: freebsd-114
+    driver:
+      box: bento/freebsd-11.4
+  - name: openbsd-6
+    driver:
+      box: generic/openbsd6
+      ssh:
+        shell: /bin/ksh
+    provisioner:
+      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
+        sudo pkg_add coreutils
+        sh -c 't=$(gshuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
+
+verifier:
+  command: pytest --cache-clear -v -s -ra --log-cli-level=debug -k "not test_ping" tests/integration/
diff --git a/kitchen.yml b/kitchen.yml
index 1214d68..77038cf 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -144,6 +144,10 @@ suites:
       - debian-11
       - gentoo
       - gentoo-systemd
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
   - name: py2-git-master
     provisioner:
       salt_version: master
@@ -152,6 +156,10 @@ suites:
       - debian-11
       - gentoo
       - gentoo-systemd
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
   - name: py2-stable-3000
     provisioner:
       salt_version: 3000
@@ -168,6 +176,10 @@ suites:
       - gentoo-systemd
       - ubuntu-2004
       - ubuntu-2104
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
 
   - name: py3-git-3000
     provisioner:
@@ -197,6 +209,10 @@ suites:
       - arch
       - ubuntu-2004
       - ubuntu-2104
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
   - name: py3-stable-3001-0
     provisioner:
       salt_version: 3001
@@ -211,6 +227,10 @@ suites:
       - gentoo
       - gentoo-systemd
       - ubuntu-2104
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
   - name: py3-stable-3001
     provisioner:
       salt_version: 3001
@@ -221,6 +241,10 @@ suites:
       - opensuse-tumbleweed
       - arch
       - ubuntu-2104
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
   - name: py3-stable-3002-0
     provisioner:
       salt_version: 3002
@@ -234,6 +258,10 @@ suites:
       - arch
       - gentoo
       - gentoo-systemd
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
   - name: py3-stable-3002
     provisioner:
       salt_version: 3002
@@ -242,6 +270,10 @@ suites:
       - opensuse-15
       - opensuse-tumbleweed
       - arch
+      - freebsd-130
+      - freebsd-122
+      - freebsd-114
+      - openbsd-6
   - name: py3-git-master
     provisioner:
       salt_version: master

From c69845e22cd3c77bc173a3e6c6095764beba15e5 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 28 Mar 2021 10:36:27 +0100
Subject: [PATCH 48/54] feat(windows): add CI testing using Kitchen's `proxy`
 driver

---
 .github/workflows/kitchen.windows.yml  | 150 +++++++++++++++++++++++++
 kitchen.windows.yml                    |  31 +++++
 tests/conftest.py                      |   4 +-
 tests/integration/test_installation.py |  14 ++-
 4 files changed, 195 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/kitchen.windows.yml
 create mode 100644 kitchen.windows.yml

diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
new file mode 100644
index 0000000..4329d43
--- /dev/null
+++ b/.github/workflows/kitchen.windows.yml
@@ -0,0 +1,150 @@
+---
+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-2019:
+    runs-on: 'windows-2019'
+    timeout-minutes: 20
+    needs: 'lint'
+    strategy:
+      fail-fast: false
+      matrix:
+        instance:
+          - py3-stable-3001-windows-2019
+          - py3-stable-3002-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;
+          Set-WSManInstance -ResourceURI winrm/config/service
+          -ValueSet @{AllowUnencrypted="true"}
+      - 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-2016:
+    runs-on: 'windows-2016'
+    timeout-minutes: 20
+    needs: 'lint'
+    strategy:
+      fail-fast: false
+      matrix:
+        instance:
+          - py3-stable-3001-windows-2016
+          - py3-stable-3002-windows-2016
+          - latest-windows-2016
+    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;
+          Set-WSManInstance -ResourceURI winrm/config/service
+          -ValueSet @{AllowUnencrypted="true"}
+      - 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/kitchen.windows.yml b/kitchen.windows.yml
new file mode 100644
index 0000000..cfcaa6f
--- /dev/null
+++ b/kitchen.windows.yml
@@ -0,0 +1,31 @@
+---
+driver:
+  name: proxy
+  host: localhost
+  reset_command: "exit 0"
+  port: 5985
+  username: kitchen
+  password: Password1
+
+provisioner:
+  salt_bootstrap_url: D:/a/salt-bootstrap/salt-bootstrap/bootstrap-salt.ps1
+  salt_bootstrap_options: -pythonVersion 3 -version %s
+  init_environment: ''
+
+platforms:
+  - name: windows-2019
+  - name: windows-2016
+
+suites:
+  - name: py3-stable-3001
+    provisioner:
+      salt_version: 3001.7
+  - name: py3-stable-3002
+    provisioner:
+      salt_version: 3002
+  - 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/tests/conftest.py b/tests/conftest.py
index 090131b..2f60c28 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -9,7 +9,9 @@ log = logging.getLogger(__name__)
 
 @pytest.fixture(scope="session")
 def host():
-    if os.environ.get("KITCHEN_USERNAME") == "vagrant":
+    if os.environ.get("KITCHEN_USERNAME") == "vagrant" or "windows" in os.environ.get(
+        "KITCHEN_INSTANCE"
+    ):
         if "windows" in os.environ.get("KITCHEN_INSTANCE"):
             return testinfra.get_host(
                 "winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}".format(
diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py
index a2309c0..30bc087 100644
--- a/tests/integration/test_installation.py
+++ b/tests/integration/test_installation.py
@@ -1,25 +1,33 @@
 # -*- coding: utf-8 -*-
 import json
+import os
 import pytest
 import logging
 import pprint
+from contextlib import nullcontext
 
 log = logging.getLogger(__name__)
 
 
+def selected_context_manager(host):
+    if "windows" in os.environ.get("KITCHEN_INSTANCE"):
+        return nullcontext()
+    return host.sudo()
+
+
 def test_ping(host):
-    with host.sudo():
+    with selected_context_manager(host):
         assert host.salt("test.ping", "--timeout=120")
 
 
 def test_target_python_version(host, target_python_version):
-    with host.sudo():
+    with selected_context_manager(host):
         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():
+    with selected_context_manager(host):
         ret = host.salt("grains.item", "saltversion", "--timeout=120")
         if target_salt_version.endswith(".0"):
             assert ret["saltversion"] == ".".join(target_salt_version.split(".")[:-1])

From 546e7c9ad3d10b6a6cd36327a4cca08003bb54f5 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 25 Jun 2021 23:14:46 +0100
Subject: [PATCH 49/54] feat(fedora-32): remove platform (EOL)

---
 .github/workflows/main.yml              | 184 ------------------------
 .github/workflows/templates/generate.py |   6 +-
 bootstrap-salt.sh                       |   4 +-
 kitchen.yml                             |   9 --
 4 files changed, 3 insertions(+), 200 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d0695c8..004706f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2712,190 +2712,6 @@ jobs:
           bundle exec kitchen destroy latest-debian-9
 
 
-  py3-git-3001-fedora-32:
-    name: Fedora 32 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-fedora-32 || bundle exec kitchen create py3-git-3001-fedora-32
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3001-fedora-32
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3001-fedora-32
-
-
-  py3-git-3002-fedora-32:
-    name: Fedora 32 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-32 || bundle exec kitchen create py3-git-3002-fedora-32
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3002-fedora-32
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3002-fedora-32
-
-
-  py3-git-master-fedora-32:
-    name: Fedora 32 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-32 || bundle exec kitchen create py3-git-master-fedora-32
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-master-fedora-32
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-master-fedora-32
-
-
-  latest-fedora-32:
-    name: Fedora 32 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-32 || bundle exec kitchen create latest-fedora-32
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify latest-fedora-32
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy latest-fedora-32
-
-
   py3-git-3001-fedora-33:
     name: Fedora 33 v3001 Py3 Git
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 8e9356d..8f9085c 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -13,7 +13,6 @@ LINUX_DISTROS = [
     "debian-10",
     "debian-11",
     "debian-9",
-    "fedora-32",
     "fedora-33",
     "fedora-34",
     "fedora-35",
@@ -36,7 +35,6 @@ STABLE_DISTROS = [
     "debian-10",
     "debian-11",
     "debian-9",
-    "fedora-32",
     "fedora-33",
     "fedora-34",
     "fedora-35",
@@ -53,7 +51,6 @@ PY2_BLACKLIST = [
     "centos-8",
     "debian-10",
     "debian-11",
-    "fedora-32",
     "fedora-33",
     "fedora-34",
     "fedora-35",
@@ -126,7 +123,6 @@ DISTRO_DISPLAY_NAMES = {
     "debian-10": "Debian 10",
     "debian-11": "Debian 11",
     "debian-9": "Debian 9",
-    "fedora-32": "Fedora 32",
     "fedora-33": "Fedora 33",
     "fedora-34": "Fedora 34",
     "fedora-35": "Fedora 35",
@@ -234,7 +230,7 @@ def generate_test_jobs():
                             continue
 
                         if python_version == "py3":
-                            if distro in ("arch", "fedora-32"):
+                            if distro in ("arch"):
                                 allowed_branches = ["master"]
                                 try:
                                     int_branch = int(branch)
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b840163..dc869b0 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1636,8 +1636,8 @@ __check_end_of_life_versions() {
             ;;
 
         fedora)
-            # Fedora lower than 27 are no longer supported
-            if [ "$DISTRO_MAJOR_VERSION" -lt 30 ]; then
+            # Fedora lower than 33 are no longer supported
+            if [ "$DISTRO_MAJOR_VERSION" -lt 33 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"
                 echoerror "    https://fedoraproject.org/wiki/Releases"
diff --git a/kitchen.yml b/kitchen.yml
index 77038cf..294cc89 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -60,12 +60,6 @@ platforms:
     driver_config:
       image: debian:bullseye
       run_command: /lib/systemd/systemd
-  - name: fedora-32
-    driver_config:
-      image: fedora:32
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
-        - dnf -y install procps-ng
   - name: fedora-33
     driver_config:
       image: fedora:33
@@ -170,7 +164,6 @@ suites:
       - opensuse-tumbleweed
       - debian-10
       - debian-11
-      - fedora-32
       - fedora-33
       - gentoo
       - gentoo-systemd
@@ -221,7 +214,6 @@ suites:
       - opensuse-15
       - opensuse-tumbleweed
       - debian-11
-      - fedora-32
       - fedora-33
       - arch
       - gentoo
@@ -253,7 +245,6 @@ suites:
       - opensuse-15
       - opensuse-tumbleweed
       - debian-11
-      - fedora-32
       - fedora-33
       - arch
       - gentoo

From 53f7b20a371345729d8a54b1b04414a8178baef1 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 25 Jun 2021 23:16:09 +0100
Subject: [PATCH 50/54] feat(ubuntu-1604): remove platform (EOL)

---
 .github/workflows/main.yml              | 460 ------------------------
 .github/workflows/templates/generate.py |   3 -
 bootstrap-salt.sh                       |   8 +-
 kitchen.yml                             |   3 -
 4 files changed, 2 insertions(+), 472 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 004706f..d572d9e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4138,466 +4138,6 @@ jobs:
           bundle exec kitchen destroy latest-oraclelinux-7
 
 
-  py3-stable-3000-ubuntu-1604:
-    name: Ubuntu 16.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-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-stable-3000-ubuntu-1604
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-stable-3000-ubuntu-1604
-
-
-  py3-git-3000-ubuntu-1604:
-    name: Ubuntu 16.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-1604 || bundle exec kitchen create py3-git-3000-ubuntu-1604
-
-      - name: Test Bootstrap In Test Container
-        run: |
-          bundle exec kitchen verify py3-git-3000-ubuntu-1604
-
-      - name: Destroy Test Container
-        if: always()
-        run: |
-          bundle exec kitchen destroy py3-git-3000-ubuntu-1604
-
-
-  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-3000-ubuntu-1804:
     name: Ubuntu 18.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 8f9085c..7820a9d 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -21,7 +21,6 @@ LINUX_DISTROS = [
     "opensuse-15",
     "opensuse-tumbleweed",
     "oraclelinux-7",
-    "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2104",
@@ -41,7 +40,6 @@ STABLE_DISTROS = [
     "gentoo",
     "gentoo-systemd",
     "oraclelinux-7",
-    "ubuntu-1604",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2104",
@@ -131,7 +129,6 @@ DISTRO_DISPLAY_NAMES = {
     "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",
     "ubuntu-2104": "Ubuntu 21.04",
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index dc869b0..40da0c1 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1583,15 +1583,11 @@ __check_end_of_life_versions() {
         ubuntu)
             # Ubuntu versions not supported
             #
-            #  < 16.04
-            #  = 16.10
-            #  = 17.04, 17.10
+            #  < 18.04
             #  = 18.10
             #  = 19.04, 19.10
-            if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
-                [ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
+            if [ "$DISTRO_MAJOR_VERSION" -lt 18 ] || \
                 [ "$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:"
diff --git a/kitchen.yml b/kitchen.yml
index 294cc89..0d17d00 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -125,9 +125,6 @@ platforms:
   - name: ubuntu-18.04
     driver_config:
       run_command: /lib/systemd/systemd
-  - name: ubuntu-16.04
-    driver_config:
-      run_command: /lib/systemd/systemd
 
 suites:
   - name: py2-git-3000

From c26d540c9b057eaa8c940e7fe7e88a192458fb9c Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 25 Jun 2021 23:20:09 +0100
Subject: [PATCH 51/54] feat(oraclelinux-8): add CI for platform

Closes #1537.
---
 .github/workflows/main.yml              | 460 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   4 +
 kitchen.yml                             |   3 +
 3 files changed, 467 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d572d9e..048cd7c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4138,6 +4138,466 @@ 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
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: 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-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-3000-ubuntu-1804:
     name: Ubuntu 18.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 7820a9d..308d271 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -21,6 +21,7 @@ LINUX_DISTROS = [
     "opensuse-15",
     "opensuse-tumbleweed",
     "oraclelinux-7",
+    "oraclelinux-8",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2104",
@@ -40,6 +41,7 @@ STABLE_DISTROS = [
     "gentoo",
     "gentoo-systemd",
     "oraclelinux-7",
+    "oraclelinux-8",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2104",
@@ -56,6 +58,7 @@ PY2_BLACKLIST = [
     "gentoo-systemd",
     "opensuse-15",
     "opensuse-tumbleweed",
+    "oraclelinux-8",
     "ubuntu-2004",
     "ubuntu-2104",
 ]
@@ -129,6 +132,7 @@ DISTRO_DISPLAY_NAMES = {
     "opensuse-15": "Opensuse 15",
     "opensuse-tumbleweed": "Opensuse Tumbleweed",
     "oraclelinux-7": "Oracle Linux 7",
+    "oraclelinux-8": "Oracle Linux 8",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2104": "Ubuntu 21.04",
diff --git a/kitchen.yml b/kitchen.yml
index 0d17d00..7930921 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -113,6 +113,9 @@ platforms:
         - systemctl enable sshd.service
     provisioner:
       salt_bootstrap_options: -MPfq -y -x python3 git %s
+  - name: oraclelinux-8
+    driver_config:
+      run_command: /usr/lib/systemd/systemd
   - name: oraclelinux-7
     driver_config:
       run_command: /usr/lib/systemd/systemd

From 0612b49bd6ba5a3a0f94136e5ff82b76e6adb185 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 25 Jun 2021 23:26:12 +0100
Subject: [PATCH 52/54] feat(rockylinux-8): add CI for platform

Closes #1553.
---
 .github/workflows/main.yml              | 138 ++++++++++++++++++++++++
 .github/workflows/templates/generate.py |   7 ++
 kitchen.yml                             |   4 +
 3 files changed, 149 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 048cd7c..625c034 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4598,6 +4598,144 @@ jobs:
           bundle exec kitchen destroy latest-oraclelinux-8
 
 
+  py3-git-3002-rockylinux-8:
+    name: Rocky 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-rockylinux-8 || bundle exec kitchen create py3-git-3002-rockylinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-rockylinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-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-3000-ubuntu-1804:
     name: Ubuntu 18.04 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 308d271..7b14b5b 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -22,6 +22,7 @@ LINUX_DISTROS = [
     "opensuse-tumbleweed",
     "oraclelinux-7",
     "oraclelinux-8",
+    "rockylinux-8",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2104",
@@ -59,6 +60,7 @@ PY2_BLACKLIST = [
     "opensuse-15",
     "opensuse-tumbleweed",
     "oraclelinux-8",
+    "rockylinux-8",
     "ubuntu-2004",
     "ubuntu-2104",
 ]
@@ -69,12 +71,14 @@ BLACKLIST_3000 = [
     "fedora-34",
     "fedora-35",
     "opensuse-tumbleweed",
+    "rockylinux-8",
     "ubuntu-2004",
     "ubuntu-2104",
 ]
 
 BLACKLIST_3001 = [
     "debian-11",
+    "rockylinux-8",
     "ubuntu-2104",
 ]
 
@@ -82,6 +86,7 @@ BLACKLIST_3001_0 = [
     "debian-11",
     "gentoo",
     "gentoo-systemd",
+    "rockylinux-8",
     "ubuntu-2104",
 ]
 
@@ -89,6 +94,7 @@ BLACKLIST_3002_0 = [
     "debian-11",
     "gentoo",
     "gentoo-systemd",
+    "rockylinux-8",
     "ubuntu-2104",
 ]
 
@@ -133,6 +139,7 @@ DISTRO_DISPLAY_NAMES = {
     "opensuse-tumbleweed": "Opensuse Tumbleweed",
     "oraclelinux-7": "Oracle Linux 7",
     "oraclelinux-8": "Oracle Linux 8",
+    "rockylinux-8": "Rocky Linux 8",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2104": "Ubuntu 21.04",
diff --git a/kitchen.yml b/kitchen.yml
index 7930921..bd17be0 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -119,6 +119,10 @@ platforms:
   - name: oraclelinux-7
     driver_config:
       run_command: /usr/lib/systemd/systemd
+  - name: rockylinux-8
+    driver_config:
+      image: rockylinux/rockylinux
+      run_command: /usr/lib/systemd/systemd
   - name: ubuntu-21.04
     driver_config:
       run_command: /lib/systemd/systemd

From 4777897146071c1fe213d7ce63ce8b3e7b519a29 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 25 Jun 2021 23:28:38 +0100
Subject: [PATCH 53/54] feat(almalinux-8): add CI for platform

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 625c034..445861b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,6 +44,144 @@ jobs:
           shellcheck -s sh -f tty bootstrap-salt.sh
 
 
+  py3-git-3002-almalinux-8:
+    name: AlmaLinux 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-almalinux-8 || bundle exec kitchen create py3-git-3002-almalinux-8
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-3002-almalinux-8
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-3002-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-3000-amazon-2:
     name: Amazon 2 v3000 Py3 Stable
     runs-on: ubuntu-latest
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 7b14b5b..e0cb317 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -6,6 +6,7 @@ import datetime
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 LINUX_DISTROS = [
+    "almalinux-8",
     "amazon-2",
     "arch",
     "centos-7",
@@ -49,6 +50,7 @@ STABLE_DISTROS = [
 ]
 
 PY2_BLACKLIST = [
+    "almalinux-8",
     "centos-8",
     "debian-10",
     "debian-11",
@@ -66,6 +68,7 @@ PY2_BLACKLIST = [
 ]
 
 BLACKLIST_3000 = [
+    "almalinux-8",
     "debian-11",
     "fedora-33",
     "fedora-34",
@@ -77,12 +80,14 @@ BLACKLIST_3000 = [
 ]
 
 BLACKLIST_3001 = [
+    "almalinux-8",
     "debian-11",
     "rockylinux-8",
     "ubuntu-2104",
 ]
 
 BLACKLIST_3001_0 = [
+    "almalinux-8",
     "debian-11",
     "gentoo",
     "gentoo-systemd",
@@ -91,6 +96,7 @@ BLACKLIST_3001_0 = [
 ]
 
 BLACKLIST_3002_0 = [
+    "almalinux-8",
     "debian-11",
     "gentoo",
     "gentoo-systemd",
@@ -123,6 +129,7 @@ STABLE_BRANCH_BLACKLIST = []
 LATEST_PKG_BLACKLIST = []
 
 DISTRO_DISPLAY_NAMES = {
+    "almalinux-8": "AlmaLinux 8",
     "amazon-2": "Amazon 2",
     "arch": "Arch",
     "centos-7": "CentOS 7",
diff --git a/kitchen.yml b/kitchen.yml
index bd17be0..1181470 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -28,6 +28,9 @@ provisioner:
     sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
 
 platforms:
+  - name: almalinux-8
+    driver_config:
+      run_command: /usr/lib/systemd/systemd
   - name: amazon-2
     driver_config:
       image: amazonlinux:2

From e40c093c56bfaddeeb6d9955e6795ac45ae74a5b Mon Sep 17 00:00:00 2001
From: krionbsd <krion@freebsd.org>
Date: Wed, 23 Jun 2021 20:00:38 +0200
Subject: [PATCH 54/54] Update version for new release

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

diff --git a/ChangeLog b/ChangeLog
index 05b738c..83030cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Version TBD (In Progress on the Develop Branch):
 
+Version 2021.06.23:
+	* Use salt.list instead of saltstack.list (bryceml) #1563
+	* Use fetch_url function for curl (xeacott) #1562
+	* Add Ubuntu 21.04 support (krionbsd) #1559
+	* Remove python2-futures package for ArchLinux (myii) #1546
+
 Version 2020.03.02:
 	* Debian 11 (bullseye/testing) support using Debian 10 packages (jpacura, bryceml) #1514
 	* Fix bootstrap on Gentoo (ijansky) #1516 #1518
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 40da0c1..ef7f8f5 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2021.03.02"
+__ScriptVersion="2021.06.23"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"