From c3286ac23efa7f5b4c5cec25d3f21606dd1150bd Mon Sep 17 00:00:00 2001 From: Vernon Cole Date: Mon, 3 Feb 2020 16:57:11 -0700 Subject: [PATCH 01/26] first changes to support Ubuntu 20.04 --- bootstrap-salt.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 43d3ea1..d2af224 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1,3 +1,4 @@ + #!/bin/sh - # WARNING: Changes to this file in the salt repo will be overwritten! @@ -1442,6 +1443,9 @@ __ubuntu_codename_translation() { "18") DISTRO_CODENAME="bionic" ;; + "20") + DISTRO_CODENAME="focal" + ;; *) DISTRO_CODENAME="trusty" ;; @@ -2653,7 +2657,7 @@ __install_salt_from_repo_post_neon() { if ! __check_command_exists "${_pip_cmd} --version"; then __PACKAGES="${_py_pkg}-pip gcc" # shellcheck disable=SC2086 - if [ "$DISTRO_NAME_L" = "debian" ];then + if [ "$DISTRO_NAME_L" = "debian" ] || [ "$DISTRO_NAME_L" = "ubuntu" ];then __PACKAGES="${__PACKAGES} ${_py_pkg}-dev" __apt_get_install_noinput ${__PACKAGES} || return 1 else @@ -2769,9 +2773,9 @@ __enable_universe_repository() { __install_saltstack_ubuntu_repository() { # Workaround for latest non-LTS ubuntu - if [ "$DISTRO_MAJOR_VERSION" -gt 18 ] || \ + if [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \ { [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then - echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for latest LTS release. You may experience problems." + echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems." UBUNTU_VERSION=18.04 UBUNTU_CODENAME="bionic" else From 1da561e294f9b4d4e2a9c0453ce72f8ea09929b2 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 5 Feb 2020 11:22:08 +0000 Subject: [PATCH 02/26] Add the sha256sum of the 2020.02.04 release --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index b2ed30c..b695239 100644 --- a/README.rst +++ b/README.rst @@ -28,6 +28,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2020.02.04: ``ce877651b4938e3480f76b1629f582437f6ca8b73d7199fdb9e905e86fe85b34`` - 2020.01.29: ``e9afdfa877998c1c7f0e141a6728b33d0d24348e197aab2b9bde4fe6bc6db1b2`` - 2020.01.21: ``53299aa0dfbf7ab381f3856bb7babfc04a1d6525be11db0b9466277b1e4d0c1a`` - 2019.11.04: ``905924fccd4ebf168d19ba598bf10af53efe02302b792aeb15433e73fd3ad1d2`` From 51995055dd1aa4947ef953ab48442e0579f7a425 Mon Sep 17 00:00:00 2001 From: Wayne Werner Date: Mon, 10 Feb 2020 12:37:24 -0600 Subject: [PATCH 03/26] Add link to hardening Salt This will help address comments on saltstack/salt#56095 --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index b695239..8eec8b4 100644 --- a/README.rst +++ b/README.rst @@ -20,6 +20,8 @@ This ``README`` file is not the absolute truth as to what the bootstrap script i that, please read the generated help by passing ``-h`` to the script or even better, `read the source`_. +Also, to secure your Salt installation, check out these instructions for `hardening salt`_. + Bootstrap ========= @@ -461,6 +463,7 @@ Make edits to .drone.jsonnet and then save them into the .drone.yml by doing the .. _`SaltStack's Ubuntu repository`: http://repo.saltstack.com/#ubuntu .. _`Ubuntu's release schedule`: https://wiki.ubuntu.com/Releases .. _Vagrant: http://www.vagrantup.com +.. _hardening salt: https://docs.saltstack.com/en/latest/topics/hardening.html .. |build| image:: https://drone.saltstack.com/api/badges/saltstack/salt-bootstrap/status.svg :target: https://drone.saltstack.com/saltstack/salt-bootstrap From de3dd0123e46c5711f88e3b06897704038211d20 Mon Sep 17 00:00:00 2001 From: twangboy Date: Thu, 13 Feb 2020 17:07:17 -0700 Subject: [PATCH 04/26] Add support for new version scheme --- bootstrap-salt.ps1 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1 index cc443b7..3c311ec 100644 --- a/bootstrap-salt.ps1 +++ b/bootstrap-salt.ps1 @@ -77,11 +77,13 @@ Param( [Parameter(Mandatory=$false,ValueFromPipeline=$true)] # Doesn't support versions prior to "YYYY.M.R-B" - [ValidatePattern('^201\d\.\d{1,2}\.\d{1,2}(\-\d{1})?|(rc\d)$')] + # Supports new version and latest + # Option 1 means case insensitive + [ValidatePattern('^(\d{4}(\.\d{1,2}){0,2}(\-\d{1})?)|(latest)$', Options=1)] [string]$version = '', [Parameter(Mandatory=$false,ValueFromPipeline=$true)] - # Doesn't support versions prior to "2017.7.0" + # Doesn't support Python versions prior to "2017.7.0" [ValidateSet("2","3")] [string]$pythonVersion = "2", @@ -99,8 +101,8 @@ Param( [string]$repourl= "https://repo.saltstack.com/windows" ) -# Powershell supports only TLS 1.0 by default. Add support up to TLS 1.2 -[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12' +# Powershell supports only TLS 1.0 by default. Add support for TLS 1.2 +[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12' #=============================================================================== # Script Functions @@ -213,7 +215,7 @@ Else { #=============================================================================== # Use version "Latest" if no version is passed #=============================================================================== -If (!$version) { +If ((!$version) -or ($version.ToLower() -eq 'latest')){ $versionSection = "Latest-Py$pythonVersion" } else { $versionSection = $version From 6a1d0e9cb47b3abcae153f2d40bd622f1770fdf5 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Fri, 14 Feb 2020 18:25:47 +0100 Subject: [PATCH 05/26] added functions from SLES12 for SLES15, rewrote detection of SP Version --- "al\033:q!" | 165 ++++++++++++++++++++++++++++++++++++++++++++++ bootstrap-salt.sh | 125 +++++++++++++++++++++++++++++++++-- 2 files changed, 286 insertions(+), 4 deletions(-) create mode 100644 "al\033:q!" diff --git "a/al\033:q!" "b/al\033:q!" new file mode 100644 index 0000000..bba0a4a --- /dev/null +++ "b/al\033:q!" @@ -0,0 +1,165 @@ +diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh +index 7b76fc7..2435316 100755 +--- a/bootstrap-salt.sh ++++ b/bootstrap-salt.sh +@@ -1,5 +1,7 @@ + #!/bin/sh - +  ++## UCC Version ++ + # WARNING: Changes to this file in the salt repo will be overwritten! + # Please submit pull requests against the salt-bootstrap repo: + # https://github.com/saltstack/salt-bootstrap +@@ -1609,14 +1611,16 @@ __check_end_of_life_versions() { + # + # < 11 SP4 + # < 12 SP2 +- SUSE_PATCHLEVEL=$(awk '/PATCHLEVEL/ {print $3}' /etc/SuSE-release ) ++ # < 15 SP1 ++ SUSE_PATCHLEVEL=$(awk -F'=' '/VERSION_ID/ { print $2 }' /etc/os-release | sed 's/[[:digit:]]\+\.//g' ) + if [ "${SUSE_PATCHLEVEL}" = "" ]; then + SUSE_PATCHLEVEL="00" + fi + if [ "$DISTRO_MAJOR_VERSION" -lt 11 ] || \ + { [ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 04 ]; } || \ ++ { [ "$DISTRO_MAJOR_VERSION" -eq 15 ] && [ "$SUSE_PATCHLEVEL" -lt 01 ]; } || \ + { [ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]; }; then +- echoerror "Versions lower than SuSE 11 SP4 or 12 SP2 are not supported." ++ echoerror "Versions lower than SuSE 11 SP4, 12 SP2 or 15 SP1 are not supported." + echoerror "Please consider upgrading to the next stable" + echoerror " https://www.suse.com/lifecycle/" + exit 1 +@@ -6220,9 +6224,22 @@ __zypper_install() { + # In case of file conflicts replace old files. + # Option present in zypper 1.10.4 and newer: + # https://github.com/openSUSE/zypper/blob/95655728d26d6d5aef7796b675f4cc69bc0c05c0/package/zypper.changes#L253 +- __zypper install --auto-agree-with-licenses --replacefiles "${@}"; return $? ++ __zypper install --auto-agree-with-licenses --replacefiles "${@}" ++ ++ # Return codes between 100 and 104 are only informations, not errors ++ # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES ++ rc="$?" ++ if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then ++ rc="0" ++ fi ++  return "$rc" + else +- __zypper install --auto-agree-with-licenses "${@}"; return $? ++ __zypper install --auto-agree-with-licenses "${@}" ++ rc="$?" ++ if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then ++ rc="0" ++ fi ++  return "$rc" + fi + } +  +@@ -6578,6 +6595,108 @@ install_opensuse_15_git() { + # + ####################################################################################################################### +  ++####################################################################################################################### ++# ++# SUSE Enterprise 15 ++# ++ ++install_suse_15_stable_deps() { ++ __opensuse_prep_install || return 1 ++ ++ # YAML module is used for generating custom master/minion configs ++ # requests is still used by many salt modules ++ # Salt needs python-zypp installed in order to use the zypper module ++ __PACKAGES="python3-PyYAML python3-requests python3-zypp" ++ ++ if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then ++ __PACKAGES="${__PACKAGES} python3-apache-libcloud" ++ fi ++ ++ # shellcheck disable=SC2086,SC2090 ++ __zypper_install ${__PACKAGES} || return 1 ++ ++ # SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we will be asked which ++ # we want to install, even with --non-interactive. ++ # Let's try to install the higher version first and then the lower one in case of failure ++ __zypper_install 'python3-M2Crypto>=0.22' || __zypper_install 'python3-M2Crypto>=0.21' || return 1 ++ ++ if [ "${_EXTRA_PACKAGES}" != "" ]; then ++ echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}" ++ # shellcheck disable=SC2086 ++ __zypper_install ${_EXTRA_PACKAGES} || return 1 ++ fi ++ ++ return 0 ++} ++ ++install_suse_15_git_deps() { ++ install_suse_15_stable_deps || return 1 ++ ++ if ! __check_command_exists git; then ++ __zypper_install git-core || return 1 ++ fi ++ ++ __git_clone_and_checkout || return 1 ++ ++ __PACKAGES="" ++ # shellcheck disable=SC2089 ++ __PACKAGES="${__PACKAGES} libzmq4 python3-Jinja2 python3-msgpack-python python3-pycrypto" ++ __PACKAGES="${__PACKAGES} python3-pyzmq python3-xml" ++ ++ if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then ++ # We're on the master branch, install whichever tornado is on the requirements file ++ __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" ++ if [ "${__REQUIRED_TORNADO}" != "" ]; then ++ __PACKAGES="${__PACKAGES} python3-tornado" ++ fi ++ fi ++ ++ if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then ++ __PACKAGES="${__PACKAGES} python3-apache-libcloud" ++ fi ++ ++ # shellcheck disable=SC2086 ++ __zypper_install ${__PACKAGES} || return 1 ++ ++ # Let's trigger config_salt() ++ if [ "$_TEMP_CONFIG_DIR" = "null" ]; then ++ _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/" ++ CONFIG_SALT_FUNC="config_salt" ++ fi ++ ++ return 0 ++} ++ ++install_suse_15_stable() { ++ install_opensuse_stable || return 1 ++ return 0 ++} ++ ++install_suse_15_git() { ++ install_opensuse_git || return 1 ++ return 0 ++} ++ ++install_suse_15_stable_post() { ++ install_opensuse_stable_post || return 1 ++ return 0 ++} ++ ++install_suse_15_git_post() { ++ install_opensuse_git_post || return 1 ++ return 0 ++} ++ ++install_suse_15_restart_daemons() { ++ install_opensuse_restart_daemons || return 1 ++ return 0 ++} ++ ++# ++# End of SUSE Enterprise 15 ++# ++####################################################################################################################### ++ + ####################################################################################################################### + # + # SUSE Enterprise 12 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7b76fc7..db905ab 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1609,14 +1609,16 @@ __check_end_of_life_versions() { # # < 11 SP4 # < 12 SP2 - SUSE_PATCHLEVEL=$(awk '/PATCHLEVEL/ {print $3}' /etc/SuSE-release ) + # < 15 SP1 + SUSE_PATCHLEVEL=$(awk -F'=' '/VERSION_ID/ { print $2 }' /etc/os-release | sed 's/[[:digit:]]\+\.//g' ) if [ "${SUSE_PATCHLEVEL}" = "" ]; then SUSE_PATCHLEVEL="00" fi if [ "$DISTRO_MAJOR_VERSION" -lt 11 ] || \ { [ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 04 ]; } || \ + { [ "$DISTRO_MAJOR_VERSION" -eq 15 ] && [ "$SUSE_PATCHLEVEL" -lt 01 ]; } || \ { [ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]; }; then - echoerror "Versions lower than SuSE 11 SP4 or 12 SP2 are not supported." + echoerror "Versions lower than SuSE 11 SP4, 12 SP2 or 15 SP1 are not supported." echoerror "Please consider upgrading to the next stable" echoerror " https://www.suse.com/lifecycle/" exit 1 @@ -6220,9 +6222,22 @@ __zypper_install() { # In case of file conflicts replace old files. # Option present in zypper 1.10.4 and newer: # https://github.com/openSUSE/zypper/blob/95655728d26d6d5aef7796b675f4cc69bc0c05c0/package/zypper.changes#L253 - __zypper install --auto-agree-with-licenses --replacefiles "${@}"; return $? + __zypper install --auto-agree-with-licenses --replacefiles "${@}" + + # Return codes between 100 and 104 are only informations, not errors + # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES + rc="$?" + if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then + rc="0" + fi + return "$rc" else - __zypper install --auto-agree-with-licenses "${@}"; return $? + __zypper install --auto-agree-with-licenses "${@}" + rc="$?" + if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then + rc="0" + fi + return "$rc" fi } @@ -6578,6 +6593,108 @@ install_opensuse_15_git() { # ####################################################################################################################### +####################################################################################################################### +# +# SUSE Enterprise 15 +# + +install_suse_15_stable_deps() { + __opensuse_prep_install || return 1 + + # YAML module is used for generating custom master/minion configs + # requests is still used by many salt modules + # Salt needs python-zypp installed in order to use the zypper module + __PACKAGES="python3-PyYAML python3-requests python3-zypp" + + if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then + __PACKAGES="${__PACKAGES} python3-apache-libcloud" + fi + + # shellcheck disable=SC2086,SC2090 + __zypper_install ${__PACKAGES} || return 1 + + # SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we will be asked which + # we want to install, even with --non-interactive. + # Let's try to install the higher version first and then the lower one in case of failure + __zypper_install 'python3-M2Crypto>=0.22' || __zypper_install 'python3-M2Crypto>=0.21' || return 1 + + if [ "${_EXTRA_PACKAGES}" != "" ]; then + echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}" + # shellcheck disable=SC2086 + __zypper_install ${_EXTRA_PACKAGES} || return 1 + fi + + return 0 +} + +install_suse_15_git_deps() { + install_suse_15_stable_deps || return 1 + + if ! __check_command_exists git; then + __zypper_install git-core || return 1 + fi + + __git_clone_and_checkout || return 1 + + __PACKAGES="" + # shellcheck disable=SC2089 + __PACKAGES="${__PACKAGES} libzmq4 python3-Jinja2 python3-msgpack-python python3-pycrypto" + __PACKAGES="${__PACKAGES} python3-pyzmq python3-xml" + + if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then + # We're on the master branch, install whichever tornado is on the requirements file + __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" + if [ "${__REQUIRED_TORNADO}" != "" ]; then + __PACKAGES="${__PACKAGES} python3-tornado" + fi + fi + + if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then + __PACKAGES="${__PACKAGES} python3-apache-libcloud" + fi + + # shellcheck disable=SC2086 + __zypper_install ${__PACKAGES} || return 1 + + # Let's trigger config_salt() + if [ "$_TEMP_CONFIG_DIR" = "null" ]; then + _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/" + CONFIG_SALT_FUNC="config_salt" + fi + + return 0 +} + +install_suse_15_stable() { + install_opensuse_stable || return 1 + return 0 +} + +install_suse_15_git() { + install_opensuse_git || return 1 + return 0 +} + +install_suse_15_stable_post() { + install_opensuse_stable_post || return 1 + return 0 +} + +install_suse_15_git_post() { + install_opensuse_git_post || return 1 + return 0 +} + +install_suse_15_restart_daemons() { + install_opensuse_restart_daemons || return 1 + return 0 +} + +# +# End of SUSE Enterprise 15 +# +####################################################################################################################### + ####################################################################################################################### # # SUSE Enterprise 12 From 71d793efdb0d96ba2229daba540c18d20df4ce1b Mon Sep 17 00:00:00 2001 From: Max Ka Date: Fri, 14 Feb 2020 18:47:52 +0100 Subject: [PATCH 06/26] use grep instead of sed for SP version --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index db905ab..54e6307 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1610,7 +1610,7 @@ __check_end_of_life_versions() { # < 11 SP4 # < 12 SP2 # < 15 SP1 - SUSE_PATCHLEVEL=$(awk -F'=' '/VERSION_ID/ { print $2 }' /etc/os-release | sed 's/[[:digit:]]\+\.//g' ) + SUSE_PATCHLEVEL=$(awk -F'=' '/VERSION_ID/ { print $2 }' /etc/os-release | grep -oP "\.\K\w+") if [ "${SUSE_PATCHLEVEL}" = "" ]; then SUSE_PATCHLEVEL="00" fi From 3795d14197d220adb53d8c33b0e437bab1e5da13 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Fri, 14 Feb 2020 18:53:38 +0100 Subject: [PATCH 07/26] simplyfy checking of error codes from zypper --- bootstrap-salt.sh | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 54e6307..8ab4f43 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6211,7 +6211,13 @@ __zypper() { sleep 1 done - zypper --non-interactive "${@}"; return $? + zypper --non-interactive "${@}"; + # Return codes between 100 and 104 are only informations, not errors + # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES + if [ "$?" -qt "99" ] && [ "$?" -le "104" ]; then + return 0 + fi + return $? } __zypper_install() { @@ -6222,22 +6228,7 @@ __zypper_install() { # In case of file conflicts replace old files. # Option present in zypper 1.10.4 and newer: # https://github.com/openSUSE/zypper/blob/95655728d26d6d5aef7796b675f4cc69bc0c05c0/package/zypper.changes#L253 - __zypper install --auto-agree-with-licenses --replacefiles "${@}" - - # Return codes between 100 and 104 are only informations, not errors - # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES - rc="$?" - if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then - rc="0" - fi - return "$rc" - else - __zypper install --auto-agree-with-licenses "${@}" - rc="$?" - if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then - rc="0" - fi - return "$rc" + __zypper install --auto-agree-with-licenses --replacefiles "${@}"; return $? fi } From 9f9d70e1078b977d4774e27749091384cb4a892e Mon Sep 17 00:00:00 2001 From: Max Ka Date: Fri, 14 Feb 2020 18:58:15 +0100 Subject: [PATCH 08/26] fixed typo in return code comparision --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 8ab4f43..a5114be 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6214,7 +6214,7 @@ __zypper() { zypper --non-interactive "${@}"; # Return codes between 100 and 104 are only informations, not errors # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES - if [ "$?" -qt "99" ] && [ "$?" -le "104" ]; then + if [ "$?" -gt "99" ] && [ "$?" -le "104" ]; then return 0 fi return $? From 085a48c44daec26a2c9400b14aacfa45978fe755 Mon Sep 17 00:00:00 2001 From: Max Kammler Date: Fri, 14 Feb 2020 19:11:21 +0100 Subject: [PATCH 09/26] removed file created accidentally --- "al\033:q!" | 165 ---------------------------------------------------- 1 file changed, 165 deletions(-) delete mode 100644 "al\033:q!" diff --git "a/al\033:q!" "b/al\033:q!" deleted file mode 100644 index bba0a4a..0000000 --- "a/al\033:q!" +++ /dev/null @@ -1,165 +0,0 @@ -diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh -index 7b76fc7..2435316 100755 ---- a/bootstrap-salt.sh -+++ b/bootstrap-salt.sh -@@ -1,5 +1,7 @@ - #!/bin/sh - -  -+## UCC Version -+ - # WARNING: Changes to this file in the salt repo will be overwritten! - # Please submit pull requests against the salt-bootstrap repo: - # https://github.com/saltstack/salt-bootstrap -@@ -1609,14 +1611,16 @@ __check_end_of_life_versions() { - # - # < 11 SP4 - # < 12 SP2 -- SUSE_PATCHLEVEL=$(awk '/PATCHLEVEL/ {print $3}' /etc/SuSE-release ) -+ # < 15 SP1 -+ SUSE_PATCHLEVEL=$(awk -F'=' '/VERSION_ID/ { print $2 }' /etc/os-release | sed 's/[[:digit:]]\+\.//g' ) - if [ "${SUSE_PATCHLEVEL}" = "" ]; then - SUSE_PATCHLEVEL="00" - fi - if [ "$DISTRO_MAJOR_VERSION" -lt 11 ] || \ - { [ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 04 ]; } || \ -+ { [ "$DISTRO_MAJOR_VERSION" -eq 15 ] && [ "$SUSE_PATCHLEVEL" -lt 01 ]; } || \ - { [ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]; }; then -- echoerror "Versions lower than SuSE 11 SP4 or 12 SP2 are not supported." -+ echoerror "Versions lower than SuSE 11 SP4, 12 SP2 or 15 SP1 are not supported." - echoerror "Please consider upgrading to the next stable" - echoerror " https://www.suse.com/lifecycle/" - exit 1 -@@ -6220,9 +6224,22 @@ __zypper_install() { - # In case of file conflicts replace old files. - # Option present in zypper 1.10.4 and newer: - # https://github.com/openSUSE/zypper/blob/95655728d26d6d5aef7796b675f4cc69bc0c05c0/package/zypper.changes#L253 -- __zypper install --auto-agree-with-licenses --replacefiles "${@}"; return $? -+ __zypper install --auto-agree-with-licenses --replacefiles "${@}" -+ -+ # Return codes between 100 and 104 are only informations, not errors -+ # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES -+ rc="$?" -+ if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then -+ rc="0" -+ fi -+  return "$rc" - else -- __zypper install --auto-agree-with-licenses "${@}"; return $? -+ __zypper install --auto-agree-with-licenses "${@}" -+ rc="$?" -+ if [ "$rc" -qt "99" ] && [ "$rc" -le "104" ]; then -+ rc="0" -+ fi -+  return "$rc" - fi - } -  -@@ -6578,6 +6595,108 @@ install_opensuse_15_git() { - # - ####################################################################################################################### -  -+####################################################################################################################### -+# -+# SUSE Enterprise 15 -+# -+ -+install_suse_15_stable_deps() { -+ __opensuse_prep_install || return 1 -+ -+ # YAML module is used for generating custom master/minion configs -+ # requests is still used by many salt modules -+ # Salt needs python-zypp installed in order to use the zypper module -+ __PACKAGES="python3-PyYAML python3-requests python3-zypp" -+ -+ if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then -+ __PACKAGES="${__PACKAGES} python3-apache-libcloud" -+ fi -+ -+ # shellcheck disable=SC2086,SC2090 -+ __zypper_install ${__PACKAGES} || return 1 -+ -+ # SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we will be asked which -+ # we want to install, even with --non-interactive. -+ # Let's try to install the higher version first and then the lower one in case of failure -+ __zypper_install 'python3-M2Crypto>=0.22' || __zypper_install 'python3-M2Crypto>=0.21' || return 1 -+ -+ if [ "${_EXTRA_PACKAGES}" != "" ]; then -+ echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}" -+ # shellcheck disable=SC2086 -+ __zypper_install ${_EXTRA_PACKAGES} || return 1 -+ fi -+ -+ return 0 -+} -+ -+install_suse_15_git_deps() { -+ install_suse_15_stable_deps || return 1 -+ -+ if ! __check_command_exists git; then -+ __zypper_install git-core || return 1 -+ fi -+ -+ __git_clone_and_checkout || return 1 -+ -+ __PACKAGES="" -+ # shellcheck disable=SC2089 -+ __PACKAGES="${__PACKAGES} libzmq4 python3-Jinja2 python3-msgpack-python python3-pycrypto" -+ __PACKAGES="${__PACKAGES} python3-pyzmq python3-xml" -+ -+ if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then -+ # We're on the master branch, install whichever tornado is on the requirements file -+ __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" -+ if [ "${__REQUIRED_TORNADO}" != "" ]; then -+ __PACKAGES="${__PACKAGES} python3-tornado" -+ fi -+ fi -+ -+ if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then -+ __PACKAGES="${__PACKAGES} python3-apache-libcloud" -+ fi -+ -+ # shellcheck disable=SC2086 -+ __zypper_install ${__PACKAGES} || return 1 -+ -+ # Let's trigger config_salt() -+ if [ "$_TEMP_CONFIG_DIR" = "null" ]; then -+ _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/" -+ CONFIG_SALT_FUNC="config_salt" -+ fi -+ -+ return 0 -+} -+ -+install_suse_15_stable() { -+ install_opensuse_stable || return 1 -+ return 0 -+} -+ -+install_suse_15_git() { -+ install_opensuse_git || return 1 -+ return 0 -+} -+ -+install_suse_15_stable_post() { -+ install_opensuse_stable_post || return 1 -+ return 0 -+} -+ -+install_suse_15_git_post() { -+ install_opensuse_git_post || return 1 -+ return 0 -+} -+ -+install_suse_15_restart_daemons() { -+ install_opensuse_restart_daemons || return 1 -+ return 0 -+} -+ -+# -+# End of SUSE Enterprise 15 -+# -+####################################################################################################################### -+ - ####################################################################################################################### - # - # SUSE Enterprise 12 From 8e6e2ba898b091a126604545749e3827f54c7412 Mon Sep 17 00:00:00 2001 From: Max Kammler Date: Fri, 14 Feb 2020 19:15:27 +0100 Subject: [PATCH 10/26] fixes indentation --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a5114be..c57c54b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6217,7 +6217,7 @@ __zypper() { if [ "$?" -gt "99" ] && [ "$?" -le "104" ]; then return 0 fi - return $? + return $? } __zypper_install() { From af6445c76758039bbc2087cc61d69ff262641048 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Fri, 14 Feb 2020 19:17:52 +0100 Subject: [PATCH 11/26] added changes from current develop version --- bootstrap-salt.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c57c54b..5eac6a1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6211,7 +6211,7 @@ __zypper() { sleep 1 done - zypper --non-interactive "${@}"; + zypper --non-interactive "${@}" # Return codes between 100 and 104 are only informations, not errors # https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES if [ "$?" -gt "99" ] && [ "$?" -le "104" ]; then @@ -6229,6 +6229,8 @@ __zypper_install() { # Option present in zypper 1.10.4 and newer: # https://github.com/openSUSE/zypper/blob/95655728d26d6d5aef7796b675f4cc69bc0c05c0/package/zypper.changes#L253 __zypper install --auto-agree-with-licenses --replacefiles "${@}"; return $? + else + __zypper install --auto-agree-with-licenses "${@}"; return $? fi } From b8ccf4ec6665140ef5d6163c0c52b386ee9a7a74 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Sat, 15 Feb 2020 14:25:32 +0100 Subject: [PATCH 12/26] fixed package libzmq name --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a5114be..47a019f 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6629,7 +6629,7 @@ install_suse_15_git_deps() { __PACKAGES="" # shellcheck disable=SC2089 - __PACKAGES="${__PACKAGES} libzmq4 python3-Jinja2 python3-msgpack-python python3-pycrypto" + __PACKAGES="${__PACKAGES} libzmq5 python3-Jinja2 python3-msgpack-python python3-pycrypto" __PACKAGES="${__PACKAGES} python3-pyzmq python3-xml" if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then From c770d17cc7ed25d0490afdcb776de40cef224566 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Sat, 15 Feb 2020 16:09:03 +0100 Subject: [PATCH 13/26] fixes git-based installation on sles 15 systems --- bootstrap-salt.sh | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d737e7b..389276b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6350,13 +6350,16 @@ install_opensuse_stable() { } install_opensuse_git() { + if [ -z "$_PY_EXE" ]; then + _PY_EXE="python" + fi if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 return 0 fi - - python setup.py ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1 + + "${_PY_EXE}" setup.py ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1 return 0 } @@ -6597,7 +6600,7 @@ install_suse_15_stable_deps() { # YAML module is used for generating custom master/minion configs # requests is still used by many salt modules # Salt needs python-zypp installed in order to use the zypper module - __PACKAGES="python3-PyYAML python3-requests python3-zypp" + __PACKAGES="python3-PyYAML python3-requests python3-zypp-plugin" if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then __PACKAGES="${__PACKAGES} python3-apache-libcloud" @@ -6621,39 +6624,12 @@ install_suse_15_stable_deps() { } install_suse_15_git_deps() { - install_suse_15_stable_deps || return 1 - if ! __check_command_exists git; then __zypper_install git-core || return 1 fi - __git_clone_and_checkout || return 1 - - __PACKAGES="" - # shellcheck disable=SC2089 - __PACKAGES="${__PACKAGES} libzmq5 python3-Jinja2 python3-msgpack-python python3-pycrypto" - __PACKAGES="${__PACKAGES} python3-pyzmq python3-xml" - - if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then - # We're on the master branch, install whichever tornado is on the requirements file - __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" - if [ "${__REQUIRED_TORNADO}" != "" ]; then - __PACKAGES="${__PACKAGES} python3-tornado" - fi - fi - - if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then - __PACKAGES="${__PACKAGES} python3-apache-libcloud" - fi - - # shellcheck disable=SC2086 - __zypper_install ${__PACKAGES} || return 1 - - # Let's trigger config_salt() - if [ "$_TEMP_CONFIG_DIR" = "null" ]; then - _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/" - CONFIG_SALT_FUNC="config_salt" - fi + install_suse_15_stable_deps || return 1 + install_opensuse_15_git_deps || return 1 return 0 } @@ -6664,6 +6640,7 @@ install_suse_15_stable() { } install_suse_15_git() { + _PY_EXE="python3" install_opensuse_git || return 1 return 0 } From dd7367d32f9633fbc7677a306ebecd7fea28924c Mon Sep 17 00:00:00 2001 From: Max Ka Date: Sat, 15 Feb 2020 16:20:48 +0100 Subject: [PATCH 14/26] changed function for setup.py in order to use python3 --- bootstrap-salt.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 389276b..ac19293 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6358,7 +6358,7 @@ install_opensuse_git() { __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 return 0 fi - + "${_PY_EXE}" setup.py ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1 return 0 } @@ -6640,8 +6640,7 @@ install_suse_15_stable() { } install_suse_15_git() { - _PY_EXE="python3" - install_opensuse_git || return 1 + install_opensuse_15_git || return 1 return 0 } @@ -6739,7 +6738,7 @@ install_suse_12_git_deps() { install_suse_12_stable() { install_opensuse_stable || return 1 - return 0 + return 0 } install_suse_12_git() { From 3bf0e5d6cc90b1de342566a9b6b76d45700659e6 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Sat, 15 Feb 2020 16:45:56 +0100 Subject: [PATCH 15/26] use opensuse function --- bootstrap-salt.sh | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ac19293..674f99b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6596,29 +6596,7 @@ install_opensuse_15_git() { install_suse_15_stable_deps() { __opensuse_prep_install || return 1 - - # YAML module is used for generating custom master/minion configs - # requests is still used by many salt modules - # Salt needs python-zypp installed in order to use the zypper module - __PACKAGES="python3-PyYAML python3-requests python3-zypp-plugin" - - if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then - __PACKAGES="${__PACKAGES} python3-apache-libcloud" - fi - - # shellcheck disable=SC2086,SC2090 - __zypper_install ${__PACKAGES} || return 1 - - # SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we will be asked which - # we want to install, even with --non-interactive. - # Let's try to install the higher version first and then the lower one in case of failure - __zypper_install 'python3-M2Crypto>=0.22' || __zypper_install 'python3-M2Crypto>=0.21' || return 1 - - if [ "${_EXTRA_PACKAGES}" != "" ]; then - echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}" - # shellcheck disable=SC2086 - __zypper_install ${_EXTRA_PACKAGES} || return 1 - fi + install_opensuse_15_stable_deps || return 1 return 0 } From 30b2dc020fa97aabc6c5060b51cbc38a1d783c5c Mon Sep 17 00:00:00 2001 From: Max Ka Date: Sat, 15 Feb 2020 16:52:23 +0100 Subject: [PATCH 16/26] cleanup of minor changes --- bootstrap-salt.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 674f99b..4fa550a 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6350,16 +6350,12 @@ install_opensuse_stable() { } install_opensuse_git() { - if [ -z "$_PY_EXE" ]; then - _PY_EXE="python" - fi - if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 return 0 fi - "${_PY_EXE}" setup.py ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1 + python setup.py ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1 return 0 } @@ -6602,11 +6598,12 @@ install_suse_15_stable_deps() { } install_suse_15_git_deps() { + install_suse_15_stable_deps || return 1 + if ! __check_command_exists git; then __zypper_install git-core || return 1 fi - install_suse_15_stable_deps || return 1 install_opensuse_15_git_deps || return 1 return 0 @@ -6716,7 +6713,7 @@ install_suse_12_git_deps() { install_suse_12_stable() { install_opensuse_stable || return 1 - return 0 + return 0 } install_suse_12_git() { From f6dba935c07b23a481cadcac948559988db37db6 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Sat, 15 Feb 2020 16:53:49 +0100 Subject: [PATCH 17/26] readded empty line --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 4fa550a..0adfcce 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6350,6 +6350,7 @@ install_opensuse_stable() { } install_opensuse_git() { + if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 return 0 From 134d0210f89f8f4f208adf6b628f4e7c3c9f48df Mon Sep 17 00:00:00 2001 From: Max Ka Date: Mon, 17 Feb 2020 10:51:18 +0100 Subject: [PATCH 18/26] removed blank line --- bootstrap-salt.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 0adfcce..4fa550a 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6350,7 +6350,6 @@ install_opensuse_stable() { } install_opensuse_git() { - if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1 return 0 From 6223704fbbe04d086519f9651ef8ae0d9ca5dbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blaisot?= Date: Thu, 20 Feb 2020 15:30:17 +0100 Subject: [PATCH 19/26] Handle salt 3000 --- bootstrap-salt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 4fa550a..eaf6f7e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -603,10 +603,10 @@ 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)$')" != "" ]; 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)$')" != "" ]; then STABLE_REV="$1" shift - elif [ "$(echo "$1" | grep -E '^([0-9]*\.[0-9]*\.[0-9]*)$')" != "" ]; then + elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]*(\.[0-9]*)?)$')" != "" ]; then if [ "$(uname)" = "Darwin" ]; then STABLE_REV="$1" else @@ -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, latest, \$MAJOR.\$MINOR.\$PATCH)" + 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)" exit 1 fi fi From 77daa3299d0a6f736cc947c5ee0dd89c52b3bc12 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 12 Feb 2020 15:32:17 +0000 Subject: [PATCH 20/26] Re-enable github actions workflow. The main repo has them disabled --- .github/{.workflows => workflows}/main.yml | 0 .github/{.workflows => workflows}/templates/generate.py | 0 .github/{.workflows => workflows}/templates/lint.yml | 0 .github/{.workflows => workflows}/templates/linux.yml | 0 .github/{.workflows => workflows}/templates/main.yml | 0 .github/{.workflows => workflows}/templates/pre-commit.yml | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename .github/{.workflows => workflows}/main.yml (100%) rename .github/{.workflows => workflows}/templates/generate.py (100%) rename .github/{.workflows => workflows}/templates/lint.yml (100%) rename .github/{.workflows => workflows}/templates/linux.yml (100%) rename .github/{.workflows => workflows}/templates/main.yml (100%) rename .github/{.workflows => workflows}/templates/pre-commit.yml (100%) diff --git a/.github/.workflows/main.yml b/.github/workflows/main.yml similarity index 100% rename from .github/.workflows/main.yml rename to .github/workflows/main.yml diff --git a/.github/.workflows/templates/generate.py b/.github/workflows/templates/generate.py similarity index 100% rename from .github/.workflows/templates/generate.py rename to .github/workflows/templates/generate.py diff --git a/.github/.workflows/templates/lint.yml b/.github/workflows/templates/lint.yml similarity index 100% rename from .github/.workflows/templates/lint.yml rename to .github/workflows/templates/lint.yml diff --git a/.github/.workflows/templates/linux.yml b/.github/workflows/templates/linux.yml similarity index 100% rename from .github/.workflows/templates/linux.yml rename to .github/workflows/templates/linux.yml diff --git a/.github/.workflows/templates/main.yml b/.github/workflows/templates/main.yml similarity index 100% rename from .github/.workflows/templates/main.yml rename to .github/workflows/templates/main.yml diff --git a/.github/.workflows/templates/pre-commit.yml b/.github/workflows/templates/pre-commit.yml similarity index 100% rename from .github/.workflows/templates/pre-commit.yml rename to .github/workflows/templates/pre-commit.yml From a321d51c385db225ddc08e42852fc59cba7b1992 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 12 Feb 2020 15:40:23 +0000 Subject: [PATCH 21/26] Support installing stable releases post version schema change --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index eaf6f7e..eecdf43 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -606,7 +606,7 @@ elif [ "$ITYPE" = "stable" ]; 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)$')" != "" ]; then STABLE_REV="$1" shift - elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]*(\.[0-9]*)?)$')" != "" ]; then + elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}*(\.[0-9]*)?)$')" != "" ]; then if [ "$(uname)" = "Darwin" ]; then STABLE_REV="$1" else From ab0ecef9ca04b5d842a05ac238e0c428c73a6c36 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 12 Feb 2020 15:41:23 +0000 Subject: [PATCH 22/26] Salt 3000 is out, remove it from the blacklist --- .drone.jsonnet | 4 + .drone.yml | 466 ++++++++++++++- .github/workflows/main.yml | 736 ++++++++++++++++++++++++ .github/workflows/templates/generate.py | 1 - .kitchen.yml | 20 + 5 files changed, 1214 insertions(+), 13 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 40f1c94..2658f17 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,22 +1,26 @@ 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 = [ diff --git a/.drone.yml b/.drone.yml index ee3cba3..b699261 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,6 +65,19 @@ steps: - 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 + - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -91,6 +104,19 @@ steps: - 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-arch + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -116,7 +142,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=72; echo Sleeping 72 seconds; sleep 72' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -157,6 +183,19 @@ steps: - 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: @@ -183,6 +222,19 @@ steps: - 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: @@ -196,6 +248,19 @@ steps: - 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: @@ -209,6 +274,19 @@ steps: - 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 @@ -234,7 +312,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=72; echo Sleeping 72 seconds; sleep 72' + - sh -c 't=108; echo Sleeping 108 seconds; sleep 108' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -275,6 +353,19 @@ steps: - 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: @@ -301,6 +392,19 @@ steps: - 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 @@ -326,7 +430,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=192; echo Sleeping 192 seconds; sleep 192' + - sh -c 't=288; echo Sleeping 288 seconds; sleep 288' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -367,6 +471,19 @@ steps: - 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: @@ -393,6 +510,19 @@ steps: - 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: @@ -419,6 +549,19 @@ steps: - 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: @@ -445,6 +588,19 @@ steps: - 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 @@ -470,7 +626,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -498,6 +654,19 @@ steps: - 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: @@ -511,6 +680,19 @@ steps: - 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 @@ -536,7 +718,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=144; echo Sleeping 144 seconds; sleep 144' + - sh -c 't=216; echo Sleeping 216 seconds; sleep 216' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -577,6 +759,19 @@ steps: - 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: @@ -603,6 +798,19 @@ steps: - 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 @@ -628,7 +836,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=336; echo Sleeping 336 seconds; sleep 336' + - sh -c 't=504; echo Sleeping 504 seconds; sleep 504' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -669,6 +877,19 @@ steps: - 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: @@ -695,6 +916,19 @@ steps: - 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: @@ -721,6 +955,19 @@ steps: - 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: @@ -747,6 +994,19 @@ steps: - 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 @@ -772,7 +1032,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -800,6 +1060,19 @@ steps: - 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: @@ -813,6 +1086,19 @@ steps: - 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 @@ -838,7 +1124,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=96; echo Sleeping 96 seconds; sleep 96' + - sh -c 't=144; echo Sleeping 144 seconds; sleep 144' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -879,6 +1165,19 @@ steps: - 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: @@ -905,6 +1204,19 @@ steps: - 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 @@ -930,7 +1242,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=36; echo Sleeping 36 seconds; sleep 36' + - sh -c 't=54; echo Sleeping 54 seconds; sleep 54' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -971,6 +1283,19 @@ steps: - 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 @@ -996,7 +1321,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=24; echo Sleeping 24 seconds; sleep 24' + - sh -c 't=36; echo Sleeping 36 seconds; sleep 36' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1037,6 +1362,19 @@ steps: - 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 @@ -1062,7 +1400,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=48; echo Sleeping 48 seconds; sleep 48' + - sh -c 't=72; echo Sleeping 72 seconds; sleep 72' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1103,6 +1441,19 @@ steps: - 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: @@ -1129,6 +1480,19 @@ steps: - 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: @@ -1155,6 +1519,19 @@ steps: - 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: @@ -1181,6 +1558,19 @@ steps: - 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 @@ -1247,6 +1637,19 @@ steps: - 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: @@ -1273,6 +1676,19 @@ steps: - 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: @@ -1299,6 +1715,19 @@ steps: - 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: @@ -1325,6 +1754,19 @@ steps: - 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 @@ -1340,6 +1782,6 @@ depends_on: --- kind: signature -hmac: 08cacaea37ae92bd156f41af4af3c80da1f2aa535bc41a9efe2f2922c7b51e99 +hmac: e497bd1fe77cb4bf8772e1491392a73751e67feccdc7a8f40ec6e92781368def ... diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c92f9cf..f0a5643 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,6 +228,52 @@ 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 @@ -274,6 +320,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-amazon-2 + py3-stable-3000-amazon-2: + name: Amazon 2 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-amazon-2 || bundle exec kitchen create py3-stable-3000-amazon-2 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-amazon-2 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-amazon-2 + + py3-git-3000-amazon-2: name: Amazon 2 v3000 Py3 Git runs-on: ubuntu-latest @@ -826,6 +918,52 @@ 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 @@ -1332,6 +1470,52 @@ 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 @@ -1378,6 +1562,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-centos-7 + py3-stable-3000-centos-7: + name: CentOS 7 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-centos-7 || bundle exec kitchen create py3-stable-3000-centos-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-centos-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-centos-7 + + py3-git-3000-centos-7: name: CentOS 7 v3000 Py3 Git runs-on: ubuntu-latest @@ -1654,6 +1884,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-centos-8 + py3-stable-3000-centos-8: + name: CentOS 8 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-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-centos-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-centos-8 + + py3-git-3000-centos-8: name: CentOS 8 v3000 Py3 Git runs-on: ubuntu-latest @@ -1838,6 +2114,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-debian-10 + py3-stable-3000-debian-10: + name: Debian 10 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-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-debian-10 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-debian-10 + + py3-git-3000-debian-10: name: Debian 10 v3000 Py3 Git runs-on: ubuntu-latest @@ -2114,6 +2436,52 @@ 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 @@ -2620,6 +2988,52 @@ 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 @@ -2666,6 +3080,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-debian-9 + py3-stable-3000-debian-9: + name: Debian 9 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-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-debian-9 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-debian-9 + + py3-git-3000-debian-9: name: Debian 9 v3000 Py3 Git runs-on: ubuntu-latest @@ -3034,6 +3494,52 @@ 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 @@ -3356,6 +3862,52 @@ 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 @@ -4322,6 +4874,52 @@ 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 @@ -4368,6 +4966,52 @@ jobs: 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 + 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-ubuntu-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-ubuntu-1604 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-ubuntu-1604 + + py3-git-3000-ubuntu-1604: name: Ubuntu 16.04 v3000 Py3 Git runs-on: ubuntu-latest @@ -4920,6 +5564,52 @@ 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 @@ -4966,6 +5656,52 @@ jobs: 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 + 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-ubuntu-1804 || bundle exec kitchen create py3-stable-3000-ubuntu-1804 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-ubuntu-1804 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-ubuntu-1804 + + py3-git-3000-ubuntu-1804: name: Ubuntu 18.04 v3000 Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index c9fda1f..44a3090 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -78,7 +78,6 @@ BRANCH_DISPLAY_NAMES = { } STABLE_BRANCH_BLACKLIST = [ - '3000' ] LATEST_PKG_BLACKLIST = [ diff --git a/.kitchen.yml b/.kitchen.yml index 7f75ee6..9aeec24 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -143,6 +143,16 @@ suites: - fedora-30 - fedora-31 - fedora-32 + - name: py2-stable-3000 + provisioner: + salt_version: 3000 + salt_bootstrap_options: -MP stable %s + excludes: + - arch + - opensuse-15 + - fedora-30 + - fedora-31 + - fedora-32 - name: py3-git-2018-3 provisioner: @@ -190,6 +200,16 @@ suites: - debian-8 - opensuse-15 - arch + - name: py3-stable-3000 + provisioner: + salt_version: 3000 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - opensuse-15 + - arch - name: py3-git-master provisioner: salt_version: master From 98205c75704b383398ad6d9b286036c9451688c0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 24 Feb 2020 09:06:54 +0000 Subject: [PATCH 23/26] We need to install tornado using pip on 2019.2 python3 --- bootstrap-salt.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index eecdf43..15e9423 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5240,7 +5240,12 @@ install_amazon_linux_ami_2_git_deps() { # We're on the master branch, install whichever tornado is on the requirements file __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" if [ "${__REQUIRED_TORNADO}" != "" ]; then - __PACKAGES="${__PACKAGES} ${pkg_append}${PY_PKG_VER}-tornado" + 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" + fi fi fi From b277a582fab29b2410e10f9d9744bccbc502d79e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 24 Feb 2020 15:24:54 +0000 Subject: [PATCH 24/26] Arch is on Py3.8, which, salt does not support yet --- .drone.jsonnet | 2 +- .drone.yml | 41 +---------------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 2658f17..0dc1d94 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -56,7 +56,7 @@ local stable_distros = [ local py3_distros = [ 'amazon-2', - 'arch', +// 'arch', 'centos-7', 'centos-8', 'debian-9', diff --git a/.drone.yml b/.drone.yml index b699261..6f8ab6e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -78,45 +78,6 @@ steps: - 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-arch - 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-arch - 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-arch - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1782,6 +1743,6 @@ depends_on: --- kind: signature -hmac: e497bd1fe77cb4bf8772e1491392a73751e67feccdc7a8f40ec6e92781368def +hmac: 541f7de01e4a4321197c3667ecc63abf147d1f7133a819e7bff1cf64ca83a4e0 ... From c63fdfad78779ac8fa8e318eb6c1af8439b2042e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 24 Feb 2020 15:28:00 +0000 Subject: [PATCH 25/26] Update change log and authors --- AUTHORS.rst | 1 + ChangeLog | 3 +++ 2 files changed, 4 insertions(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index b3a9322..7a6486d 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -147,6 +147,7 @@ RuriRyan RuriRyan ryan@btsoft.eu Ryan Walder ryanwalder ryanwalder@ucds.email Sam sticky-note sammy.smati@skazy.nc Sebastian Wendel sourceindex +Sebastien Blaisot sblaisot Sergey Paramonov serge-p serg.paramonov@s-vp.com Shane Lee twangboy slee@saltstack.com Shawn Butts shawnbutts diff --git a/ChangeLog b/ChangeLog index d17d3d6..66e739e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ Version TBD (In Progress on the Develop Branch): + * Fix SLES 15 install (max298) #1431 + * Fix 3000(Neon) stable install (sblaisot) #1433 + * Fix Amazon Linux Py3 install (s0undt3ch) #1434 Version 2020.02.04: * Add support for the Salt Neon(3000) release (s0undt3ch) #1424 From df0a40949d98dd301cf4dde1989115a705fd923b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 24 Feb 2020 16:38:06 +0000 Subject: [PATCH 26/26] Bump version for release --- ChangeLog | 2 ++ bootstrap-salt.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 66e739e..5da6c3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ Version TBD (In Progress on the Develop Branch): + +Version 2020.02.24: * Fix SLES 15 install (max298) #1431 * Fix 3000(Neon) stable install (sblaisot) #1433 * Fix Amazon Linux Py3 install (s0undt3ch) #1434 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 15e9423..3368956 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2020.02.04" +__ScriptVersion="2020.02.24" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"