From f2e4cca09abf54b3903c18fc7d4395a57c3226ce Mon Sep 17 00:00:00 2001 From: s0undt3ch Date: Wed, 30 Jun 2021 09:54:48 +0000 Subject: [PATCH 01/16] Update README.rst with 2021.06.23 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index c0fba69..12dea2a 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.06.23: ``35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665`` - 2021.03.02: ``91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758`` - 2020.10.20: ``b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2`` - 2020.10.19: ``f6c3e2c52f98d115809044b09062219369957caf30228b594033f0543e202c52`` From 1e0109927e78faeffa14158ea1255cc75cce8124 Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Wed, 30 Jun 2021 16:02:25 +0000 Subject: [PATCH 02/16] remove .0 jobs for amazon-2 since they will not pass until 3004.0 comes out --- .github/workflows/main.yml | 92 ------------------------- .github/workflows/templates/generate.py | 2 + 2 files changed, 2 insertions(+), 92 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 445861b..2656a77 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -366,52 +366,6 @@ jobs: bundle exec kitchen destroy py3-git-3001-amazon-2 - py3-stable-3001-0-amazon-2: - name: Amazon 2 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-amazon-2 || bundle exec kitchen create py3-stable-3001-0-amazon-2 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3001-0-amazon-2 - - - name: Destroy Test Container - if: always() - run: | - 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 @@ -504,52 +458,6 @@ jobs: 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 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index e0cb317..ac3b40b 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -88,6 +88,7 @@ BLACKLIST_3001 = [ BLACKLIST_3001_0 = [ "almalinux-8", + "amazon-2", "debian-11", "gentoo", "gentoo-systemd", @@ -97,6 +98,7 @@ BLACKLIST_3001_0 = [ BLACKLIST_3002_0 = [ "almalinux-8", + "amazon-2", "debian-11", "gentoo", "gentoo-systemd", From fbb55eda4ba89c6822e3a8e3c6e369b0d0fb1969 Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Wed, 30 Jun 2021 16:10:53 +0000 Subject: [PATCH 03/16] add salt 3003 tests --- .github/workflows/kitchen.vagrant.yml | 4 + .github/workflows/kitchen.windows.yml | 2 + .github/workflows/main-branch-only.yml | 276 ++++ .github/workflows/main.yml | 1840 +++++++++++++++++++++++ .github/workflows/templates/generate.py | 11 + kitchen.windows.yml | 3 + kitchen.yml | 32 + 7 files changed, 2168 insertions(+) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 92e5e9c..18e8f47 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -53,6 +53,10 @@ jobs: - py3-git-3002-freebsd-122 - py3-git-3002-freebsd-114 # - py3-git-3002-openbsd-6 + - py3-git-3003-freebsd-130 + - py3-git-3003-freebsd-122 + - py3-git-3003-freebsd-114 + # - py3-git-3003-openbsd-6 - py3-git-master-freebsd-130 - py3-git-master-freebsd-122 - py3-git-master-freebsd-114 diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml index 4329d43..8906328 100644 --- a/.github/workflows/kitchen.windows.yml +++ b/.github/workflows/kitchen.windows.yml @@ -46,6 +46,7 @@ jobs: instance: - py3-stable-3001-windows-2019 - py3-stable-3002-windows-2019 + - py3-stable-3003-windows-2019 - latest-windows-2019 steps: - name: 'Check out code' @@ -102,6 +103,7 @@ jobs: instance: - py3-stable-3001-windows-2016 - py3-stable-3002-windows-2016 + - py3-stable-3003-windows-2016 - latest-windows-2016 steps: - name: 'Check out code' diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml index 8134361..981c882 100644 --- a/.github/workflows/main-branch-only.yml +++ b/.github/workflows/main-branch-only.yml @@ -284,6 +284,144 @@ jobs: bundle exec kitchen destroy py3-git-3002-gentoo + py3-stable-3003-gentoo: + name: Gentoo v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 90 + + + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-gentoo || bundle exec kitchen create py3-stable-3003-gentoo + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-gentoo + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-gentoo + + + py3-git-3003-gentoo: + name: Gentoo v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 90 + + + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-gentoo || bundle exec kitchen create py3-git-3003-gentoo + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-gentoo + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-gentoo + + + py3-stable-3003-0-gentoo: + name: Gentoo v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 90 + + + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-gentoo || bundle exec kitchen create py3-stable-3003-0-gentoo + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-gentoo + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-gentoo + + py3-git-master-gentoo: name: Gentoo Master Py3 Git runs-on: ubuntu-latest @@ -652,6 +790,144 @@ jobs: bundle exec kitchen destroy py3-git-3002-gentoo-systemd + py3-stable-3003-gentoo-systemd: + name: Gentoo (systemd) v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 90 + + + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-gentoo-systemd || bundle exec kitchen create py3-stable-3003-gentoo-systemd + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-gentoo-systemd + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-gentoo-systemd + + + py3-git-3003-gentoo-systemd: + name: Gentoo (systemd) v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 90 + + + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-gentoo-systemd || bundle exec kitchen create py3-git-3003-gentoo-systemd + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-gentoo-systemd + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-gentoo-systemd + + + py3-stable-3003-0-gentoo-systemd: + name: Gentoo (systemd) v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 90 + + + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-gentoo-systemd || bundle exec kitchen create py3-stable-3003-0-gentoo-systemd + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-gentoo-systemd + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-gentoo-systemd + + py3-git-master-gentoo-systemd: name: Gentoo (systemd) Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2656a77..c745705 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,6 +90,52 @@ jobs: bundle exec kitchen destroy py3-git-3002-almalinux-8 + py3-git-3003-almalinux-8: + name: AlmaLinux 8 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-almalinux-8 || bundle exec kitchen create py3-git-3003-almalinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-almalinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-almalinux-8 + + py3-git-master-almalinux-8: name: AlmaLinux 8 Master Py3 Git runs-on: ubuntu-latest @@ -458,6 +504,98 @@ jobs: bundle exec kitchen destroy py3-git-3002-amazon-2 + py3-stable-3003-amazon-2: + name: Amazon 2 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-amazon-2 || bundle exec kitchen create py3-stable-3003-amazon-2 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-amazon-2 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-amazon-2 + + + py3-git-3003-amazon-2: + name: Amazon 2 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-amazon-2 || bundle exec kitchen create py3-git-3003-amazon-2 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-amazon-2 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-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-3002-arch + py3-git-3003-arch: + name: Arch v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-arch || bundle exec kitchen create py3-git-3003-arch + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-arch + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-arch + + py3-git-master-arch: name: Arch Master Py3 Git runs-on: ubuntu-latest @@ -1102,6 +1286,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-centos-7 + py3-stable-3003-centos-7: + name: CentOS 7 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-centos-7 || bundle exec kitchen create py3-stable-3003-centos-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-centos-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-centos-7 + + + py3-git-3003-centos-7: + name: CentOS 7 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-centos-7 || bundle exec kitchen create py3-git-3003-centos-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-centos-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-centos-7 + + + py3-stable-3003-0-centos-7: + name: CentOS 7 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-centos-7 || bundle exec kitchen create py3-stable-3003-0-centos-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-centos-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-centos-7 + + py3-git-master-centos-7: name: CentOS 7 Master Py3 Git runs-on: ubuntu-latest @@ -1562,6 +1884,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-centos-8 + py3-stable-3003-centos-8: + name: CentOS 8 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-centos-8 || bundle exec kitchen create py3-stable-3003-centos-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-centos-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-centos-8 + + + py3-git-3003-centos-8: + name: CentOS 8 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-centos-8 || bundle exec kitchen create py3-git-3003-centos-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-centos-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-centos-8 + + + py3-stable-3003-0-centos-8: + name: CentOS 8 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-centos-8 || bundle exec kitchen create py3-stable-3003-0-centos-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-centos-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-centos-8 + + py3-git-master-centos-8: name: CentOS 8 Master Py3 Git runs-on: ubuntu-latest @@ -2022,6 +2482,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-debian-10 + py3-stable-3003-debian-10: + name: Debian 10 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-debian-10 || bundle exec kitchen create py3-stable-3003-debian-10 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-debian-10 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-debian-10 + + + py3-git-3003-debian-10: + name: Debian 10 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-debian-10 || bundle exec kitchen create py3-git-3003-debian-10 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-debian-10 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-debian-10 + + + py3-stable-3003-0-debian-10: + name: Debian 10 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-debian-10 || bundle exec kitchen create py3-stable-3003-0-debian-10 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-debian-10 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-debian-10 + + py3-git-master-debian-10: name: Debian 10 Master Py3 Git runs-on: ubuntu-latest @@ -2206,6 +2804,144 @@ jobs: bundle exec kitchen destroy py3-git-3002-debian-11 + py3-stable-3003-debian-11: + name: Debian 11 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-debian-11 || bundle exec kitchen create py3-stable-3003-debian-11 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-debian-11 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-debian-11 + + + py3-git-3003-debian-11: + name: Debian 11 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-debian-11 || bundle exec kitchen create py3-git-3003-debian-11 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-debian-11 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-debian-11 + + + py3-stable-3003-0-debian-11: + name: Debian 11 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-debian-11 || bundle exec kitchen create py3-stable-3003-0-debian-11 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-debian-11 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-debian-11 + + py3-git-master-debian-11: name: Debian 11 Master Py3 Git runs-on: ubuntu-latest @@ -2666,6 +3402,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-debian-9 + py3-stable-3003-debian-9: + name: Debian 9 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-debian-9 || bundle exec kitchen create py3-stable-3003-debian-9 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-debian-9 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-debian-9 + + + py3-git-3003-debian-9: + name: Debian 9 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-debian-9 || bundle exec kitchen create py3-git-3003-debian-9 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-debian-9 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-debian-9 + + + py3-stable-3003-0-debian-9: + name: Debian 9 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-debian-9 || bundle exec kitchen create py3-stable-3003-0-debian-9 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-debian-9 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-debian-9 + + py3-git-master-debian-9: name: Debian 9 Master Py3 Git runs-on: ubuntu-latest @@ -2850,6 +3724,52 @@ jobs: bundle exec kitchen destroy py3-git-3002-fedora-33 + py3-git-3003-fedora-33: + name: Fedora 33 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-fedora-33 || bundle exec kitchen create py3-git-3003-fedora-33 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-fedora-33 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-fedora-33 + + py3-git-master-fedora-33: name: Fedora 33 Master Py3 Git runs-on: ubuntu-latest @@ -3034,6 +3954,52 @@ jobs: bundle exec kitchen destroy py3-git-3002-fedora-34 + py3-git-3003-fedora-34: + name: Fedora 34 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-fedora-34 || bundle exec kitchen create py3-git-3003-fedora-34 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-fedora-34 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-fedora-34 + + py3-git-master-fedora-34: name: Fedora 34 Master Py3 Git runs-on: ubuntu-latest @@ -3218,6 +4184,52 @@ jobs: bundle exec kitchen destroy py3-git-3002-fedora-35 + py3-git-3003-fedora-35: + name: Fedora 35 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-fedora-35 || bundle exec kitchen create py3-git-3003-fedora-35 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-fedora-35 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-fedora-35 + + py3-git-master-fedora-35: name: Fedora 35 Master Py3 Git runs-on: ubuntu-latest @@ -3448,6 +4460,52 @@ jobs: bundle exec kitchen destroy py3-git-3002-opensuse-15 + py3-git-3003-opensuse-15: + name: Opensuse 15 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-opensuse-15 || bundle exec kitchen create py3-git-3003-opensuse-15 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-opensuse-15 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-opensuse-15 + + py3-git-master-opensuse-15: name: Opensuse 15 Master Py3 Git runs-on: ubuntu-latest @@ -3632,6 +4690,52 @@ jobs: bundle exec kitchen destroy py3-git-3002-opensuse-tumbleweed + py3-git-3003-opensuse-tumbleweed: + name: Opensuse Tumbleweed v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-opensuse-tumbleweed || bundle exec kitchen create py3-git-3003-opensuse-tumbleweed + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-opensuse-tumbleweed + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-opensuse-tumbleweed + + py3-git-master-opensuse-tumbleweed: name: Opensuse Tumbleweed Master Py3 Git runs-on: ubuntu-latest @@ -4092,6 +5196,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-7 + py3-stable-3003-oraclelinux-7: + name: Oracle Linux 7 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-oraclelinux-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-oraclelinux-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-oraclelinux-7 + + + py3-git-3003-oraclelinux-7: + name: Oracle Linux 7 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-oraclelinux-7 || bundle exec kitchen create py3-git-3003-oraclelinux-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-oraclelinux-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-oraclelinux-7 + + + py3-stable-3003-0-oraclelinux-7: + name: Oracle Linux 7 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-oraclelinux-7 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-oraclelinux-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-7 + + py3-git-master-oraclelinux-7: name: Oracle Linux 7 Master Py3 Git runs-on: ubuntu-latest @@ -4552,6 +5794,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-oraclelinux-8 + py3-stable-3003-oraclelinux-8: + name: Oracle Linux 8 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-oraclelinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-oraclelinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-oraclelinux-8 + + + py3-git-3003-oraclelinux-8: + name: Oracle Linux 8 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-oraclelinux-8 || bundle exec kitchen create py3-git-3003-oraclelinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-oraclelinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-oraclelinux-8 + + + py3-stable-3003-0-oraclelinux-8: + name: Oracle Linux 8 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-oraclelinux-8 || bundle exec kitchen create py3-stable-3003-0-oraclelinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-oraclelinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-oraclelinux-8 + + py3-git-master-oraclelinux-8: name: Oracle Linux 8 Master Py3 Git runs-on: ubuntu-latest @@ -4690,6 +6070,52 @@ jobs: bundle exec kitchen destroy py3-git-3002-rockylinux-8 + py3-git-3003-rockylinux-8: + name: Rocky Linux 8 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-rockylinux-8 || bundle exec kitchen create py3-git-3003-rockylinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-rockylinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-rockylinux-8 + + py3-git-master-rockylinux-8: name: Rocky Linux 8 Master Py3 Git runs-on: ubuntu-latest @@ -5150,6 +6576,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-ubuntu-1804 + py3-stable-3003-ubuntu-1804: + name: Ubuntu 18.04 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-ubuntu-1804 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-ubuntu-1804 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-ubuntu-1804 + + + py3-git-3003-ubuntu-1804: + name: Ubuntu 18.04 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-ubuntu-1804 || bundle exec kitchen create py3-git-3003-ubuntu-1804 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-ubuntu-1804 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-ubuntu-1804 + + + py3-stable-3003-0-ubuntu-1804: + name: Ubuntu 18.04 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-ubuntu-1804 || bundle exec kitchen create py3-stable-3003-0-ubuntu-1804 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-ubuntu-1804 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-ubuntu-1804 + + py3-git-master-ubuntu-1804: name: Ubuntu 18.04 Master Py3 Git runs-on: ubuntu-latest @@ -5518,6 +7082,144 @@ jobs: bundle exec kitchen destroy py3-stable-3002-0-ubuntu-2004 + py3-stable-3003-ubuntu-2004: + name: Ubuntu 20.04 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-ubuntu-2004 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-ubuntu-2004 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-ubuntu-2004 + + + py3-git-3003-ubuntu-2004: + name: Ubuntu 20.04 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-ubuntu-2004 || bundle exec kitchen create py3-git-3003-ubuntu-2004 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-ubuntu-2004 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-ubuntu-2004 + + + py3-stable-3003-0-ubuntu-2004: + name: Ubuntu 20.04 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-ubuntu-2004 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2004 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-ubuntu-2004 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2004 + + py3-git-master-ubuntu-2004: name: Ubuntu 20.04 Master Py3 Git runs-on: ubuntu-latest @@ -5702,6 +7404,144 @@ jobs: bundle exec kitchen destroy py3-git-3002-ubuntu-2104 + py3-stable-3003-ubuntu-2104: + name: Ubuntu 21.04 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-ubuntu-2104 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-ubuntu-2104 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-ubuntu-2104 + + + py3-git-3003-ubuntu-2104: + name: Ubuntu 21.04 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-ubuntu-2104 || bundle exec kitchen create py3-git-3003-ubuntu-2104 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-ubuntu-2104 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-ubuntu-2104 + + + py3-stable-3003-0-ubuntu-2104: + name: Ubuntu 21.04 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-ubuntu-2104 || bundle exec kitchen create py3-stable-3003-0-ubuntu-2104 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-ubuntu-2104 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-ubuntu-2104 + + py3-git-master-ubuntu-2104: name: Ubuntu 21.04 Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index ac3b40b..3978909 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -106,12 +106,18 @@ BLACKLIST_3002_0 = [ "ubuntu-2104", ] +BLACKLIST_3003_0 = [ + "amazon-2", +] + SALT_BRANCHES = [ "3000", "3001", "3001-0", "3002", "3002-0", + "3003", + "3003-0", "master", "latest", ] @@ -122,6 +128,8 @@ BRANCH_DISPLAY_NAMES = { "3001-0": "v3001.0", "3002": "v3002", "3002-0": "v3002.0", + "3003": "v3003", + "3003-0": "v3003.0", "master": "Master", "latest": "Latest", } @@ -270,6 +278,9 @@ def generate_test_jobs(): if branch == "3002-0" and distro in BLACKLIST_3002_0: continue + if branch == "3003-0" and distro in BLACKLIST_3003_0: + continue + if python_version == "py2" and distro in PY2_BLACKLIST: continue diff --git a/kitchen.windows.yml b/kitchen.windows.yml index cfcaa6f..993dbff 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -23,6 +23,9 @@ suites: - name: py3-stable-3002 provisioner: salt_version: 3002 + - name: py3-stable-3003 + provisioner: + salt_version: 3003 - name: latest provisioner: salt_version: latest diff --git a/kitchen.yml b/kitchen.yml index 1181470..6738ee1 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -198,6 +198,10 @@ suites: provisioner: salt_version: 3002 salt_bootstrap_options: -x python3 -MPfq git %s + - name: py3-git-3003 + provisioner: + salt_version: 3003 + salt_bootstrap_options: -x python3 -MPfq git %s - name: py3-stable-3000 provisioner: salt_version: 3000 @@ -260,6 +264,22 @@ suites: - freebsd-122 - freebsd-114 - openbsd-6 + - name: py3-stable-3003-0 + provisioner: + salt_version: 3003 + salt_bootstrap_options: -x python3 -MP stable 3003.0 + excludes: + - opensuse-15 + - opensuse-tumbleweed + - debian-11 + - fedora-33 + - arch + - gentoo + - gentoo-systemd + - freebsd-130 + - freebsd-122 + - freebsd-114 + - openbsd-6 - name: py3-stable-3002 provisioner: salt_version: 3002 @@ -272,6 +292,18 @@ suites: - freebsd-122 - freebsd-114 - openbsd-6 + - name: py3-stable-3003 + provisioner: + salt_version: 3003 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - opensuse-15 + - opensuse-tumbleweed + - arch + - freebsd-130 + - freebsd-122 + - freebsd-114 + - openbsd-6 - name: py3-git-master provisioner: salt_version: master From c61820d41023b15dd5b99fd6cd6b5c407b239bbf Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Thu, 1 Jul 2021 18:58:45 +0000 Subject: [PATCH 04/16] more changes for 3003 tests --- .github/workflows/kitchen.vagrant.yml | 6 - .github/workflows/main.yml | 184 ------------------------ .github/workflows/templates/generate.py | 16 +++ kitchen.vagrant.yml | 3 - kitchen.yml | 11 -- 5 files changed, 16 insertions(+), 204 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 18e8f47..9fedd93 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -43,27 +43,21 @@ jobs: 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-3003-freebsd-130 - py3-git-3003-freebsd-122 - - py3-git-3003-freebsd-114 # - py3-git-3003-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' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c745705..4041f7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,98 +44,6 @@ 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-3003-almalinux-8: - name: AlmaLinux 8 v3003 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3003-almalinux-8 || bundle exec kitchen create py3-git-3003-almalinux-8 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3003-almalinux-8 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3003-almalinux-8 - - py3-git-master-almalinux-8: name: AlmaLinux 8 Master Py3 Git runs-on: ubuntu-latest @@ -6024,98 +5932,6 @@ 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-3003-rockylinux-8: - name: Rocky Linux 8 v3003 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3003-rockylinux-8 || bundle exec kitchen create py3-git-3003-rockylinux-8 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3003-rockylinux-8 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3003-rockylinux-8 - - py3-git-master-rockylinux-8: name: Rocky Linux 8 Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 3978909..fee44c9 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -96,6 +96,11 @@ BLACKLIST_3001_0 = [ "ubuntu-2104", ] +BLACKLIST_3002 = [ + "almalinux-8", + "rockylinux-8", +] + BLACKLIST_3002_0 = [ "almalinux-8", "amazon-2", @@ -106,6 +111,11 @@ BLACKLIST_3002_0 = [ "ubuntu-2104", ] +BLACKLIST_3003 = [ + "almalinux-8", + "rockylinux-8", +] + BLACKLIST_3003_0 = [ "amazon-2", ] @@ -275,9 +285,15 @@ def generate_test_jobs(): if branch == "3001-0" and distro in BLACKLIST_3001_0: continue + if branch == "3002" and distro in BLACKLIST_3002: + continue + if branch == "3002-0" and distro in BLACKLIST_3002_0: continue + if branch == "3003" and distro in BLACKLIST_3003: + continue + if branch == "3003-0" and distro in BLACKLIST_3003_0: continue diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index 7c80b54..1e5a4c8 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -27,9 +27,6 @@ platforms: - 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 diff --git a/kitchen.yml b/kitchen.yml index 6738ee1..b96c613 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -147,7 +147,6 @@ suites: - gentoo-systemd - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py2-git-master provisioner: @@ -159,7 +158,6 @@ suites: - gentoo-systemd - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py2-stable-3000 provisioner: @@ -178,7 +176,6 @@ suites: - ubuntu-2104 - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-git-3000 @@ -215,7 +212,6 @@ suites: - ubuntu-2104 - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-stable-3001-0 provisioner: @@ -232,7 +228,6 @@ suites: - ubuntu-2104 - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-stable-3001 provisioner: @@ -246,7 +241,6 @@ suites: - ubuntu-2104 - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-stable-3002-0 provisioner: @@ -262,7 +256,6 @@ suites: - gentoo-systemd - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-stable-3003-0 provisioner: @@ -271,14 +264,12 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - debian-11 - fedora-33 - arch - gentoo - gentoo-systemd - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-stable-3002 provisioner: @@ -290,7 +281,6 @@ suites: - arch - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-stable-3003 provisioner: @@ -302,7 +292,6 @@ suites: - arch - freebsd-130 - freebsd-122 - - freebsd-114 - openbsd-6 - name: py3-git-master provisioner: From 095a7abf0712511c2d0fe831a6433a901ae04d7e Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Thu, 1 Jul 2021 21:14:55 +0000 Subject: [PATCH 05/16] more changes for 3003 tests: part 2 --- .github/workflows/main-branch-only.yml | 92 ------------------------- .github/workflows/templates/generate.py | 4 ++ 2 files changed, 4 insertions(+), 92 deletions(-) diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml index 981c882..b23b392 100644 --- a/.github/workflows/main-branch-only.yml +++ b/.github/workflows/main-branch-only.yml @@ -376,52 +376,6 @@ jobs: bundle exec kitchen destroy py3-git-3003-gentoo - py3-stable-3003-0-gentoo: - name: Gentoo v3003.0 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 90 - - - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3003-0-gentoo || bundle exec kitchen create py3-stable-3003-0-gentoo - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3003-0-gentoo - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3003-0-gentoo - - py3-git-master-gentoo: name: Gentoo Master Py3 Git runs-on: ubuntu-latest @@ -882,52 +836,6 @@ jobs: bundle exec kitchen destroy py3-git-3003-gentoo-systemd - py3-stable-3003-0-gentoo-systemd: - name: Gentoo (systemd) v3003.0 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 90 - - - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3003-0-gentoo-systemd || bundle exec kitchen create py3-stable-3003-0-gentoo-systemd - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3003-0-gentoo-systemd - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3003-0-gentoo-systemd - - py3-git-master-gentoo-systemd: name: Gentoo (systemd) Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index fee44c9..c7408b9 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -117,7 +117,11 @@ BLACKLIST_3003 = [ ] BLACKLIST_3003_0 = [ + "almalinux-8", "amazon-2", + "gentoo", + "gentoo-systemd", + "rockylinux-8", ] SALT_BRANCHES = [ From 3158d15d2543b4a0bea0011983f6482783831895 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Thu, 15 Jul 2021 20:16:44 +0200 Subject: [PATCH 06/16] Reflect changes after bumping Python to 3.8 in FreeBSD --- .github/workflows/kitchen.vagrant.yml | 4 ++-- bootstrap-salt.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 9fedd93..9dd435a 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -41,8 +41,8 @@ jobs: fail-fast: false matrix: instance: - - py3-git-3000-freebsd-130 - - py3-git-3000-freebsd-122 + # - py3-git-3000-freebsd-130 + # - py3-git-3000-freebsd-122 # - py3-git-3000-openbsd-6 - py3-git-3001-freebsd-130 - py3-git-3001-freebsd-122 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ef7f8f5..fe099c5 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5843,15 +5843,15 @@ install_freebsd_git_deps() { if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then - SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py37-salt) + SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py38-salt) # shellcheck disable=SC2086 /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 + /usr/local/sbin/pkg install -y py38-requests || return 1 + /usr/local/sbin/pkg install -y py38-tornado4 || return 1 else - /usr/local/sbin/pkg install -y python py37-pip py37-setuptools libzmq4 libunwind || return 1 + /usr/local/sbin/pkg install -y python py38-pip py38-setuptools libzmq4 libunwind || return 1 fi echodebug "Adapting paths to FreeBSD" @@ -5897,7 +5897,7 @@ install_freebsd_stable() { # installing latest version of salt from FreeBSD CURRENT ports repo # # shellcheck disable=SC2086 - /usr/local/sbin/pkg install -y py37-salt || return 1 + /usr/local/sbin/pkg install -y py38-salt || return 1 return 0 } From f80e31174745366314eea8300e323ab2545d03a0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 08:47:55 +0100 Subject: [PATCH 07/16] refactor(kitchen): provide general `run_command` --- kitchen.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index b96c613..e28f1da 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -9,6 +9,7 @@ driver: - sys_admin disable_upstart: false use_internal_docker_network: false + run_command: /usr/lib/systemd/systemd provisioner: name: salt_solo @@ -29,30 +30,22 @@ provisioner: platforms: - name: almalinux-8 - driver_config: - run_command: /usr/lib/systemd/systemd - name: amazon-2 driver_config: image: amazonlinux:2 platform: rhel - run_command: /usr/lib/systemd/systemd provision_command: - yum -y install procps-ng - name: arch driver_config: image: archlinux/archlinux - run_command: /usr/lib/systemd/systemd provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd provisioner: salt_bootstrap_options: -MPfq -D -y -x python2 git %s - name: centos-8 - driver_config: - run_command: /usr/lib/systemd/systemd - name: centos-7 - driver_config: - run_command: /usr/lib/systemd/systemd - name: debian-9 driver_config: run_command: /lib/systemd/systemd @@ -66,21 +59,18 @@ platforms: - 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: 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 @@ -99,7 +89,6 @@ platforms: - name: opensuse-15 driver_config: image: opensuse/leap:15.1 - 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 @@ -109,7 +98,6 @@ platforms: - 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 @@ -117,15 +105,10 @@ platforms: 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 - 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 d37806dce9680a82d82c851e79f37a848eb46f16 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 08:49:12 +0100 Subject: [PATCH 08/16] refactor(kitchen): remove unnecessary `image` entries (Fedora) --- kitchen.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index e28f1da..ee6744b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -58,19 +58,16 @@ platforms: run_command: /lib/systemd/systemd - name: fedora-33 driver_config: - image: fedora:33 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 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 provision_command: - dnf -y install procps-ng - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config From 075e0612624cf4ba04a5aec5e6a59cf6eb6264b0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 08:49:41 +0100 Subject: [PATCH 09/16] feat(kitchen): update to openSUSE Leap 15.3 --- kitchen.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index ee6744b..fce5a5a 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -85,10 +85,10 @@ platforms: - systemctl enable sshd.service - name: opensuse-15 driver_config: - image: opensuse/leap:15.1 + image: opensuse/leap:15.3 provision_command: - zypper --non-interactive install --auto-agree-with-licenses dbus-1 - - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl + - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd - systemctl enable sshd.service provisioner: salt_bootstrap_options: -MPfq -y -x python2 git %s From e5e5098745eb030ebb6a7985882d634df03874a4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 08:51:03 +0100 Subject: [PATCH 10/16] refactor(kitchen): use `driver` instead of `driver_config` * https://github.com/test-kitchen/kitchen-azurerm/issues/69 * https://github.com/test-kitchen/kitchen-azurerm/commit/55b768d0b3a32492c5f29b70e9490dc0be9f9570 --- kitchen.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index fce5a5a..8638703 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -31,13 +31,13 @@ provisioner: platforms: - name: almalinux-8 - name: amazon-2 - driver_config: + driver: image: amazonlinux:2 platform: rhel provision_command: - yum -y install procps-ng - name: arch - driver_config: + driver: image: archlinux/archlinux provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which @@ -47,44 +47,44 @@ platforms: - name: centos-8 - name: centos-7 - name: debian-9 - driver_config: + driver: run_command: /lib/systemd/systemd - name: debian-10 - driver_config: + driver: run_command: /lib/systemd/systemd - name: debian-11 - driver_config: + driver: image: debian:bullseye run_command: /lib/systemd/systemd - name: fedora-33 - driver_config: + driver: 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: + driver: 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: + driver: provision_command: - dnf -y install procps-ng - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config - name: gentoo - driver_config: + driver: image: gentoo/stage3:latest run_command: /sbin/init provision_command: - rc-update add sshd default - name: gentoo-systemd - driver_config: + driver: image: gentoo/stage3:systemd run_command: /lib/systemd/systemd provision_command: - systemctl enable sshd.service - name: opensuse-15 - driver_config: + driver: image: opensuse/leap:15.3 provision_command: - zypper --non-interactive install --auto-agree-with-licenses dbus-1 @@ -93,7 +93,7 @@ platforms: provisioner: salt_bootstrap_options: -MPfq -y -x python2 git %s - name: opensuse-tumbleweed - driver_config: + driver: image: opensuse/tumbleweed:latest provision_command: - zypper --non-interactive install --auto-agree-with-licenses dbus-1 @@ -104,16 +104,16 @@ platforms: - name: oraclelinux-8 - name: oraclelinux-7 - name: rockylinux-8 - driver_config: + driver: image: rockylinux/rockylinux - name: ubuntu-21.04 - driver_config: + driver: run_command: /lib/systemd/systemd - name: ubuntu-20.04 - driver_config: + driver: run_command: /lib/systemd/systemd - name: ubuntu-18.04 - driver_config: + driver: run_command: /lib/systemd/systemd suites: From 7c56c504bf0293c26ea83fccdbde18802de5ef39 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 09:03:13 +0100 Subject: [PATCH 11/16] feat(kitchen): remove unnecessary platform `salt_bootstrap_options` --- kitchen.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index 8638703..f38ac39 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -42,8 +42,6 @@ platforms: provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd - provisioner: - salt_bootstrap_options: -MPfq -D -y -x python2 git %s - name: centos-8 - name: centos-7 - name: debian-9 @@ -90,8 +88,6 @@ platforms: - 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 python2 git %s - name: opensuse-tumbleweed driver: image: opensuse/tumbleweed:latest @@ -99,8 +95,6 @@ platforms: - 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: oraclelinux-8 - name: oraclelinux-7 - name: rockylinux-8 From 3690eeec50199954522e76c33fc7d49fc620fabf Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 09:08:02 +0100 Subject: [PATCH 12/16] refactor(kitchen): use YAML node anchors to minimise duplication --- kitchen.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index f38ac39..c707c3f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -56,19 +56,15 @@ platforms: run_command: /lib/systemd/systemd - name: fedora-33 driver: - provision_command: + provision_command: &fedora_provision_command - dnf -y install procps-ng - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config - name: fedora-34 driver: - provision_command: - - dnf -y install procps-ng - - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config + provision_command: *fedora_provision_command - name: fedora-35 driver: - provision_command: - - dnf -y install procps-ng - - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config + provision_command: *fedora_provision_command - name: gentoo driver: image: gentoo/stage3:latest @@ -84,17 +80,14 @@ platforms: - name: opensuse-15 driver: image: opensuse/leap:15.3 - provision_command: + provision_command: &opensuse_provision_command - zypper --non-interactive install --auto-agree-with-licenses dbus-1 - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd - systemctl enable sshd.service - name: opensuse-tumbleweed driver: image: opensuse/tumbleweed:latest - provision_command: - - zypper --non-interactive install --auto-agree-with-licenses dbus-1 - - zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd - - systemctl enable sshd.service + provision_command: *opensuse_provision_command - name: oraclelinux-8 - name: oraclelinux-7 - name: rockylinux-8 From 6c8f608e07dd02c52dce94066e42e2cbcd43acf1 Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Fri, 23 Jul 2021 19:31:17 +0000 Subject: [PATCH 13/16] update unsupported versions --- bootstrap-salt.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index fe099c5..e55b672 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1642,8 +1642,8 @@ __check_end_of_life_versions() { ;; centos) - # CentOS versions lower than 6 are no longer supported - if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then + # CentOS versions lower than 7 are no longer supported + if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " http://wiki.centos.org/Download" @@ -1652,8 +1652,8 @@ __check_end_of_life_versions() { ;; red_hat*linux) - # Red Hat (Enterprise) Linux versions lower than 6 are no longer supported - if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then + # Red Hat (Enterprise) Linux versions lower than 7 are no longer supported + if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " https://access.redhat.com/support/policy/updates/errata/" @@ -1662,8 +1662,8 @@ __check_end_of_life_versions() { ;; oracle*linux) - # Oracle Linux versions lower than 6 are no longer supported - if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then + # Oracle Linux versions lower than 7 are no longer supported + if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " http://www.oracle.com/us/support/library/elsp-lifetime-069338.pdf" @@ -1672,8 +1672,8 @@ __check_end_of_life_versions() { ;; scientific*linux) - # Scientific Linux versions lower than 6 are no longer supported - if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then + # Scientific Linux versions lower than 7 are no longer supported + if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " https://www.scientificlinux.org/downloads/sl-versions/" @@ -1682,8 +1682,8 @@ __check_end_of_life_versions() { ;; cloud*linux) - # Cloud Linux versions lower than 6 are no longer supported - if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then + # Cloud Linux versions lower than 7 are no longer supported + if [ "$DISTRO_MAJOR_VERSION" -lt 7 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " https://docs.cloudlinux.com/index.html?cloudlinux_life-cycle.html" @@ -1692,9 +1692,9 @@ __check_end_of_life_versions() { ;; amazon*linux*ami) - # Amazon Linux versions lower than 2012.0X no longer supported + # Amazon Linux versions 2018.XX and lower no longer supported # Except for Amazon Linux 2, which reset the major version counter - if [ "$DISTRO_MAJOR_VERSION" -lt 2012 ] && [ "$DISTRO_MAJOR_VERSION" -gt 10 ]; then + if [ "$DISTRO_MAJOR_VERSION" -le 2018 ] && [ "$DISTRO_MAJOR_VERSION" -gt 10 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " https://aws.amazon.com/amazon-linux-ami/" From 8318f8071ae4e405440deca870cb3dcb3655731d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 16 Aug 2021 08:13:08 +0100 Subject: [PATCH 14/16] ci(almalinux-8): add testing for `3003` --- .github/workflows/main.yml | 138 ++++++++++++++++++++++++ .github/workflows/templates/generate.py | 3 +- 2 files changed, 139 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4041f7b..1d345a8 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-stable-3003-almalinux-8: + name: AlmaLinux 8 v3003 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-almalinux-8 || bundle exec kitchen create py3-stable-3003-almalinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-almalinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-almalinux-8 + + + py3-git-3003-almalinux-8: + name: AlmaLinux 8 v3003 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3003-almalinux-8 || bundle exec kitchen create py3-git-3003-almalinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3003-almalinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3003-almalinux-8 + + + py3-stable-3003-0-almalinux-8: + name: AlmaLinux 8 v3003.0 Py3 Stable + runs-on: ubuntu-latest + timeout-minutes: 20 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-stable-3003-0-almalinux-8 || bundle exec kitchen create py3-stable-3003-0-almalinux-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3003-0-almalinux-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3003-0-almalinux-8 + + py3-git-master-almalinux-8: name: AlmaLinux 8 Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index c7408b9..f0c9f54 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -31,6 +31,7 @@ LINUX_DISTROS = [ OSX = WINDOWS = [] STABLE_DISTROS = [ + "almalinux-8", "amazon-2", "centos-7", "centos-8", @@ -112,12 +113,10 @@ BLACKLIST_3002_0 = [ ] BLACKLIST_3003 = [ - "almalinux-8", "rockylinux-8", ] BLACKLIST_3003_0 = [ - "almalinux-8", "amazon-2", "gentoo", "gentoo-systemd", From 93ba835aaf275e2febbd25a60eed69da510641c5 Mon Sep 17 00:00:00 2001 From: Ari Maniatis Date: Thu, 19 Aug 2021 12:11:09 +1000 Subject: [PATCH 15/16] Point to how to use a custom version of this script This information was incredibly hard to find since it is not linked from anywhere. --- README.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.rst b/README.rst index 12dea2a..3be7ce2 100644 --- a/README.rst +++ b/README.rst @@ -528,6 +528,23 @@ UNIX systems - SmartOS (2015Q4 and later) + +Using a custom salt bootstrap +----------------------------- + +By default the ``salt-cloud -p`` provisioning command will use the latest release from this +repository to bootstrap new minions. If + +- your needs are not met by that script, +- you want to lock salt bootstrap to a specific release, or +- you want to use an unreleased development version of this script + +you can add your bootstrap-salt script to your salt cloud configuration and point to it with the +``script`` attribute. + +`Read more`: https://docs.saltproject.io/en/latest/topics/cloud/deploy.html + + Unsupported Distributions ------------------------- From 97a1e11141ba4e10eb354638acc30150c65b88ef Mon Sep 17 00:00:00 2001 From: krionbsd Date: Thu, 19 Aug 2021 17:56:24 +0200 Subject: [PATCH 16/16] Update version for new release --- AUTHORS.rst | 1 + ChangeLog | 5 +++++ bootstrap-salt.sh | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 0499fcc..3424e38 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -20,6 +20,7 @@ Andrew Dean ndrwdn ndrwdn@gmail.com Andy Boff caelor github@plek.me.uk Angelo Gründler plueschopath angelo.gruendler@w1r3.net Ari Aosved devaos ari.aosved@gmail.com +Ari Maniatis ari ari@ish.com.au Ashok Raja R ashokrajar ashokrajar@users.noreply.github.com Beau Hargis beaucephus beau@customermobile.com Benjamin Drung bdrung bdrung@debian.org diff --git a/ChangeLog b/ChangeLog index 83030cd..c40e1d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Version TBD (In Progress on the Develop Branch): +Version 2021.08.19: + * Update README with instructions to use salt-bootstrap custom version (ari) #1580 + * Remove unsupported versions (bryceml) #1578 + * Update FreeBSD default Python version to 3.8 (myii) #1574 + Version 2021.06.23: * Use salt.list instead of saltstack.list (bryceml) #1563 * Use fetch_url function for curl (xeacott) #1562 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index e55b672..cb9b3d7 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2021.06.23" +__ScriptVersion="2021.08.19" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"