From 0e636f520d71b6d77bb414ac9ad82fbf8c47f87c Mon Sep 17 00:00:00 2001 From: krionbsd Date: Thu, 19 Aug 2021 19:27:47 +0000 Subject: [PATCH 01/11] Update README.rst with 2021.08.19 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 3be7ce2..ceb3b7d 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2021.08.19: ``ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806`` - 2021.06.23: ``35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665`` - 2021.03.02: ``91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758`` - 2020.10.20: ``b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2`` From 79999938c988769f301f07bfb37ed2a305cda7f6 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Thu, 19 Aug 2021 21:27:08 +0200 Subject: [PATCH 02/11] Change master to develop branch --- RELEASE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index c6b561a..64db0f0 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -# Release process +[#](#) Release process - See if there are any PRs worth squeezing into release. - Go through the changes since last release, add them to changelog. @@ -7,7 +7,7 @@ - Bump version for release - Open PR against develop with these changes. - Once the above PR is merged, open a PR against stable with the changes from develop -- Once the above PR is merged, wait until an automatic PR is opened against master which updates the checksums. +- Once the above PR is merged, wait until an automatic PR is opened against develop which updates the checksums. - Once the above PR is merged, tag the release `v{version-here}` and push the tag. - Wait until an automatic PR is opened against the develop branch updating the release informtion. Merge it. - Check that an automated PR was opened against the salt repo updating the bootstrap script. From 3a02ef92795ab27c21fc40c6c6926c08acc018bd Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Wed, 21 Jul 2021 21:44:13 +0000 Subject: [PATCH 03/11] make python3 the default This should be released to stable at the same time or right before 3000.x releases are moved from repo.saltproject.io to archive.repo.saltproject.io on 2021-09-15 --- bootstrap-salt.sh | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index cb9b3d7..0d58d31 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -268,7 +268,7 @@ _CUSTOM_MASTER_CONFIG="null" _CUSTOM_MINION_CONFIG="null" _QUIET_GIT_INSTALLATION=$BS_FALSE _REPO_URL="repo.saltproject.io" -_PY_EXE="" +_PY_EXE="python3" _INSTALL_PY="$BS_FALSE" _TORNADO_MAX_PY3_VERSION="5.0" _POST_NEON_INSTALL=$BS_FALSE @@ -3015,15 +3015,6 @@ install_ubuntu_stable_deps() { _SLEEP=10 fi - if [ "$DISTRO_MAJOR_VERSION" -ge 20 ]; then - # Default Ubuntu 20.04 to Py3 - if [ "x${_PY_EXE}" = "x" ]; then - _PY_EXE=python3 - _PY_MAJOR_VERSION=3 - PY_PKG_VER=3 - fi - fi - if [ $_START_DAEMONS -eq $BS_FALSE ]; then echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." fi @@ -3418,15 +3409,6 @@ install_debian_deps() { __apt_get_upgrade_noinput || return 1 fi - if [ "$DISTRO_MAJOR_VERSION" -ge 10 ]; then - # Default Debian 10 to Py3 - if [ "x${_PY_EXE}" = "x" ]; then - _PY_EXE=python3 - _PY_MAJOR_VERSION=3 - PY_PKG_VER=3 - fi - fi - if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then PY_PKG_VER=3 else @@ -4163,14 +4145,6 @@ install_centos_stable_deps() { yum -y update || return 1 fi - if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then - # CentOS/RHEL 8 Default to Py3 - if [ "x${_PY_EXE}" = "x" ]; then - _PY_EXE=python3 - _PY_MAJOR_VERSION=3 - fi - fi - if [ "$_DISABLE_REPOS" -eq "$BS_TRUE" ] && [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then echowarn "Detected -r or -R option while installing Salt packages for Python 3." echowarn "Python 3 packages for older Salt releases requires the EPEL repository to be installed." From 139286cd9ae2a4e0e52f9ab4f1421589c9d75bca Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Wed, 21 Jul 2021 22:08:40 +0000 Subject: [PATCH 04/11] 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 From 3288b8635588a08a99eb8b2c2ccf51adff3478d8 Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Tue, 24 Aug 2021 20:54:46 +0000 Subject: [PATCH 05/11] don't output info if using the default -x value --- bootstrap-salt.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 0d58d31..5185dee 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -691,7 +691,9 @@ if [ -n "$_PY_EXE" ]; then exit 1 fi - echoinfo "Detected -x option. Using $_PY_EXE to install Salt." + if [ "$_PY_EXE" != "python3" ]; then + echoinfo "Detected -x option. Using $_PY_EXE to install Salt." + fi else _PY_PKG_VER="" _PY_MAJOR_VERSION="" From 494b2bed995520f33c48b1c8283940952801c410 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Tue, 7 Sep 2021 09:28:02 +0200 Subject: [PATCH 06/11] Pin latest salt version to README --- README.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index ceb3b7d..1ec13a1 100644 --- a/README.rst +++ b/README.rst @@ -98,12 +98,12 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a Examples: - bootstrap-salt.sh - bootstrap-salt.sh stable - - bootstrap-salt.sh stable 2017.7 - - bootstrap-salt.sh stable 2017.7.2 + - bootstrap-salt.sh stable 3003.3 + - bootstrap-salt.sh stable v3002.7 - bootstrap-salt.sh testing - bootstrap-salt.sh git - - bootstrap-salt.sh git 2017.7 - - bootstrap-salt.sh git v2017.7.2 + - bootstrap-salt.sh git 3003.3 + - bootstrap-salt.sh git v3002.7 - bootstrap-salt.sh git 06f249901a2e2f1ed310d58ea3921a129f214358 Options: @@ -214,14 +214,14 @@ If you want to install a package of a specific release version, from the SaltSta .. code:: console curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh -P stable 3002.2 + sudo sh bootstrap-salt.sh -P stable 3003.3 If you want to install a specific release version, based on the Git tags: .. code:: console curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh git v3002.2 + sudo sh bootstrap-salt.sh git v3003.3 Using ``curl`` to install latest development version from GitHub: @@ -276,14 +276,14 @@ Installing a specific version from git using ``wget``: .. code:: console wget -O bootstrap-salt.sh https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh git v3002.2 + sudo sh bootstrap-salt.sh git v3003.3 Installing a specific version package from the SaltStack repo using ``wget``: .. code:: console wget -O bootstrap-salt.sh https://bootstrap.saltproject.io - sudo sh bootstrap-salt.sh -P stable 3002.2 + sudo sh bootstrap-salt.sh -P stable 3003.3 **NOTE** @@ -299,7 +299,7 @@ If you already have Python installed, ``python 2.7``, then it's as easy as: .. code:: console python -m urllib "https://bootstrap.saltproject.io" > bootstrap-salt.sh - sudo sh bootstrap-salt.sh -P stable 3002.2 + sudo sh bootstrap-salt.sh -P stable 3003.3 With python version 2, the following in-line code should always work: @@ -313,7 +313,7 @@ With python version 3: .. code:: console python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltproject.io").read().decode("ascii"))' > bootstrap-salt.sh - sudo sh bootstrap-salt.sh git v3002.2 + sudo sh bootstrap-salt.sh git v3003.3 Install using fetch ~~~~~~~~~~~~~~~~~~~ @@ -374,7 +374,7 @@ Installing a target version package of Salt from the SaltStack repo: .. code:: console - curl -L https://bootstrap.saltproject.io | sudo sh -s -- stable 3002.2 + curl -L https://bootstrap.saltproject.io | sudo sh -s -- stable 3003.3 Installing the latest master branch of Salt from git: From 5172f227ced3e8f7055c030486c80bd186fac99a Mon Sep 17 00:00:00 2001 From: krionbsd Date: Tue, 14 Sep 2021 07:31:17 +0200 Subject: [PATCH 07/11] Update to new release 2021.09.14 --- ChangeLog | 5 +++++ bootstrap-salt.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c40e1d4..a4c763a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Version TBD (In Progress on the Develop Branch): +Version 2021.09.14: + * Update latest Salt version in README (krionbsd) #1588 + * Make Python 3 the default (bryceml) #1577 + * Don't output info if using the default -x value (bryceml) #1587 + Version 2021.08.19: * Update README with instructions to use salt-bootstrap custom version (ari) #1580 * Remove unsupported versions (bryceml) #1578 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 5185dee..62fbe78 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2021.08.19" +__ScriptVersion="2021.09.14" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From 409f9982545ef4a68eaa36df22e8822b2d4345aa Mon Sep 17 00:00:00 2001 From: krionbsd Date: Tue, 14 Sep 2021 12:42:53 +0000 Subject: [PATCH 08/11] Update README.rst with 2021.09.14 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 1ec13a1..788ec94 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2021.09.14: ``30fdcba972f449630b4f13492cb5525e69e08fa2cdb66a6dc78f1536ad279e52`` - 2021.08.19: ``ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806`` - 2021.06.23: ``35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665`` - 2021.03.02: ``91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758`` From 5cfa6b994d2b20fe9c8b9f0fe34cace66d082058 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Thu, 16 Sep 2021 20:54:05 +0200 Subject: [PATCH 09/11] Add oncoming 3004 release --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 62fbe78..1e5fa82 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -604,7 +604,7 @@ elif [ "$ITYPE" = "stable" ]; then if [ "$#" -eq 0 ];then STABLE_REV="latest" else - if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002|3003)$')" != "" ]; then + if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002|3003|3004)$')" != "" ]; then STABLE_REV="$1" shift elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then @@ -615,7 +615,7 @@ elif [ "$ITYPE" = "stable" ]; then fi shift else - echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001, 3002, 3003, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)" + echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001, 3002, 3003, 3004, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)" exit 1 fi fi From 1f9909474ef9be26804c3d2d388ac6d561eb03c5 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Thu, 16 Sep 2021 21:19:03 +0200 Subject: [PATCH 10/11] Re-add Ubuntu-16 support as it's still supported with 3001 and 3002 --- bootstrap-salt.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 1e5fa82..9e93326 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1585,11 +1585,15 @@ __check_end_of_life_versions() { ubuntu) # Ubuntu versions not supported # - # < 18.04 + # < 16.04 + # = 16.10 + # = 17.04, 17.10 # = 18.10 # = 19.04, 19.10 - if [ "$DISTRO_MAJOR_VERSION" -lt 18 ] || \ + if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \ + [ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \ [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \ + { [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \ { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" From 7fc4f7829dd9cb896d51c8ae2c7ce677132c6827 Mon Sep 17 00:00:00 2001 From: krionbsd Date: Fri, 17 Sep 2021 08:00:39 +0200 Subject: [PATCH 11/11] Update to new release 2021.09.17 --- ChangeLog | 4 ++++ bootstrap-salt.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a4c763a..34b7f23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Version TBD (In Progress on the Develop Branch): +Version 2021.09.17: + * Re-add Ubuntu-16 support as it's still supported with 3001 and 3002 (krionbsd) #1594 + * Add oncoming 3004 release (krionbsd) #1593 + Version 2021.09.14: * Update latest Salt version in README (krionbsd) #1588 * Make Python 3 the default (bryceml) #1577 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 9e93326..d825359 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2021.09.14" +__ScriptVersion="2021.09.17" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"