From 72de037c8560c8771090bdee6dfc0719e8ecc8b7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 7 Jun 2022 06:29:28 +0100 Subject: [PATCH 1/3] ci(kitchen.macos.yml): fix `macOS` name (align to current branding) https://en.wikipedia.org/wiki/MacOS > Apple shortened the name to "OS X" in 2012 and then changed it to > "macOS" in 2016 to align with the branding of Apple's other operating > systems, iOS, watchOS, and tvOS. --- .github/workflows/kitchen.macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kitchen.macos.yml b/.github/workflows/kitchen.macos.yml index 6ec70d6..d718976 100644 --- a/.github/workflows/kitchen.macos.yml +++ b/.github/workflows/kitchen.macos.yml @@ -1,6 +1,6 @@ # yamllint disable rule:line-length --- -name: 'Kitchen (MacOS)' +name: 'Kitchen (macOS)' 'on': ['push', 'pull_request'] env: From 3265e88e29de806baa1cc52e60ebd0524012ff30 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 7 Jun 2022 06:29:33 +0100 Subject: [PATCH 2/3] ci: remove `fedora-34` (EOL) * https://fedorapeople.org/groups/schedule/f-34/f-34-all-tasks.html - See last entry for `EOL`: Wed 2022-06-01 --- .github/workflows/main.yml | 92 ------------------------- .github/workflows/templates/generate.py | 9 --- kitchen.yml | 5 +- 3 files changed, 1 insertion(+), 105 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0deede8..69030d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2025,98 +2025,6 @@ jobs: bundle exec kitchen destroy latest-debian-9 - py3-git-master-fedora-34: - name: Fedora 34 Master Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-master-fedora-34 || bundle exec kitchen create py3-git-master-fedora-34 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-master-fedora-34 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-master-fedora-34 - - - latest-fedora-34: - name: Fedora 34 Latest packaged release - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create latest-fedora-34 || bundle exec kitchen create latest-fedora-34 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify latest-fedora-34 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy latest-fedora-34 - - py3-git-master-fedora-35: name: Fedora 35 Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 2b1cc1f..1b70af3 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -14,7 +14,6 @@ LINUX_DISTROS = [ "debian-10", "debian-11", "debian-9", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -40,7 +39,6 @@ STABLE_DISTROS = [ "debian-10", "debian-11", "debian-9", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -61,7 +59,6 @@ BLACKLIST_3002 = [ "arch", "centos-stream8", "debian-11", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -79,7 +76,6 @@ BLACKLIST_GIT_3002 = [ "centos-stream8", "debian-10", "debian-11", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -95,7 +91,6 @@ BLACKLIST_GIT_3002 = [ BLACKLIST_3003 = [ "arch", "debian-11", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -111,7 +106,6 @@ BLACKLIST_GIT_3003 = [ "arch", "debian-10", "debian-11", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -126,7 +120,6 @@ BLACKLIST_GIT_3003 = [ BLACKLIST_3004 = [ "arch", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -140,7 +133,6 @@ BLACKLIST_GIT_3004 = [ "arch", "debian-10", "debian-11", - "fedora-34", "fedora-35", "fedora-36", "gentoo", @@ -181,7 +173,6 @@ DISTRO_DISPLAY_NAMES = { "debian-10": "Debian 10", "debian-11": "Debian 11", "debian-9": "Debian 9", - "fedora-34": "Fedora 34", "fedora-35": "Fedora 35", "fedora-36": "Fedora 36", "gentoo": "Gentoo", diff --git a/kitchen.yml b/kitchen.yml index 1196a7e..1da7f1e 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -57,14 +57,11 @@ platforms: driver: image: debian:bullseye run_command: /lib/systemd/systemd - - name: fedora-34 + - name: fedora-35 driver: provision_command: &fedora_provision_command - dnf -y install procps-ng crypto-policies-scripts - update-crypto-policies --set LEGACY - - name: fedora-35 - driver: - provision_command: *fedora_provision_command - name: fedora-36 driver: provision_command: *fedora_provision_command From 9adf295207fac51058b2e57300f558904d933a0e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 7 Jun 2022 06:29:36 +0100 Subject: [PATCH 3/3] ci(3002): remove from CI (EOL) * https://saltproject.io/salt-platform-support/ - Phase 3 support ends: Apr 21, 2022 --- .github/workflows/kitchen.macos.yml | 3 - .github/workflows/kitchen.windows.yml | 2 - .github/workflows/main.yml | 644 ------------------------ .github/workflows/templates/generate.py | 42 +- README.rst | 22 +- kitchen.macos.yml | 3 - kitchen.windows.yml | 3 - kitchen.yml | 12 - 8 files changed, 13 insertions(+), 718 deletions(-) diff --git a/.github/workflows/kitchen.macos.yml b/.github/workflows/kitchen.macos.yml index d718976..5e1be29 100644 --- a/.github/workflows/kitchen.macos.yml +++ b/.github/workflows/kitchen.macos.yml @@ -45,7 +45,6 @@ jobs: - latest-macos-12 - py3-stable-3004-macos-12 - py3-stable-3003-macos-12 - - py3-stable-3002-macos-12 steps: - name: 'Check out code' uses: 'actions/checkout@v2' @@ -77,7 +76,6 @@ jobs: - latest-macos-11 - py3-stable-3004-macos-11 - py3-stable-3003-macos-11 - - py3-stable-3002-macos-11 steps: - name: 'Check out code' uses: 'actions/checkout@v2' @@ -109,7 +107,6 @@ jobs: - latest-macos-1015 - py3-stable-3004-macos-1015 - py3-stable-3003-macos-1015 - - py3-stable-3002-macos-1015 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml index c3e6ff8..ce5c7c3 100644 --- a/.github/workflows/kitchen.windows.yml +++ b/.github/workflows/kitchen.windows.yml @@ -45,7 +45,6 @@ jobs: fail-fast: false matrix: instance: - - py3-stable-3002-windows-2022 - py3-stable-3003-windows-2022 - py3-stable-3004-windows-2022 - latest-windows-2022 @@ -100,7 +99,6 @@ jobs: fail-fast: false matrix: instance: - - py3-stable-3002-windows-2019 - py3-stable-3003-windows-2019 - py3-stable-3004-windows-2019 - latest-windows-2019 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69030d6..06864cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -323,52 +323,6 @@ jobs: bundle exec kitchen destroy latest-almalinux-8 - py3-stable-3002-amazon-2: - name: Amazon 2 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-amazon-2 || bundle exec kitchen create py3-stable-3002-amazon-2 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-amazon-2 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-amazon-2 - - py3-stable-3003-amazon-2: name: Amazon 2 v3003 Py3 Stable runs-on: ubuntu-latest @@ -645,98 +599,6 @@ jobs: bundle exec kitchen destroy latest-arch - py3-stable-3002-centos-7: - name: CentOS 7 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-centos-7 || bundle exec kitchen create py3-stable-3002-centos-7 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-centos-7 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-centos-7 - - - py3-git-3002-centos-7: - name: CentOS 7 v3002 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3002-centos-7 || bundle exec kitchen create py3-git-3002-centos-7 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3002-centos-7 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3002-centos-7 - - py3-stable-3003-centos-7: name: CentOS 7 v3003 Py3 Stable runs-on: ubuntu-latest @@ -1289,52 +1151,6 @@ jobs: bundle exec kitchen destroy latest-centos-stream8 - py3-stable-3002-debian-10: - name: Debian 10 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-debian-10 || bundle exec kitchen create py3-stable-3002-debian-10 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-debian-10 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-debian-10 - - py3-stable-3003-debian-10: name: Debian 10 v3003 Py3 Stable runs-on: ubuntu-latest @@ -1657,98 +1473,6 @@ jobs: bundle exec kitchen destroy latest-debian-11 - py3-stable-3002-debian-9: - name: Debian 9 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-debian-9 || bundle exec kitchen create py3-stable-3002-debian-9 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-debian-9 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-debian-9 - - - py3-git-3002-debian-9: - name: Debian 9 v3002 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3002-debian-9 || bundle exec kitchen create py3-git-3002-debian-9 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3002-debian-9 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3002-debian-9 - - py3-stable-3003-debian-9: name: Debian 9 v3003 Py3 Stable runs-on: ubuntu-latest @@ -2393,98 +2117,6 @@ jobs: bundle exec kitchen destroy latest-opensuse-tumbleweed - py3-stable-3002-oraclelinux-7: - name: Oracle Linux 7 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-oraclelinux-7 || bundle exec kitchen create py3-stable-3002-oraclelinux-7 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-oraclelinux-7 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-oraclelinux-7 - - - py3-git-3002-oraclelinux-7: - name: Oracle Linux 7 v3002 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3002-oraclelinux-7 || bundle exec kitchen create py3-git-3002-oraclelinux-7 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3002-oraclelinux-7 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3002-oraclelinux-7 - - py3-stable-3003-oraclelinux-7: name: Oracle Linux 7 v3003 Py3 Stable runs-on: ubuntu-latest @@ -2761,98 +2393,6 @@ jobs: bundle exec kitchen destroy latest-oraclelinux-7 - py3-stable-3002-oraclelinux-8: - name: Oracle Linux 8 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-oraclelinux-8 || bundle exec kitchen create py3-stable-3002-oraclelinux-8 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-oraclelinux-8 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-oraclelinux-8 - - - py3-git-3002-oraclelinux-8: - name: Oracle Linux 8 v3002 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3002-oraclelinux-8 || bundle exec kitchen create py3-git-3002-oraclelinux-8 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3002-oraclelinux-8 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3002-oraclelinux-8 - - py3-stable-3003-oraclelinux-8: name: Oracle Linux 8 v3003 Py3 Stable runs-on: ubuntu-latest @@ -3313,98 +2853,6 @@ jobs: bundle exec kitchen destroy latest-rockylinux-8 - py3-stable-3002-ubuntu-1804: - name: Ubuntu 18.04 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-ubuntu-1804 || bundle exec kitchen create py3-stable-3002-ubuntu-1804 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-ubuntu-1804 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-ubuntu-1804 - - - py3-git-3002-ubuntu-1804: - name: Ubuntu 18.04 v3002 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3002-ubuntu-1804 || bundle exec kitchen create py3-git-3002-ubuntu-1804 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3002-ubuntu-1804 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3002-ubuntu-1804 - - py3-stable-3003-ubuntu-1804: name: Ubuntu 18.04 v3003 Py3 Stable runs-on: ubuntu-latest @@ -3681,52 +3129,6 @@ jobs: bundle exec kitchen destroy latest-ubuntu-1804 - py3-stable-3002-ubuntu-2004: - name: Ubuntu 20.04 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-ubuntu-2004 || bundle exec kitchen create py3-stable-3002-ubuntu-2004 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-ubuntu-2004 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-ubuntu-2004 - - py3-stable-3003-ubuntu-2004: name: Ubuntu 20.04 v3003 Py3 Stable runs-on: ubuntu-latest @@ -3911,52 +3313,6 @@ jobs: bundle exec kitchen destroy latest-ubuntu-2004 - py3-stable-3002-ubuntu-2110: - name: Ubuntu 21.10 v3002 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 20 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-ubuntu-2110 || bundle exec kitchen create py3-stable-3002-ubuntu-2110 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-ubuntu-2110 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-ubuntu-2110 - - py3-stable-3003-ubuntu-2110: name: Ubuntu 21.10 v3003 Py3 Stable runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 1b70af3..54e8d61 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -54,40 +54,6 @@ STABLE_DISTROS = [ "ubuntu-2204", ] -BLACKLIST_3002 = [ - "almalinux-8", - "arch", - "centos-stream8", - "debian-11", - "fedora-35", - "fedora-36", - "gentoo", - "gentoo-systemd", - "opensuse-15", - "opensuse-tumbleweed", - "rockylinux-8", - "ubuntu-2204", -] - -BLACKLIST_GIT_3002 = [ - "almalinux-8", - "amazon-2", - "arch", - "centos-stream8", - "debian-10", - "debian-11", - "fedora-35", - "fedora-36", - "gentoo", - "gentoo-systemd", - "opensuse-15", - "opensuse-tumbleweed", - "rockylinux-8", - "ubuntu-2004", - "ubuntu-2110", - "ubuntu-2204", -] - BLACKLIST_3003 = [ "arch", "debian-11", @@ -145,7 +111,6 @@ BLACKLIST_GIT_3004 = [ ] SALT_BRANCHES = [ - "3002", "3003", "3004", "master", @@ -153,7 +118,6 @@ SALT_BRANCHES = [ ] BRANCH_DISPLAY_NAMES = { - "3002": "v3002", "3003": "v3003", "3004": "v3004", "master": "Master", @@ -265,23 +229,21 @@ def generate_test_jobs(): continue BLACKLIST = { - "3002": BLACKLIST_3002, "3003": BLACKLIST_3003, "3004": BLACKLIST_3004, } if bootstrap_type == "git": BLACKLIST = { - "3002": BLACKLIST_GIT_3002, "3003": BLACKLIST_GIT_3003, "3004": BLACKLIST_GIT_3004, } - # .0 versions are a virtual version for pinning to the first point release of a major release, such as 3002, there is no git version. + # .0 versions are a virtual version for pinning to the first point release of a major release, such as 3003, there is no git version. if branch.endswith("-0"): continue if ( - branch in ("3002", "3003", "3004") + branch in ("3003", "3004") and distro in BLACKLIST[branch] ): continue diff --git a/README.rst b/README.rst index 00f85f4..da4bc95 100644 --- a/README.rst +++ b/README.rst @@ -102,12 +102,12 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a Examples: - bootstrap-salt.sh - bootstrap-salt.sh stable - - bootstrap-salt.sh stable 3003.3 - - bootstrap-salt.sh stable v3002.7 + - bootstrap-salt.sh stable 3004.1 + - bootstrap-salt.sh stable v3003.4 - bootstrap-salt.sh testing - bootstrap-salt.sh git - - bootstrap-salt.sh git 3003.3 - - bootstrap-salt.sh git v3002.7 + - bootstrap-salt.sh git 3004.1 + - bootstrap-salt.sh git v3003.4 - bootstrap-salt.sh git 06f249901a2e2f1ed310d58ea3921a129f214358 Options: @@ -218,14 +218,14 @@ If you want to install a package of a specific release version, from the SaltSta .. code:: console curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh -P stable 3003.3 + sudo sh bootstrap-salt.sh -P stable 3004.1 If you want to install a specific release version, based on the Git tags: .. code:: console curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh git v3003.3 + sudo sh bootstrap-salt.sh git v3004.1 Using ``curl`` to install latest development version from GitHub: @@ -280,14 +280,14 @@ Installing a specific version from git using ``wget``: .. code:: console wget -O bootstrap-salt.sh https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh git v3003.3 + sudo sh bootstrap-salt.sh git v3004.1 Installing a specific version package from the SaltStack repo using ``wget``: .. code:: console wget -O bootstrap-salt.sh https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh -P stable 3003.3 + sudo sh bootstrap-salt.sh -P stable 3004.1 **NOTE** @@ -303,7 +303,7 @@ If you already have Python installed, ``python 2.7``, then it's as easy as: .. code:: console python -m urllib "https://bootstrap.saltproject.io" > bootstrap-salt.sh - sudo sh bootstrap-salt.sh -P stable 3003.3 + sudo sh bootstrap-salt.sh -P stable 3004.1 With python version 2, the following in-line code should always work: @@ -317,7 +317,7 @@ With python version 3: .. code:: console python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltproject.io").read().decode("ascii"))' > bootstrap-salt.sh - sudo sh bootstrap-salt.sh git v3003.3 + sudo sh bootstrap-salt.sh git v3004.1 Install using fetch ~~~~~~~~~~~~~~~~~~~ @@ -378,7 +378,7 @@ Installing a target version package of Salt from the SaltStack repo: .. code:: console - curl -L https://bootstrap.saltproject.io | sudo sh -s -- stable 3003.3 + curl -L https://bootstrap.saltproject.io | sudo sh -s -- stable 3004.1 Installing the latest master branch of Salt from git: diff --git a/kitchen.macos.yml b/kitchen.macos.yml index 1d89edb..cc4ed9a 100644 --- a/kitchen.macos.yml +++ b/kitchen.macos.yml @@ -19,9 +19,6 @@ platforms: - name: macos-1015 suites: - - name: py3-stable-3002 - provisioner: - salt_version: 3002.8 - name: py3-stable-3003 provisioner: salt_version: 3003.4 diff --git a/kitchen.windows.yml b/kitchen.windows.yml index 0c5b882..b732725 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -17,9 +17,6 @@ platforms: - name: windows-2019 suites: - - name: py3-stable-3002 - provisioner: - salt_version: 3002.8-1 - name: py3-stable-3003 provisioner: salt_version: 3003.4-1 diff --git a/kitchen.yml b/kitchen.yml index 1da7f1e..7d127ed 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -113,10 +113,6 @@ platforms: run_command: /lib/systemd/systemd suites: - - name: py3-git-3002 - provisioner: - salt_version: 3002 - salt_bootstrap_options: -x python3 -MPfq git %s - name: py3-git-3003 provisioner: salt_version: 3003 @@ -125,10 +121,6 @@ suites: provisioner: salt_version: 3004 salt_bootstrap_options: -x python3 -MPfq git %s - - name: py3-stable-3002-0 - provisioner: - salt_version: 3002 - salt_bootstrap_options: -x python3 -MP stable 3002.0 excludes: - opensuse-15 - opensuse-tumbleweed @@ -152,10 +144,6 @@ suites: - freebsd-130 - freebsd-123 - openbsd-6 - - name: py3-stable-3002 - provisioner: - salt_version: 3002 - salt_bootstrap_options: -x python3 -MP stable %s excludes: - opensuse-15 - opensuse-tumbleweed