From e124d344182053c34ece9da365fe48d61c2da059 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 24 Feb 2020 18:33:58 +0000 Subject: [PATCH 01/35] Add sha256sum for the latest v2020.02.24 release --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 8eec8b4..33b6153 100644 --- a/README.rst +++ b/README.rst @@ -30,6 +30,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2020.02.24: ``efc46700aca78b8e51d7af9b06293f52ad495f3a8179c6bfb21a8c97ee41f1b7`` - 2020.02.04: ``ce877651b4938e3480f76b1629f582437f6ca8b73d7199fdb9e905e86fe85b34`` - 2020.01.29: ``e9afdfa877998c1c7f0e141a6728b33d0d24348e197aab2b9bde4fe6bc6db1b2`` - 2020.01.21: ``53299aa0dfbf7ab381f3856bb7babfc04a1d6525be11db0b9466277b1e4d0c1a`` From e93f5db489c7291ccdc62a29112c1d82317f66e3 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Wed, 11 Mar 2020 13:38:06 +0100 Subject: [PATCH 02/35] Update Tornado release timeline --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 33b6153..4e8bfe8 100644 --- a/README.rst +++ b/README.rst @@ -384,8 +384,8 @@ The earliest release of Salt that supports Python3 is `2018.3.4`. Tornado 5/6 Workaround ---------------------- -Salt does not support tornado>=5.0 currently. This support will not be added until the neon -release. In order to work around this requirement on OSs that no longer have the tornado 4 package +Salt does not support tornado>=5.0 currently. This support will be included in an upcoming release. +In order to work around this requirement on OSs that no longer have the tornado 4 package available in their repositories we are pip installing tornado<5.0 in the bootstrap script. This requires the user to pass -P to the bootstrap script if installing via git to ensure tornado is pip installed. If a user does not pass this argument they will be warned that it is required for the From c55b358874b581c4126170d2171a7c681a20f68f Mon Sep 17 00:00:00 2001 From: N Date: Thu, 26 Mar 2020 23:32:34 +0000 Subject: [PATCH 03/35] fix(suse): updates for opensuse tumbleweed --- bootstrap-salt.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) mode change 100755 => 100644 bootstrap-salt.sh diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh old mode 100755 new mode 100644 index 3368956..b07b51c --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -996,7 +996,8 @@ __gather_linux_system_info() { # Skip setting DISTRO_NAME this time, splitting CamelCase has failed. # See https://github.com/saltstack/salt-bootstrap/issues/918 [ "$n" = "$DISTRO_NAME" ] && DISTRO_NAME="" || DISTRO_NAME="$n" - elif [ "${DISTRO_NAME}" = "openSUSE project" ]; then + elif [ "$( echo "${DISTRO_NAME}" | grep openSUSE )" != "" ]; then + # lsb_release -si returns "openSUSE Tumbleweed" on openSUSE tumbleweed # lsb_release -si returns "openSUSE project" on openSUSE 12.3 # lsb_release -si returns "openSUSE" on openSUSE 15.n DISTRO_NAME="opensuse" @@ -1117,7 +1118,7 @@ __gather_linux_system_info() { n="SUSE" v="${rv}" ;; - opensuse-leap ) + opensuse-* ) n="opensuse" v="${rv}" ;; @@ -1722,7 +1723,7 @@ echoinfo " Distribution: ${DISTRO_NAME} ${DISTRO_VERSION}" echo # Simplify distro name naming on functions -DISTRO_NAME_L=$(echo "$DISTRO_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-zA-Z0-9_ ]//g' | sed -Ee 's/([[:space:]])+/_/g') +DISTRO_NAME_L=$(echo "$DISTRO_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-zA-Z0-9_ ]//g' | sed -Ee 's/([[:space:]])+/_/g' | sed -Ee 's/tumbleweed//' ) # Simplify version naming on functions if [ "$DISTRO_VERSION" = "" ] || [ ${_SIMPLIFY_VERSION} -eq $BS_FALSE ]; then @@ -6374,7 +6375,7 @@ install_opensuse_stable_post() { [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue - if [ -f /bin/systemctl ]; then + if [ -f /bin/systemctl ] || [ -f /usr/bin/systemctl ]; then systemctl is-enabled salt-$fname.service || (systemctl preset salt-$fname.service && systemctl enable salt-$fname.service) sleep 1 systemctl daemon-reload From c0a5f8b1003811c6c3514422fddfdc4ff6c462d3 Mon Sep 17 00:00:00 2001 From: Jaydeep Chakravarty Date: Thu, 9 Apr 2020 19:31:41 +0530 Subject: [PATCH 04/35] Debian 8 unsupported with Python 3 --- README.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/README.rst b/README.rst index 4e8bfe8..7fcf75b 100644 --- a/README.rst +++ b/README.rst @@ -362,7 +362,6 @@ this offering, while limited, is as follows: - CentOS 7 - Centos 8 -- Debian 8 - Debian 9 - Debian 10 - Fedora (only git installations) From e974f6c88ca501043b4c52919a35d61be2de89fe Mon Sep 17 00:00:00 2001 From: Christer Edwards Date: Wed, 20 May 2020 10:53:14 -0600 Subject: [PATCH 05/35] more accurate deps parsing for FreeBSD git installs --- bootstrap-salt.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b07b51c..1500bc2 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5698,8 +5698,11 @@ install_freebsd_git_deps() { if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then - SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search -R -d py37-salt | grep 'origin:' \ - | tail -n +2 | awk -F\" '{print $2}') + if ! __check_command_exists jq; then + /usr/local/sbin/pkg install -y jq || return 1 + fi + + SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search -R -d --raw-format json py37-salt | jq -r '.deps|keys[]') # shellcheck disable=SC2086 /usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} python || return 1 From f3bca5127ae386925591fdec0505a59cd39f6bfc Mon Sep 17 00:00:00 2001 From: Christer Edwards Date: Wed, 20 May 2020 14:39:25 -0600 Subject: [PATCH 06/35] simpler non-jq dependent solution for FreeBSD dependencies --- bootstrap-salt.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 1500bc2..763fa0e 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5698,11 +5698,7 @@ install_freebsd_git_deps() { if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then - if ! __check_command_exists jq; then - /usr/local/sbin/pkg install -y jq || return 1 - fi - - SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search -R -d --raw-format json py37-salt | jq -r '.deps|keys[]') + SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py37-salt) # shellcheck disable=SC2086 /usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} python || return 1 From fddc2215126338a8a8289f2c0181d4754cdd2253 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 17:03:40 +0100 Subject: [PATCH 07/35] Add support for the upcoming Sodium release --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 763fa0e..2d461db 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -603,7 +603,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)$')" != "" ]; 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)$')" != "" ]; 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 @@ -614,7 +614,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, 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, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)" exit 1 fi fi From a9b8b4aa302a054c38114d6e8fed923538e611f4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 18:02:53 +0100 Subject: [PATCH 08/35] Don't even try to test Salt's master branch under Py2 --- .github/workflows/main.yml | 414 ------------------------ .github/workflows/templates/generate.py | 21 +- 2 files changed, 14 insertions(+), 421 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f0a5643..87cd725 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -412,52 +412,6 @@ jobs: bundle exec kitchen destroy py3-git-3000-amazon-2 - py2-git-master-amazon-2: - name: Amazon 2 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-amazon-2 || bundle exec kitchen create py2-git-master-amazon-2 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-amazon-2 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-amazon-2 - - py3-git-master-amazon-2: name: Amazon 2 Master Py3 Git runs-on: ubuntu-latest @@ -688,52 +642,6 @@ jobs: bundle exec kitchen destroy py2-git-3000-arch - py2-git-master-arch: - name: Arch Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-arch || bundle exec kitchen create py2-git-master-arch - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-arch - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-arch - - py2-stable-2018-3-centos-6: name: CentOS 6 v2018.3 Py2 Stable runs-on: ubuntu-latest @@ -1010,52 +918,6 @@ jobs: bundle exec kitchen destroy py2-git-3000-centos-6 - py2-git-master-centos-6: - name: CentOS 6 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-centos-6 || bundle exec kitchen create py2-git-master-centos-6 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-centos-6 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-centos-6 - - latest-centos-6: name: CentOS 6 Latest packaged release runs-on: ubuntu-latest @@ -1654,52 +1516,6 @@ jobs: bundle exec kitchen destroy py3-git-3000-centos-7 - py2-git-master-centos-7: - name: CentOS 7 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-centos-7 || bundle exec kitchen create py2-git-master-centos-7 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-centos-7 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-centos-7 - - py3-git-master-centos-7: name: CentOS 7 Master Py3 Git runs-on: ubuntu-latest @@ -2528,52 +2344,6 @@ jobs: bundle exec kitchen destroy py2-git-3000-debian-8 - py2-git-master-debian-8: - name: Debian 8 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-debian-8 || bundle exec kitchen create py2-git-master-debian-8 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-debian-8 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-debian-8 - - latest-debian-8: name: Debian 8 Latest packaged release runs-on: ubuntu-latest @@ -3172,52 +2942,6 @@ jobs: bundle exec kitchen destroy py3-git-3000-debian-9 - py2-git-master-debian-9: - name: Debian 9 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-debian-9 || bundle exec kitchen create py2-git-master-debian-9 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-debian-9 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-debian-9 - - py3-git-master-debian-9: name: Debian 9 Master Py3 Git runs-on: ubuntu-latest @@ -4368,52 +4092,6 @@ jobs: bundle exec kitchen destroy py3-git-3000-opensuse-15 - py2-git-master-opensuse-15: - name: Opensuse 15 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-opensuse-15 || bundle exec kitchen create py2-git-master-opensuse-15 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-opensuse-15 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-opensuse-15 - - py3-git-master-opensuse-15: name: Opensuse 15 Master Py3 Git runs-on: ubuntu-latest @@ -5058,52 +4736,6 @@ jobs: bundle exec kitchen destroy py3-git-3000-ubuntu-1604 - py2-git-master-ubuntu-1604: - name: Ubuntu 16.04 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-ubuntu-1604 || bundle exec kitchen create py2-git-master-ubuntu-1604 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-ubuntu-1604 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-ubuntu-1604 - - py3-git-master-ubuntu-1604: name: Ubuntu 16.04 Master Py3 Git runs-on: ubuntu-latest @@ -5748,52 +5380,6 @@ jobs: bundle exec kitchen destroy py3-git-3000-ubuntu-1804 - py2-git-master-ubuntu-1804: - name: Ubuntu 18.04 Master Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-master-ubuntu-1804 || bundle exec kitchen create py2-git-master-ubuntu-1804 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-master-ubuntu-1804 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-master-ubuntu-1804 - - py3-git-master-ubuntu-1804: name: Ubuntu 18.04 Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 44a3090..87b8e8a 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -138,14 +138,21 @@ def generate_test_jobs(): continue for python_version in ('py2', 'py3'): - for bootstrap_type in ('stable', 'git'): - if bootstrap_type == 'stable' and branch == 'master': - continue - if bootstrap_type == 'stable' and distro not in STABLE_DISTROS: - continue - if bootstrap_type == 'stable' and branch in STABLE_BRANCH_BLACKLIST: - continue + if branch == 'master' and python_version == 'py2': + # Salt's master branch no longer supports Python 2 + continue + + for bootstrap_type in ('stable', 'git'): + if bootstrap_type == 'stable': + if branch == 'master': + # For the master branch there's no stable build + continue + if distro not in STABLE_DISTROS: + continue + + if branch in STABLE_BRANCH_BLACKLIST: + continue if branch == '2018-3' and distro in BLACKLIST_2018: continue From 2aba18a94abb5039cb10f3763e87e25f8801aa71 Mon Sep 17 00:00:00 2001 From: John Hubbard Date: Mon, 4 May 2020 14:24:07 -0600 Subject: [PATCH 09/35] KDE neon has been 18.04 based for a while now --- README.rst | 2 +- bootstrap-salt.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 7fcf75b..3eb8ad3 100644 --- a/README.rst +++ b/README.rst @@ -301,7 +301,7 @@ in combination with the ``git`` installation method. Ubuntu and derivatives ~~~~~~~~~~~~~~~~~~~~~~ -- KDE neon (based on Ubuntu 16.04) +- KDE neon (based on Ubuntu 18.04) - Linux Mint 17/18 - Ubuntu 14.04/16.04/18.04 and subsequent non-LTS releases (see below) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2d461db..b6c2a12 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1312,6 +1312,7 @@ __ubuntu_derivatives_translation() { linaro_12_ubuntu_base="12.04" elementary_os_02_ubuntu_base="12.04" neon_16_ubuntu_base="16.04" + neon_18_ubuntu_base="18.04" # Translate Ubuntu derivatives to their base Ubuntu version match=$(echo "$DISTRO_NAME_L" | grep -E ${UBUNTU_DERIVATIVES}) From 7e252afd69d0c16074ffdee24acbceb3d9ecffe2 Mon Sep 17 00:00:00 2001 From: John Hubbard Date: Tue, 5 May 2020 09:42:11 -0600 Subject: [PATCH 10/35] add detection for neon based on ubuntu 20.04 --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b6c2a12..c828e60 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1313,6 +1313,7 @@ __ubuntu_derivatives_translation() { elementary_os_02_ubuntu_base="12.04" neon_16_ubuntu_base="16.04" neon_18_ubuntu_base="18.04" + neon_20_ubuntu_base="20.04" # Translate Ubuntu derivatives to their base Ubuntu version match=$(echo "$DISTRO_NAME_L" | grep -E ${UBUNTU_DERIVATIVES}) From e99e5ceeb9d9074308192c04581eb281549e5e08 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 18:08:13 +0100 Subject: [PATCH 11/35] Add @ender8282 to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 7a6486d..aa1fb90 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -82,6 +82,7 @@ Jasper Lievisse Adriaanse jasperla jasper@humppa.nl JD decomposite Jeff Hui jeffh jeff@jeffhui.net Jeff Strunk jstrunk +John Hubbard ender8282 ender8282@gmail.com Jorge Schrauwen sjorge sjorge@blackdot.be Juan A. Moyano wincus wincus.public@gmail.com Justin Anderson justinta justin.ta@outlook.com From b36d41319bfac03cf2889305d073b9629d7a7d26 Mon Sep 17 00:00:00 2001 From: Gilles Debunne <63719587+gdebunne@users.noreply.github.com> Date: Wed, 22 Apr 2020 10:04:25 +0200 Subject: [PATCH 12/35] Update python install step for python 3 urllib and print syntax updated --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index 3eb8ad3..121feb7 100644 --- a/README.rst +++ b/README.rst @@ -152,6 +152,11 @@ All Python versions should support the following in-line code: python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > bootstrap-salt.sh sudo sh bootstrap-salt.sh git develop +or with python version 3: + +.. code:: console + + python -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read())' > bootstrap-salt.sh Install using fetch ~~~~~~~~~~~~~~~~~~~ From 0f80c90dbb17175ac09cb2e6a34afe95271bdc8a Mon Sep 17 00:00:00 2001 From: Gilles Debunne <63719587+gdebunne@users.noreply.github.com> Date: Wed, 22 Apr 2020 10:28:33 +0200 Subject: [PATCH 13/35] Fix, decode binary to ascii --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 121feb7..0d434a0 100644 --- a/README.rst +++ b/README.rst @@ -156,7 +156,7 @@ or with python version 3: .. code:: console - python -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read())' > bootstrap-salt.sh + python -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read().decode("ascii"))' > bootstrap-salt.sh Install using fetch ~~~~~~~~~~~~~~~~~~~ From 9dd552cbb354662be089858b46543e186e1b4e8f Mon Sep 17 00:00:00 2001 From: Gilles Debunne <63719587+gdebunne@users.noreply.github.com> Date: Wed, 22 Apr 2020 16:10:19 +0200 Subject: [PATCH 14/35] Use python3 instead of python --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0d434a0..17a06ea 100644 --- a/README.rst +++ b/README.rst @@ -156,7 +156,7 @@ or with python version 3: .. code:: console - python -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read().decode("ascii"))' > bootstrap-salt.sh + python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read().decode("ascii"))' > bootstrap-salt.sh Install using fetch ~~~~~~~~~~~~~~~~~~~ From 1285f865132fe620b0ef24e1e6d5284ed3158887 Mon Sep 17 00:00:00 2001 From: Gilles Debunne <63719587+gdebunne@users.noreply.github.com> Date: Fri, 24 Apr 2020 16:29:33 +0200 Subject: [PATCH 15/35] Separate python 2 and python 3 install Per review comments --- README.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 17a06ea..84e0797 100644 --- a/README.rst +++ b/README.rst @@ -145,18 +145,19 @@ If you already have Python installed, ``python 2.7``, then it's as easy as: python -m urllib "https://bootstrap.saltstack.com" > bootstrap-salt.sh sudo sh bootstrap-salt.sh git develop -All Python versions should support the following in-line code: +With python version 2, the following in-line code should always work: .. code:: console python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > bootstrap-salt.sh sudo sh bootstrap-salt.sh git develop -or with python version 3: +With python version 3: .. code:: console python3 -c 'import urllib.request; print(urllib.request.urlopen("https://bootstrap.saltstack.com").read().decode("ascii"))' > bootstrap-salt.sh + sudo sh bootstrap-salt.sh git develop Install using fetch ~~~~~~~~~~~~~~~~~~~ From 3eaa27f0317b33bded2c0816aca199c7998d399f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 18:11:22 +0100 Subject: [PATCH 16/35] Add @gdebunne to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index aa1fb90..b36c3f3 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -68,6 +68,7 @@ gdm85 gdm85 Geoff Garside geoffgarside geoff@geoffgarside.co.uk George aflat gstock.public@gmail.com ggillies ggillies +Gilles Debunne gdebunne Giuseppe Iannello giannello giuseppe.iannello@brokenloop.net Gregory Meno GregMeno gregory.meno@inktank.com Guillaume Derval GuillaumeDerval guillaume@guillaumederval.be From 445b301b646556d33b03b4b21bb92c9fa805fab3 Mon Sep 17 00:00:00 2001 From: Dmitry Kuzmenko Date: Wed, 8 Apr 2020 14:23:09 +0300 Subject: [PATCH 17/35] Recommend `master` salt branch instead of `develop` Latest development branch in Open Salt repo is currently `master` not `develop`. --- CONTRIBUTING.md | 2 +- README.rst | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9729795..0ee7b0a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ Please read the following guidelines before you ``` curl -o bootstrap-salt.sh -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh - sudo sh bootstrap-salt.sh git develop + sudo sh bootstrap-salt.sh git master ``` 3. **Isolate the demonstrable problem** -- make sure that the diff --git a/README.rst b/README.rst index 84e0797..2b23c32 100644 --- a/README.rst +++ b/README.rst @@ -80,7 +80,7 @@ Using ``curl`` to install latest development version from GitHub: .. code:: console curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sudo sh bootstrap-salt.sh git develop + sudo sh bootstrap-salt.sh git master If you want to install a specific release version (based on the Git tags): @@ -101,7 +101,7 @@ If all you want is to install a ``salt-master`` using latest Git: .. code:: console curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sudo sh bootstrap-salt.sh -M -N git develop + sudo sh bootstrap-salt.sh -M -N git master If your host has Internet access only via HTTP proxy: @@ -143,14 +143,14 @@ If you already have Python installed, ``python 2.7``, then it's as easy as: .. code:: console python -m urllib "https://bootstrap.saltstack.com" > bootstrap-salt.sh - sudo sh bootstrap-salt.sh git develop + sudo sh bootstrap-salt.sh git master With python version 2, the following in-line code should always work: .. code:: console python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > bootstrap-salt.sh - sudo sh bootstrap-salt.sh git develop + sudo sh bootstrap-salt.sh git master With python version 3: @@ -214,11 +214,11 @@ Using ``wget`` to install your distribution's stable packages: wget -O - https://bootstrap.saltstack.com | sudo sh -Installing the latest develop branch of Salt: +Installing the latest master branch of Salt: .. code:: console - curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop + curl -L https://bootstrap.saltstack.com | sudo sh -s -- git master Supported Operating Systems @@ -242,7 +242,7 @@ You also may need to disable repository configuration and allow ``pip`` installa .. code:: console - sudo sh bootstrap-salt.sh -r -P git develop + sudo sh bootstrap-salt.sh -r -P git master **NOTE** From 03c591d06c8af7c09694d6078e5495da5377e62f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 18:15:53 +0100 Subject: [PATCH 18/35] Add @DmitryKuzmenko to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index b36c3f3..7803e29 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -50,6 +50,7 @@ denmat denmat Denys Havrysh vutny denys.gavrysh@gmail.com deployboy deployboy Diego Woitasen diegows diego@flugel.it +Dmitry Kuzmenko DmitryKuzmenko dmitry.kuzmenko@dsr-corporation.com EHJ-52n EHJ-52n EHJ-52n@users.noreply.github.com ek9 ek9 Elias Probst eliasp From 1c210214258bb79874c630a6760d536ab6977211 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 18:17:56 +0100 Subject: [PATCH 19/35] Include the upcoming Sodium release in the check --- bootstrap-salt.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c828e60..bc6d2e5 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -785,7 +785,6 @@ if [ -d "${_VIRTUALENV_DIR}" ]; then exit 1 fi - #--- FUNCTION ------------------------------------------------------------------------------------------------------- # NAME: __fetch_url # DESCRIPTION: Retrieves a URL and writes it to a given path From 15ee3356871b5219de556ab4c8958f2713ee7cc4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 19:29:45 +0100 Subject: [PATCH 20/35] Also do not test Salt >= 3000 under Python 2 --- .github/workflows/main.yml | 736 ------------------------ .github/workflows/templates/generate.py | 7 + 2 files changed, 7 insertions(+), 736 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 87cd725..066f053 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,98 +228,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-amazon-2 - py2-stable-3000-amazon-2: - name: Amazon 2 v3000 Py2 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-stable-3000-amazon-2 || bundle exec kitchen create py2-stable-3000-amazon-2 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-stable-3000-amazon-2 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-stable-3000-amazon-2 - - - py2-git-3000-amazon-2: - name: Amazon 2 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-amazon-2 || bundle exec kitchen create py2-git-3000-amazon-2 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-amazon-2 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-amazon-2 - - py3-stable-3000-amazon-2: name: Amazon 2 v3000 Py3 Stable runs-on: ubuntu-latest @@ -596,52 +504,6 @@ jobs: bundle exec kitchen destroy py2-git-2019-2-arch - py2-git-3000-arch: - name: Arch v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-arch || bundle exec kitchen create py2-git-3000-arch - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-arch - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-arch - - py2-stable-2018-3-centos-6: name: CentOS 6 v2018.3 Py2 Stable runs-on: ubuntu-latest @@ -826,98 +688,6 @@ jobs: bundle exec kitchen destroy py2-git-2019-2-centos-6 - py2-stable-3000-centos-6: - name: CentOS 6 v3000 Py2 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-stable-3000-centos-6 || bundle exec kitchen create py2-stable-3000-centos-6 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-stable-3000-centos-6 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-stable-3000-centos-6 - - - py2-git-3000-centos-6: - name: CentOS 6 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-centos-6 || bundle exec kitchen create py2-git-3000-centos-6 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-centos-6 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-centos-6 - - latest-centos-6: name: CentOS 6 Latest packaged release runs-on: ubuntu-latest @@ -1332,98 +1102,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-centos-7 - py2-stable-3000-centos-7: - name: CentOS 7 v3000 Py2 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-stable-3000-centos-7 || bundle exec kitchen create py2-stable-3000-centos-7 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-stable-3000-centos-7 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-stable-3000-centos-7 - - - py2-git-3000-centos-7: - name: CentOS 7 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-centos-7 || bundle exec kitchen create py2-git-3000-centos-7 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-centos-7 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-centos-7 - - py3-stable-3000-centos-7: name: CentOS 7 v3000 Py3 Stable runs-on: ubuntu-latest @@ -2252,98 +1930,6 @@ jobs: bundle exec kitchen destroy py2-git-2019-2-debian-8 - py2-stable-3000-debian-8: - name: Debian 8 v3000 Py2 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-stable-3000-debian-8 || bundle exec kitchen create py2-stable-3000-debian-8 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-stable-3000-debian-8 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-stable-3000-debian-8 - - - py2-git-3000-debian-8: - name: Debian 8 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-debian-8 || bundle exec kitchen create py2-git-3000-debian-8 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-debian-8 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-debian-8 - - latest-debian-8: name: Debian 8 Latest packaged release runs-on: ubuntu-latest @@ -2758,98 +2344,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-debian-9 - py2-stable-3000-debian-9: - name: Debian 9 v3000 Py2 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-stable-3000-debian-9 || bundle exec kitchen create py2-stable-3000-debian-9 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-stable-3000-debian-9 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-stable-3000-debian-9 - - - py2-git-3000-debian-9: - name: Debian 9 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-debian-9 || bundle exec kitchen create py2-git-3000-debian-9 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-debian-9 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-debian-9 - - py3-stable-3000-debian-9: name: Debian 9 v3000 Py3 Stable runs-on: ubuntu-latest @@ -4000,52 +3494,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-opensuse-15 - py2-git-3000-opensuse-15: - name: Opensuse 15 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-opensuse-15 || bundle exec kitchen create py2-git-3000-opensuse-15 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-opensuse-15 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-opensuse-15 - - py3-git-3000-opensuse-15: name: Opensuse 15 v3000 Py3 Git runs-on: ubuntu-latest @@ -4552,98 +4000,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-ubuntu-1604 - py2-stable-3000-ubuntu-1604: - name: Ubuntu 16.04 v3000 Py2 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-stable-3000-ubuntu-1604 || bundle exec kitchen create py2-stable-3000-ubuntu-1604 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-stable-3000-ubuntu-1604 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-stable-3000-ubuntu-1604 - - - py2-git-3000-ubuntu-1604: - name: Ubuntu 16.04 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-ubuntu-1604 || bundle exec kitchen create py2-git-3000-ubuntu-1604 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-ubuntu-1604 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-ubuntu-1604 - - py3-stable-3000-ubuntu-1604: name: Ubuntu 16.04 v3000 Py3 Stable runs-on: ubuntu-latest @@ -5196,98 +4552,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-ubuntu-1804 - py2-stable-3000-ubuntu-1804: - name: Ubuntu 18.04 v3000 Py2 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-stable-3000-ubuntu-1804 || bundle exec kitchen create py2-stable-3000-ubuntu-1804 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-stable-3000-ubuntu-1804 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-stable-3000-ubuntu-1804 - - - py2-git-3000-ubuntu-1804: - name: Ubuntu 18.04 v3000 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-3000-ubuntu-1804 || bundle exec kitchen create py2-git-3000-ubuntu-1804 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-3000-ubuntu-1804 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-3000-ubuntu-1804 - - py3-stable-3000-ubuntu-1804: name: Ubuntu 18.04 v3000 Py3 Stable runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 87b8e8a..ce443d7 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -143,6 +143,13 @@ def generate_test_jobs(): # Salt's master branch no longer supports Python 2 continue + try: + if int(branch) >= 3000 and python_version == 'py2': + # Salt's 300X versions no longer supports Python 2 + continue + except ValueError: + pass + for bootstrap_type in ('stable', 'git'): if bootstrap_type == 'stable': if branch == 'master': From 3a3d26752b32bdcd913591f4d6946916eaa27186 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 May 2020 19:41:29 +0100 Subject: [PATCH 21/35] Additional blacklisting --- .github/workflows/main.yml | 138 ------------------------ .github/workflows/templates/generate.py | 15 +++ 2 files changed, 15 insertions(+), 138 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 066f053..789b167 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2712,144 +2712,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-fedora-30 - py3-stable-3000-fedora-30: - name: Fedora 30 v3000 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: 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-fedora-30 || bundle exec kitchen create py3-stable-3000-fedora-30 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3000-fedora-30 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3000-fedora-30 - - - py3-git-3000-fedora-30: - name: Fedora 30 v3000 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3000-fedora-30 || bundle exec kitchen create py3-git-3000-fedora-30 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3000-fedora-30 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3000-fedora-30 - - - py3-git-master-fedora-30: - name: Fedora 30 Master Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: 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-30 || bundle exec kitchen create py3-git-master-fedora-30 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-master-fedora-30 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-master-fedora-30 - - latest-fedora-30: name: Fedora 30 Latest packaged release runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index ce443d7..88f6a5c 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -69,6 +69,12 @@ SALT_BRANCHES = [ 'latest' ] +SALT_POST_3000_BLACKLIST = [ + 'centos-6', + 'debian-8', + 'fedora-30', +] + BRANCH_DISPLAY_NAMES = { '2018-3': 'v2018.3', '2019-2': 'v2019.2', @@ -110,6 +116,15 @@ def generate_test_jobs(): for distro in LINUX_DISTROS + OSX + WINDOWS: for branch in SALT_BRANCHES: + + if branch == 'master' and distro in SALT_POST_3000_BLACKLIST: + continue + try: + if int(branch) >= 3000 and distro in SALT_POST_3000_BLACKLIST: + continue + except ValueError: + pass + if branch == 'latest': if distro in LATEST_PKG_BLACKLIST: continue From a0dfd4fc44bd9e3c18aac5553189fbe7bf2fd80e Mon Sep 17 00:00:00 2001 From: Ken Crowell Date: Mon, 25 May 2020 17:36:16 -0300 Subject: [PATCH 22/35] Use current ius-release links --- AUTHORS.rst | 1 + bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 7803e29..4d45e71 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -91,6 +91,7 @@ Justin Anderson justinta justin.ta@outlook.com Justin Findlay jfindlay jfindlay@gmail.com kgbsd Karl Grzeszczak karlgrz +Ken Crowell oeuftete kcrowell@saltstack.com Kenneth Wilke KennethWilke Kevin Quinn kevinquinnyo kevin.quinn@totalserversolutions.com kiemlicz kiemlicz diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index bc6d2e5..de8d4a3 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1153,7 +1153,7 @@ __install_python() { echoinfo "$DISTRO_NAME_L" case "$DISTRO_NAME_L" in "red_hat"|"centos") - __PYTHON_REPO_URL="https://centos${DISTRO_MAJOR_VERSION}.iuscommunity.org/ius-release.rpm" + __PYTHON_REPO_URL="https://repo.ius.io/ius-release-el${DISTRO_MAJOR_VERSION}.rpm" ;; *) echoerror "Installing a repo to provide a python package is only supported on Redhat/CentOS. From 11d59fda895d240ee798df60bab9c3eb50403738 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 06:59:11 +0100 Subject: [PATCH 23/35] Test bootstrapped Salt and Python versions are the intended ones --- .kitchen.yml | 2 +- tests/conftest.py | 20 ++++++++++++++++++++ tests/integration/test_connection.py | 7 ------- tests/integration/test_installation.py | 24 ++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 8 deletions(-) delete mode 100644 tests/integration/test_connection.py create mode 100644 tests/integration/test_installation.py diff --git a/.kitchen.yml b/.kitchen.yml index 9aeec24..ecc3a6f 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -232,4 +232,4 @@ suites: verifier: name: shell remote_exec: false - command: pytest --cache-clear -v tests/integration/ + command: pytest --cache-clear -v -s -ra --log-cli-level=info tests/integration/ diff --git a/tests/conftest.py b/tests/conftest.py index 07c2ab9..36abec1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,10 @@ import os +import pprint import pytest import testinfra +import logging + +log = logging.getLogger(__name__) @pytest.fixture(scope='session') @@ -14,3 +18,19 @@ def host(): 'paramiko://{KITCHEN_USERNAME}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}'.format(**os.environ), ssh_identity_file=os.environ.get('KITCHEN_SSH_KEY')) return testinfra.get_host('docker://{KITCHEN_USERNAME}@{KITCHEN_CONTAINER_ID}'.format(**os.environ)) + + +@pytest.fixture(scope='session') +def target_python_version(): + target_python = os.environ["KITCHEN_SUITE"].split("-", 1)[0] + if target_python == "latest": + pytest.skip("Unable to get target python from {}".format(os.environ["KITCHEN_SUITE"])) + return int(target_python.replace("py", "")) + + +@pytest.fixture(scope='session') +def target_salt_version(): + target_salt = os.environ["KITCHEN_SUITE"].split("-", 2)[-1].replace("-", ".") + if target_salt in ("latest", "master"): + pytest.skip("Don't have a specific salt version to test against") + return target_salt diff --git a/tests/integration/test_connection.py b/tests/integration/test_connection.py deleted file mode 100644 index c32f88f..0000000 --- a/tests/integration/test_connection.py +++ /dev/null @@ -1,7 +0,0 @@ -# -*- coding: utf-8 -*- -import pytest - - -def test_ping(host): - with host.sudo(): - assert host.salt('test.ping', '--timeout=120') diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py new file mode 100644 index 0000000..07112e0 --- /dev/null +++ b/tests/integration/test_installation.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +import json +import pytest +import logging +import pprint + +log = logging.getLogger(__name__) + + +def test_ping(host): + with host.sudo(): + assert host.salt('test.ping', '--timeout=120') + + +def test_target_python_version(host, target_python_version): + with host.sudo(): + ret = host.salt('grains.item', 'pythonversion', '--timeout=120') + assert ret["pythonversion"][0] == target_python_version + + +def test_target_salt_version(host, target_salt_version): + with host.sudo(): + ret = host.salt('grains.item', 'saltversion', '--timeout=120') + assert ret["saltversion"].startswith(target_salt_version) From 006e99cf96b3fa8a1cb9db5485bdb800c025d34c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 10:12:47 +0100 Subject: [PATCH 24/35] Fix Amazon 2 to respect -x installs --- bootstrap-salt.sh | 48 +++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index de8d4a3..2ce89c2 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -693,6 +693,7 @@ if [ -n "$_PY_EXE" ]; then echoinfo "Detected -x option. Using $_PY_EXE to install Salt." else _PY_PKG_VER="" + _PY_MAJOR_VERSION="" fi # If the configuration directory or archive does not exist, error out @@ -2782,6 +2783,18 @@ EOM } # ---------- end of function __install_salt_from_repo_post_neon ---------- +if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then + if [ "x${_PY_MAJOR_VERSION}" = "x" ]; then + # Default to python 2 for pre Neon installs + _PY_MAJOR_VERSION=2 + fi +else + if [ "x${_PY_MAJOR_VERSION}" = "x" ]; then + # Default to python 3 for post Neon install + _PY_MAJOR_VERSION=3 + fi +fi + ####################################################################################################################### # # Distribution install functions @@ -5193,23 +5206,19 @@ install_amazon_linux_ami_2_git_deps() { fi install_amazon_linux_ami_2_deps || return 1 - if __check_command_exists python3; then - if ! __check_command_exists pip3; then - __yum_install_noinput python3-pip - fi - PIP_EXE='/bin/pip3' - _PY_EXE='python3' - PY_PKG_VER=3 + + if [ "$_PY_MAJOR_VERSION" -eq 2 ]; then + PY_PKG_VER=2 + PIP_EXE='/bin/pip' else - PIP_EXE='pip' - if __check_command_exists python2.7; then - if ! __check_command_exists pip2.7; then - __yum_install_noinput python2-pip - fi - PIP_EXE='/bin/pip' - _PY_EXE='python2.7' - PY_PKG_VER=2 - fi + PY_PKG_VER=3 + PIP_EXE='/bin/pip3' + fi + __PACKAGES="python${PY_PKG_VER}-pip" + + if ! __check_command_exists "${PIP_EXE}"; then + # shellcheck disable=SC2086 + __yum_install_noinput ${__PACKAGES} || return 1 fi if ! __check_command_exists git; then @@ -5243,7 +5252,6 @@ install_amazon_linux_ami_2_git_deps() { __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" if [ "${__REQUIRED_TORNADO}" != "" ]; then if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq "3" ]; then - __PACKAGES="${__PACKAGES} python3-pip" __PIP_PACKAGES="${__PIP_PACKAGES} tornado<$_TORNADO_MAX_PY3_VERSION" else __PACKAGES="${__PACKAGES} ${pkg_append}${PY_PKG_VER}-tornado" @@ -5251,6 +5259,11 @@ install_amazon_linux_ami_2_git_deps() { fi fi + if [ "${__PIP_PACKAGES}" != "" ]; then + __check_pip_allowed "You need to allow pip based installations (-P) in order to install ${__PIP_PACKAGES}" + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pip" + fi + if [ "${__PACKAGES}" != "" ]; then # shellcheck disable=SC2086 __yum_install_noinput ${__PACKAGES} || return 1 @@ -5311,7 +5324,6 @@ install_amazon_linux_ami_2_deps() { __REPO_FILENAME="saltstack-repo.repo" __PY_VERSION_REPO="yum" PY_PKG_VER="" - _PY_MAJOR_VERSION=$(echo "$_PY_PKG_VER" | cut -c 7) repo_label="saltstack-repo" repo_name="SaltStack repo for Amazon Linux 2" if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then From 74153d3ec89d24205ec9a1a1341f94aeb5578b44 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 14:27:22 +0100 Subject: [PATCH 25/35] Fix Fedora stable installs for older releases --- .github/workflows/main.yml | 92 ------------------------- .github/workflows/templates/generate.py | 7 ++ bootstrap-salt.sh | 19 +++-- 3 files changed, 22 insertions(+), 96 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 789b167..42357e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2528,52 +2528,6 @@ jobs: bundle exec kitchen destroy latest-debian-9 - py3-stable-2018-3-fedora-30: - name: Fedora 30 v2018.3 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: 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-2018-3-fedora-30 || bundle exec kitchen create py3-stable-2018-3-fedora-30 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-2018-3-fedora-30 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-2018-3-fedora-30 - - py3-git-2018-3-fedora-30: name: Fedora 30 v2018.3 Py3 Git runs-on: ubuntu-latest @@ -2758,52 +2712,6 @@ jobs: bundle exec kitchen destroy latest-fedora-30 - py3-stable-2018-3-fedora-31: - name: Fedora 31 v2018.3 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: 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-2018-3-fedora-31 || bundle exec kitchen create py3-stable-2018-3-fedora-31 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-2018-3-fedora-31 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-2018-3-fedora-31 - - py3-git-2018-3-fedora-31: name: Fedora 31 v2018.3 Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 88f6a5c..7691b7c 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -176,6 +176,13 @@ def generate_test_jobs(): if branch in STABLE_BRANCH_BLACKLIST: continue + if distro.startswith("fedora"): + if branch == "2018-3": + # There's no 2018.3.x stable builds on Fedora + continue + if distro == "fedora-32" and branch in ("2019-2",): + continue + if branch == '2018-3' and distro in BLACKLIST_2018: continue diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2ce89c2..7081df9 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3813,19 +3813,30 @@ install_fedora_deps() { } install_fedora_stable() { + if [ "$STABLE_REV" = "latest" ]; then + __SALT_VERSION="" + else + __SALT_VERSION="$(dnf list --showduplicates salt | grep "$STABLE_REV" | head -n 1 | awk '{print $2}')" + if [ "x${__SALT_VERSION}" = "x" ]; then + echoerror "Could not find a stable install for Salt ${STABLE_REV}" + exit 1 + fi + echoinfo "Installing Stable Package Version ${__SALT_VERSION}" + __SALT_VERSION="-${__SALT_VERSION}" + fi __PACKAGES="" if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ];then - __PACKAGES="${__PACKAGES} salt-cloud" + __PACKAGES="${__PACKAGES} salt-cloud${__SALT_VERSION}" fi if [ "$_INSTALL_MASTER" -eq $BS_TRUE ]; then - __PACKAGES="${__PACKAGES} salt-master" + __PACKAGES="${__PACKAGES} salt-master${__SALT_VERSION}" fi if [ "$_INSTALL_MINION" -eq $BS_TRUE ]; then - __PACKAGES="${__PACKAGES} salt-minion" + __PACKAGES="${__PACKAGES} salt-minion${__SALT_VERSION}" fi if [ "$_INSTALL_SYNDIC" -eq $BS_TRUE ]; then - __PACKAGES="${__PACKAGES} salt-syndic" + __PACKAGES="${__PACKAGES} salt-syndic${__SALT_VERSION}" fi # shellcheck disable=SC2086 From 2de93d0f60f1f1ab18048801e562269ae172ef17 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 17:53:04 +0100 Subject: [PATCH 26/35] Fedora doesn't keep old versions around --- .github/workflows/main.yml | 138 ------------------------ .github/workflows/templates/generate.py | 9 +- 2 files changed, 3 insertions(+), 144 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 42357e9..ceb650e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2574,52 +2574,6 @@ jobs: bundle exec kitchen destroy py3-git-2018-3-fedora-30 - py3-stable-2019-2-fedora-30: - name: Fedora 30 v2019.2 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-2019-2-fedora-30 || bundle exec kitchen create py3-stable-2019-2-fedora-30 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-2019-2-fedora-30 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-2019-2-fedora-30 - - py3-git-2019-2-fedora-30: name: Fedora 30 v2019.2 Py3 Git runs-on: ubuntu-latest @@ -2758,52 +2712,6 @@ jobs: bundle exec kitchen destroy py3-git-2018-3-fedora-31 - py3-stable-2019-2-fedora-31: - name: Fedora 31 v2019.2 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-2019-2-fedora-31 || bundle exec kitchen create py3-stable-2019-2-fedora-31 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-2019-2-fedora-31 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-2019-2-fedora-31 - - py3-git-2019-2-fedora-31: name: Fedora 31 v2019.2 Py3 Git runs-on: ubuntu-latest @@ -2850,52 +2758,6 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-fedora-31 - py3-stable-3000-fedora-31: - name: Fedora 31 v3000 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: 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-fedora-31 || bundle exec kitchen create py3-stable-3000-fedora-31 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3000-fedora-31 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3000-fedora-31 - - py3-git-3000-fedora-31: name: Fedora 31 v3000 Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 7691b7c..0e49dc1 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -176,12 +176,9 @@ def generate_test_jobs(): if branch in STABLE_BRANCH_BLACKLIST: continue - if distro.startswith("fedora"): - if branch == "2018-3": - # There's no 2018.3.x stable builds on Fedora - continue - if distro == "fedora-32" and branch in ("2019-2",): - continue + if distro.startswith("fedora") and branch != "latest": + # Fedora does not keep old builds around + continue if branch == '2018-3' and distro in BLACKLIST_2018: continue From 79812ca0b0dc893de99dc0a5252a85bed46e7361 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 18:01:12 +0100 Subject: [PATCH 27/35] Enable a few more builds --- .github/workflows/main.yml | 276 ++++++++++++++++++++++++ .github/workflows/templates/generate.py | 19 +- .kitchen.yml | 4 - 3 files changed, 291 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ceb650e..381b4e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -504,6 +504,98 @@ jobs: bundle exec kitchen destroy py2-git-2019-2-arch + py3-git-3000-arch: + name: Arch v3000 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 10 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: 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-arch || bundle exec kitchen create py3-git-3000-arch + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3000-arch + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3000-arch + + + py3-git-master-arch: + name: Arch Master Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 10 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: 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-arch || bundle exec kitchen create py3-git-master-arch + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-master-arch + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-master-arch + + py2-stable-2018-3-centos-6: name: CentOS 6 v2018.3 Py2 Stable runs-on: ubuntu-latest @@ -1516,6 +1608,52 @@ jobs: bundle exec kitchen destroy py3-git-master-centos-8 + latest-centos-8: + name: CentOS 8 Latest packaged release + runs-on: ubuntu-latest + timeout-minutes: 10 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create latest-centos-8 || bundle exec kitchen create latest-centos-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify latest-centos-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy latest-centos-8 + + py3-stable-2019-2-debian-10: name: Debian 10 v2019.2 Py3 Stable runs-on: ubuntu-latest @@ -1746,6 +1884,52 @@ jobs: bundle exec kitchen destroy py3-git-master-debian-10 + latest-debian-10: + name: Debian 10 Latest packaged release + runs-on: ubuntu-latest + timeout-minutes: 10 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create latest-debian-10 || bundle exec kitchen create latest-debian-10 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify latest-debian-10 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy latest-debian-10 + + py2-stable-2018-3-debian-8: name: Debian 8 v2018.3 Py2 Stable runs-on: ubuntu-latest @@ -2896,6 +3080,98 @@ jobs: bundle exec kitchen destroy latest-fedora-31 + py3-git-3000-fedora-32: + name: Fedora 32 v3000 Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 10 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-3000-fedora-32 || bundle exec kitchen create py3-git-3000-fedora-32 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-3000-fedora-32 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-3000-fedora-32 + + + py3-git-master-fedora-32: + name: Fedora 32 Master Py3 Git + runs-on: ubuntu-latest + timeout-minutes: 10 + + needs: lint + + steps: + - uses: actions/checkout@v1 + - name: Setup Ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: 2.6.x + + - name: Install Bundler + run: | + gem install bundler + + - name: Setup Bundle + run: | + bundle install --with docker --without opennebula ec2 windows vagrant + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install Python Dependencies + run: | + pip install -U pip + pip install -r tests/requirements.txt + + - name: Create Test Container + run: | + bundle exec kitchen create py3-git-master-fedora-32 || bundle exec kitchen create py3-git-master-fedora-32 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-git-master-fedora-32 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-git-master-fedora-32 + + latest-fedora-32: name: Fedora 32 Latest packaged release runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 0e49dc1..cd78049 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -48,11 +48,11 @@ PY2_BLACKLIST = [ ] PY3_BLACKLIST = [ - 'arch', # Defaults to Py3.8 +# 'arch', # Defaults to Py3.8 'amazon-1', 'centos-6', 'debian-8', - 'fedora-32' # Defaults to Py3.8 +# 'fedora-32' # Defaults to Py3.8 ] BLACKLIST_2018 = [ @@ -88,8 +88,8 @@ STABLE_BRANCH_BLACKLIST = [ LATEST_PKG_BLACKLIST = [ 'arch', # No packages are built - 'centos-8', # Once Neon is out, this can be removed from here - 'debian-10' # Once Neon is out, this can be removed from here +# 'centos-8', # Once Neon is out, this can be removed from here +# 'debian-10' # Once Neon is out, this can be removed from here ] DISTRO_DISPLAY_NAMES = { @@ -180,6 +180,17 @@ def generate_test_jobs(): # Fedora does not keep old builds around continue + if bootstrap_type == "git": + if python_version == "py3": + if distro in ("arch", "fedora-32"): + allowed_branches = ["master"] + try: + allowed_branches.append(str(int(branch))) + except ValueError: + pass + if branch not in allowed_branches: + # Arch and Fedora default to py3.8 + continue if branch == '2018-3' and distro in BLACKLIST_2018: continue diff --git a/.kitchen.yml b/.kitchen.yml index ecc3a6f..8686255 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -168,7 +168,6 @@ suites: salt_version: 3000 salt_bootstrap_options: -x python3 -MPfq git %s excludes: - - arch - amazon-1 - centos-6 - debian-8 @@ -215,12 +214,9 @@ suites: salt_version: master salt_bootstrap_options: -x python3 -MPfq -D git %s excludes: - - arch - amazon-1 - centos-6 - debian-8 - - fedora-32 - - opensuse-15 - name: latest provisioner: From 5a2eb9688d04522fc17356668672082653429635 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 18:43:57 +0100 Subject: [PATCH 28/35] Fix CentOS 8 installations --- bootstrap-salt.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7081df9..7e73033 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2003,6 +2003,12 @@ __rpm_import_gpg() { tempfile="$(__temp_gpg_pub)" __fetch_url "$tempfile" "$url" || return 1 + + # At least on CentOS 8, a missing newline at the end causes: + # error: /tmp/salt-gpg-n1gKUb1u.pub: key 1 not an armored public key. + # shellcheck disable=SC1003,SC2086 + sed -i -e '$a\' $tempfile + rpm --import "$tempfile" || return 1 rm -f "$tempfile" @@ -4109,6 +4115,14 @@ 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 echoerror "Detected -r or -R option while installing Salt packages for Python 3." echoerror "Python 3 packages for Salt require the EPEL repository to be installed." From 9ff35a97bab3a1f719a6cda70896005f8b304f75 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 18:54:08 +0100 Subject: [PATCH 29/35] Default Debian 10 to Py3 --- bootstrap-salt.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7e73033..d8fde95 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3379,6 +3379,15 @@ 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 From c539ffa2b70b608ce7bcae50b792cada5473f940 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 19:07:03 +0100 Subject: [PATCH 30/35] Fix Arch Linux installs --- bootstrap-salt.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d8fde95..bc4e109 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5515,11 +5515,19 @@ install_arch_linux_stable_deps() { pacman-db-upgrade || return 1 fi + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 2 ]; then + PY_PKG_VER=2 + else + PY_PKG_VER="" + fi + # YAML module is used for generating custom master/minion configs - pacman -Su --noconfirm --needed python2-yaml + # shellcheck disable=SC2086 + pacman -Su --noconfirm --needed python${PY_PKG_VER}-yaml if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then - pacman -Su --noconfirm --needed python2-apache-libcloud || return 1 + # shellcheck disable=SC2086 + pacman -Su --noconfirm --needed python${PY_PKG_VER}-apache-libcloud || return 1 fi if [ "${_EXTRA_PACKAGES}" != "" ]; then From 0c152975cff1735f91675d3abcbc382eeb934495 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 19:08:35 +0100 Subject: [PATCH 31/35] Remove old cruft --- .drone.jsonnet | 208 ----- .drone.yml | 1748 --------------------------------------- Dockerfile.drone-builds | 19 - appveyor.yml | 32 - 4 files changed, 2007 deletions(-) delete mode 100644 .drone.jsonnet delete mode 100644 .drone.yml delete mode 100644 Dockerfile.drone-builds delete mode 100644 appveyor.yml diff --git a/.drone.jsonnet b/.drone.jsonnet deleted file mode 100644 index 0dc1d94..0000000 --- a/.drone.jsonnet +++ /dev/null @@ -1,208 +0,0 @@ -local git_suites = [ - { name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3', depends: [] }, - { name: 'Py2 2019.2(Git)', slug: 'py2-git-2019-2', depends: ['Py2 2018.3(Git)'] }, - { name: 'Py2 3000(Git)', slug: 'py2-git-3000', depends: ['Py2 2019.2(Git)'] }, - // {name: 'Py2 develop(Stable)', slug: 'py2-git-develop'}, // Don't test against Salt's develop branch. Stability is not assured. -]; - -local git_py3_suites = [ - { name: 'Py3 2018.3(Git)', slug: 'py3-git-2018-3', depends: [] }, - { name: 'Py3 2019.2(Git)', slug: 'py3-git-2019-2', depends: ['Py3 2018.3(Git)'] }, - { name: 'Py3 3000(Git)', slug: 'py3-git-3000', depends: ['Py3 2019.2(Git)'] }, -]; - -local stable_suites = [ - { name: 'Py2 2018.3(Stable)', slug: 'py2-stable-2018-3', depends: ['Py2 2018.3(Git)'] }, - { name: 'Py2 2019.2(Stable)', slug: 'py2-stable-2019-2', depends: ['Py2 2019.2(Git)'] }, - { name: 'Py2 3000(Stable)', slug: 'py2-stable-3000', depends: ['Py2 3000(Git)'] }, -]; - -local stable_py3_suites = [ - { name: 'Py3 2018.3(Stable)', slug: 'py3-stable-2018-3', depends: ['Py3 2018.3(Git)'] }, - { name: 'Py3 2019.2(Stable)', slug: 'py3-stable-2019-2', depends: ['Py3 2019.2(Git)'] }, - { name: 'Py3 3000(Stable)', slug: 'py3-stable-3000', depends: ['Py3 3000(Git)'] }, -]; - -local distros = [ - { name: 'Arch', slug: 'arch', multiplier: 0, depends: [] }, -// { name: 'Amazon 1', slug: 'amazon-1', multiplier: 1, depends: [] }, - { name: 'Amazon 2', slug: 'amazon-2', multiplier: 2, depends: [] }, - { name: 'CentOS 6', slug: 'centos-6', multiplier: 3, depends: [] }, - { name: 'CentOS 7', slug: 'centos-7', multiplier: 4, depends: [] }, - { name: 'CentOS 8', slug: 'centos-8', multiplier: 5, depends: [] }, - { name: 'Debian 8', slug: 'debian-8', multiplier: 6, depends: [] }, - { name: 'Debian 9', slug: 'debian-9', multiplier: 7, depends: [] }, - { name: 'Debian 10', slug: 'debian-10', multiplier: 5, depends: [] }, - { name: 'Fedora 30', slug: 'fedora-30', multiplier: 4, depends: [] }, - { name: 'Fedora 31', slug: 'fedora-31', multiplier: 3, depends: [] }, - { name: 'Opensuse 15.1', slug: 'opensuse-15', multiplier: 2, depends: [] }, - { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] }, - { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] }, -]; - -local stable_distros = [ - 'amazon-1', - 'amazon-2', - 'centos-6', - 'centos-7', - 'centos-8', - 'debian-8', - 'debian-9', - 'debian-10', - 'fedora-30', - 'ubuntu-1604', - 'ubuntu-1804', -]; - -local py3_distros = [ - 'amazon-2', -// 'arch', - 'centos-7', - 'centos-8', - 'debian-9', - 'debian-10', - 'ubuntu-1604', - 'ubuntu-1804', - 'fedora-30', - 'fedora-31', -]; - -local py2_blacklist = [ - 'centos-8', - 'debian-10', - 'fedora-30', - 'fedora-31', -]; - -local blacklist_2018 = [ - 'centos-8', - 'debian-10', - 'amazon-2', -]; - -local Shellcheck() = { - kind: 'pipeline', - name: 'Lint', - - steps: [ - { - name: 'shellcheck', - image: 'koalaman/shellcheck-alpine:v0.6.0', - commands: [ - 'shellcheck -s sh -f checkstyle bootstrap-salt.sh', - ], - }, - ], -}; - - -local Build(distro) = { - kind: 'pipeline', - name: distro.name, - node: { - project: 'open', - }, - - local temp_git_suites = if std.count(py2_blacklist, distro.slug) > 0 then - [] - else - git_suites, - - local temp_stable_suites = if std.count(py2_blacklist, distro.slug) > 0 then - [] - else if std.count(stable_distros, distro.slug) > 0 then - stable_suites - else - [], - - local temp_git_py3_suites = if std.count(py3_distros, distro.slug) < 1 then - [] - else if std.count(blacklist_2018, distro.slug) > 0 then - git_py3_suites[1:] - else if std.count(py3_distros, distro.slug) > 0 then - git_py3_suites - else - [], - - local temp_stable_py3_suites = if std.count(stable_distros, distro.slug) < 1 then - [] - else if std.count(blacklist_2018, distro.slug) > 0 then - stable_py3_suites[1:] - else if std.count(py3_distros, distro.slug) > 0 then - stable_py3_suites - else - [], - - local suites = temp_git_suites + temp_stable_suites + temp_git_py3_suites + temp_stable_py3_suites, - - steps: [ - { - name: 'throttle-build', - image: 'alpine', - commands: [ - std.format( - "sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", - { offset: 6 * std.length(suites) * distro.multiplier } - ), - ], - }, - { - name: 'create', - image: 'saltstack/drone-salt-bootstrap-testing', - environment: { - DOCKER_HOST: 'tcp://docker:2375', - }, - depends_on: [ - 'throttle-build', - ], - commands: [ - 'bundle install --with docker --without opennebula ec2 windows vagrant', - "echo 'Waiting for docker to start'", - 'sleep 20', // give docker enough time to start - 'docker ps -a', - std.format('bundle exec kitchen create %s', [distro.slug]), - ], - }, - ] + [ - { - name: suite.name, - image: 'saltstack/drone-salt-bootstrap-testing', - environment: { - DOCKER_HOST: 'tcp://docker:2375', - }, - depends_on: [ - 'throttle-build', - 'create', - ], - commands: [ - 'pip install -U pip', - 'pip install -r tests/requirements.txt', - 'bundle install --with docker --without opennebula ec2 windows vagrant', - std.format('bundle exec kitchen test %s-%s', [suite.slug, distro.slug]), - ], - } - for suite in suites - ], - services: [ - { - name: 'docker', - image: 'saltstack/drone-salt-bootstrap-testing', - privileged: true, - environment: {}, - command: [ - '--storage-driver=overlay2', - ], - }, - ], - depends_on: [ - 'Lint', - ] + distro.depends, -}; - - -[ - Shellcheck(), -] + [ - Build(distro) - for distro in distros -] diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 6f8ab6e..0000000 --- a/.drone.yml +++ /dev/null @@ -1,1748 +0,0 @@ ---- -kind: pipeline -name: Lint - -platform: - os: linux - arch: amd64 - -steps: -- name: shellcheck - image: koalaman/shellcheck-alpine:v0.6.0 - commands: - - shellcheck -s sh -f checkstyle bootstrap-salt.sh - ---- -kind: pipeline -name: Arch - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=0; echo Sleeping 0 seconds; sleep 0' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create arch - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-arch - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-arch - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-arch - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Amazon 2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2018-3-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2019-2-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-3000-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: CentOS 6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=108; echo Sleeping 108 seconds; sleep 108' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2018-3-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2019-2-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-3000-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: CentOS 7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=288; echo Sleeping 288 seconds; sleep 288' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2018-3-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2019-2-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-3000-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2018-3-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2018-3-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: CentOS 8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Debian 8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=216; echo Sleeping 216 seconds; sleep 216' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2018-3-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2019-2-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-3000-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Debian 9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=504; echo Sleeping 504 seconds; sleep 504' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2018-3-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2019-2-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-3000-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2018-3-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2018-3-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Debian 10 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Fedora 30 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=144; echo Sleeping 144 seconds; sleep 144' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py3 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2018-3-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2018-3-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Fedora 31 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=54; echo Sleeping 54 seconds; sleep 54' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create fedora-31 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py3 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2018-3-fedora-31 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-fedora-31 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-fedora-31 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Opensuse 15.1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=36; echo Sleeping 36 seconds; sleep 36' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create opensuse-15 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-opensuse-15 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-opensuse-15 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-opensuse-15 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Ubuntu 16.04 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=72; echo Sleeping 72 seconds; sleep 72' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2018-3-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2019-2-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-3000-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2018-3-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2018-3-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Ubuntu 18.04 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=0; echo Sleeping 0 seconds; sleep 0' - -- name: create - image: saltstack/drone-salt-bootstrap-testing - commands: - - bundle install --with docker --without opennebula ec2 windows vagrant - - echo 'Waiting for docker to start' - - sleep 20 - - docker ps -a - - bundle exec kitchen create ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2018-3-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-2019-2-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-git-3000-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2018-3-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-2019-2-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py2 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py2-stable-3000-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2018-3-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-2019-2-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Git) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-git-3000-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2018.3(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2018-3-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 2019.2(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-2019-2-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -- name: Py3 3000(Stable) - image: saltstack/drone-salt-bootstrap-testing - commands: - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - bundle exec kitchen test py3-stable-3000-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - -services: -- name: docker - image: saltstack/drone-salt-bootstrap-testing - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: signature -hmac: 541f7de01e4a4321197c3667ecc63abf147d1f7133a819e7bff1cf64ca83a4e0 - -... diff --git a/Dockerfile.drone-builds b/Dockerfile.drone-builds deleted file mode 100644 index f83c675..0000000 --- a/Dockerfile.drone-builds +++ /dev/null @@ -1,19 +0,0 @@ -# docker build --rm -t saltstack/drone-salt-bootstrap-testing -f Dockerfile.drone-builds . -FROM docker:edge-dind - -COPY Gemfile /Gemfile -COPY tests/requirements.txt /requirements.txt - -RUN apk --update add \ - wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc make libc-dev openssl-dev libffi-dev && \ - gem install bundler && \ - bundle install --gemfile=/Gemfile --with docker --without opennebula ec2 windows vagrant && \ - pip install -U pip && \ - pip install -r /requirements.txt && \ - rm -rf /requirements.txt /Gemfile /root/.cache - -VOLUME /var/lib/docker -EXPOSE 2375 - -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"] -CMD [] diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 6c7b57b..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -platform: Any CPU - -environment: - matrix: - - bootstrap_args: - test_args: -master salt -runservice - - - bootstrap_args: -runservice false - test_args: -master salt -noservice - - - bootstrap_args: -minion a-minion - test_args: -minion a-minion -master salt -runservice - - - bootstrap_args: -minion a-minion -master a-master - test_args: -minion a-minion -master a-master -runservice - -build_script: - - ps: | - $Path = (Get-Location).Path | Join-Path -ChildPath bootstrap-salt.ps1 - Invoke-Expression "$Path -verbose $env:bootstrap_args" - -before_test: - - SET PATH=%PATH%;C:\salt - - salt-call --version - -test_script: - - ps: | - $Path = (Get-Location).Path | Join-Path -ChildPath tests\runtests.ps1 - Invoke-Expression "$Path -verbose $env:test_args" - -matrix: - fast_finish: true From 0f5ba2c7f524ebd750a54a0f2126b7824b5dc22d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 19:11:10 +0100 Subject: [PATCH 32/35] Salt v3000 is not Py3.8 ready --- .github/workflows/main.yml | 92 ------------------------- .github/workflows/templates/generate.py | 4 +- 2 files changed, 3 insertions(+), 93 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 381b4e4..d467553 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -504,52 +504,6 @@ jobs: bundle exec kitchen destroy py2-git-2019-2-arch - py3-git-3000-arch: - name: Arch v3000 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: 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-arch || bundle exec kitchen create py3-git-3000-arch - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3000-arch - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3000-arch - - py3-git-master-arch: name: Arch Master Py3 Git runs-on: ubuntu-latest @@ -3080,52 +3034,6 @@ jobs: bundle exec kitchen destroy latest-fedora-31 - py3-git-3000-fedora-32: - name: Fedora 32 v3000 Py3 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-git-3000-fedora-32 || bundle exec kitchen create py3-git-3000-fedora-32 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-git-3000-fedora-32 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-git-3000-fedora-32 - - py3-git-master-fedora-32: name: Fedora 32 Master Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index cd78049..162d67b 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -185,7 +185,9 @@ def generate_test_jobs(): if distro in ("arch", "fedora-32"): allowed_branches = ["master"] try: - allowed_branches.append(str(int(branch))) + int_branch = int(branch) + if int_branch > 3000: + allowed_branches.append(branch) except ValueError: pass if branch not in allowed_branches: From 074d8a9ec2b454876bcb0785a2cb7a159ba1608c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 19:50:12 +0100 Subject: [PATCH 33/35] Only test Opensuse 15 under Py3 --- .github/workflows/main.yml | 92 ------------------------- .github/workflows/templates/generate.py | 7 +- 2 files changed, 2 insertions(+), 97 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d467553..beedd64 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3126,52 +3126,6 @@ jobs: bundle exec kitchen destroy latest-fedora-32 - py2-git-2018-3-opensuse-15: - name: Opensuse 15 v2018.3 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-2018-3-opensuse-15 || bundle exec kitchen create py2-git-2018-3-opensuse-15 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-2018-3-opensuse-15 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-2018-3-opensuse-15 - - py3-git-2018-3-opensuse-15: name: Opensuse 15 v2018.3 Py3 Git runs-on: ubuntu-latest @@ -3218,52 +3172,6 @@ jobs: bundle exec kitchen destroy py3-git-2018-3-opensuse-15 - py2-git-2019-2-opensuse-15: - name: Opensuse 15 v2019.2 Py2 Git - runs-on: ubuntu-latest - timeout-minutes: 10 - - needs: lint - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py2-git-2019-2-opensuse-15 || bundle exec kitchen create py2-git-2019-2-opensuse-15 - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py2-git-2019-2-opensuse-15 - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py2-git-2019-2-opensuse-15 - - py3-git-2019-2-opensuse-15: name: Opensuse 15 v2019.2 Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 162d67b..caca690 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -44,15 +44,14 @@ PY2_BLACKLIST = [ 'debian-10', 'fedora-30', 'fedora-31', - 'fedora-32' + 'fedora-32', + 'opensuse-15' ] PY3_BLACKLIST = [ -# 'arch', # Defaults to Py3.8 'amazon-1', 'centos-6', 'debian-8', -# 'fedora-32' # Defaults to Py3.8 ] BLACKLIST_2018 = [ @@ -88,8 +87,6 @@ STABLE_BRANCH_BLACKLIST = [ LATEST_PKG_BLACKLIST = [ 'arch', # No packages are built -# 'centos-8', # Once Neon is out, this can be removed from here -# 'debian-10' # Once Neon is out, this can be removed from here ] DISTRO_DISPLAY_NAMES = { From 3069335a5fa57af36f71044624e559b7cdf998ae Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 May 2020 10:49:11 +0100 Subject: [PATCH 34/35] Update AUTHORS and ChangeLog --- AUTHORS.rst | 1 + ChangeLog | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 4d45e71..56f90c0 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -81,6 +81,7 @@ Jan Heidbrink jheidbrink Jared Bristow jars99 Jared E Stroud jaredestroud jaredestroud@gmail.com Jasper Lievisse Adriaanse jasperla jasper@humppa.nl +Jaydeep jay1648 JD decomposite Jeff Hui jeffh jeff@jeffhui.net Jeff Strunk jstrunk diff --git a/ChangeLog b/ChangeLog index 5da6c3b..8b9230e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ Version TBD (In Progress on the Develop Branch): +Version 2020.05.28: + * Fix Opensuse Tumbleweed (noelmcloughlin) #1441 + * Remove Debian 8 from Python 3 supported list (jay1648) #1448 + * Fixed deps parsing for FreeBSD git installs (cedwards) #1462 + * Added support for the upcoming Sodium release (s0undt3ch) #1466 + * Fixed KDE Neon detection (ender8282) #1466 + * Updated README python 2 and 3 installations (gdebunne) #1466 + * Updated README and CONTRIBUTING to prefer Salt's master branch (DmitryKuzmenko) #1466 + * Fixed IUS repo addresses (oeuftete) #1469 + * Updated tests to assert target Python and Salt versions (s0undt3ch) #1470 + * Fixed Amazon 2 -x support (s0undt3ch) #1470 + * Fix Fedora stable installs for older releases (s0undt3ch) #1470 + * Fix CentOS 8 installations (s0undt3ch) #1470 + * Default Debian 10 to Py3 (s0undt3ch) #1470 + * Fix Arch Linux installs (s0undt3ch) #1470 + Version 2020.02.24: * Fix SLES 15 install (max298) #1431 * Fix 3000(Neon) stable install (sblaisot) #1433 From e419a6042e69e6d45008882540f20edd26655cd7 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 May 2020 14:52:31 +0100 Subject: [PATCH 35/35] Bump version for release --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index bc4e109..b33d797 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2020.02.24" +__ScriptVersion="2020.05.28" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"