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