From 7d280dc41fd91fb51677b8df20d3d85587341842 Mon Sep 17 00:00:00 2001 From: stanzgy Date: Wed, 18 Sep 2019 21:04:29 +0800 Subject: [PATCH 01/22] Fix busybox mktemp compatibility Command `mktemp` accepts templates like /tmp/name.XXXXXX to create a temporary file. Standard GNU mktemp requires at least 3 'X's while busybox's version requires at least 6 'X's. For compatibility we should use at least 6 'X's in mktemp templates. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 9a234f0..05be645 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -499,7 +499,7 @@ exec 2>"$LOGPIPE" # 14 SIGALRM # 15 SIGTERM #---------------------------------------------------------------------------------------------------------------------- -APT_ERR=$(mktemp /tmp/apt_error.XXXX) +APT_ERR=$(mktemp /tmp/apt_error.XXXXXX) __exit_cleanup() { EXIT_CODE=$? From 894173b740c9ffa3396ffd99fab407a6c50c5d07 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 3 Oct 2019 16:45:34 +0100 Subject: [PATCH 02/22] Update sha256sum for latest release --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index ce512eb..776473c 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: +- 2019.10.03: ``34f196f06d586ce9e1b9907660ea6e67caf57abcecfea66e0343697e3fd0d17d`` - 2019.05.20: ``46fb5e4b7815efafd69fd703f033fe86e7b584b6770f7e0b936995bcae1cedd8`` - 2019.02.27: ``23728e4b5e54f564062070e3be53c5602b55c24c9a76671968abbf3d609258cb`` - 2019.01.08: ``ab7f29b75711da4bb79aff98d46654f910d569ebe3e908753a3c5119017bb163`` From 16fdf3b8a1641253cba6a90f9750491af82409dd Mon Sep 17 00:00:00 2001 From: stanislaw_jakiel Date: Sat, 5 Oct 2019 14:18:02 +0200 Subject: [PATCH 03/22] https://github.com/saltstack/salt-bootstrap/issues/1374 removing old logic that installs debian 9 on debian 10 --- bootstrap-salt.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 996a63c..4bcf603 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -891,7 +891,6 @@ __derive_debian_numeric_version() { elif [ "$INPUT_VERSION" = "stretch/sid" ]; then NUMERIC_VERSION=$(__parse_version_string "9.0") elif [ "$INPUT_VERSION" = "buster/sid" ]; then - # Let's start detecting the upcoming Debian 10 (Buster) release NUMERIC_VERSION=$(__parse_version_string "10.0") else echowarn "Unable to parse the Debian Version (codename: '$INPUT_VERSION')" @@ -3059,17 +3058,8 @@ install_ubuntu_check_services() { # Debian Install Functions # __install_saltstack_debian_repository() { - if [ "$DISTRO_MAJOR_VERSION" -eq 10 ]; then - # Packages for Debian 10 at repo.saltstack.com are not yet available - # Set up repository for Debian 9 for Debian 10 for now until support - # is available at repo.saltstack.com for Debian 10. - echowarn "Debian 10 distribution detected, but stable packages requested. Trying packages from Debian 9. You may experience problems." - DEBIAN_RELEASE="9" - DEBIAN_CODENAME="stretch" - else - DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION" - DEBIAN_CODENAME="$DISTRO_CODENAME" - fi + DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION" + DEBIAN_CODENAME="$DISTRO_CODENAME" __PY_VERSION_REPO="apt" if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then From 632fcfefcb8844a34c1b4ec93cc807003230f79d Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Wed, 28 Aug 2019 20:40:07 -0600 Subject: [PATCH 04/22] fix issue #1358 --- bootstrap-salt.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 9192026..ecf90f1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2276,8 +2276,10 @@ __overwriteconfig() { tempfile="/tmp/salt-config-$$" fi + if [ -n "$_PY_EXE" ]; then + good_python="$_PY_EXE" # If python does not have yaml installed we're on Arch and should use python2 - if python -c "import yaml" 2> /dev/null; then + elif python -c "import yaml" 2> /dev/null; then good_python=python else good_python=python2 From 76e8ab0f8a3c3358d9cd0c9446b8ac20cb7e7eae Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Wed, 28 Aug 2019 20:44:01 -0600 Subject: [PATCH 05/22] updating versions of centos dependencies --- bootstrap-salt.sh | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ecf90f1..dba05b8 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3753,13 +3753,33 @@ install_centos_stable_deps() { __install_saltstack_rhel_repository || return 1 fi - __PACKAGES="yum-utils chkconfig" - - # YAML module is used for generating custom master/minion configs - if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then - __PACKAGES="${__PACKAGES} python34-PyYAML" + if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then + __PACKAGES="dnf-utils chkconfig" else - __PACKAGES="${__PACKAGES} PyYAML" + __PACKAGES="yum-utils chkconfig" + fi + + if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then + # YAML module is used for generating custom master/minion configs + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then + __PACKAGES="${__PACKAGES} python3-pyyaml" + else + __PACKAGES="${__PACKAGES} python2-pyyaml" + fi + elif [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then + # YAML module is used for generating custom master/minion configs + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then + __PACKAGES="${__PACKAGES} python36-PyYAML" + else + __PACKAGES="${__PACKAGES} PyYAML" + fi + else + # YAML module is used for generating custom master/minion configs + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then + __PACKAGES="${__PACKAGES} python34-PyYAML" + else + __PACKAGES="${__PACKAGES} PyYAML" + fi fi # shellcheck disable=SC2086 @@ -3841,11 +3861,20 @@ install_centos_git_deps() { __git_clone_and_checkout || return 1 - __PACKAGES="m2crypto" + if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then + __PACKAGES="python3-m2crypto" + else + __PACKAGES="m2crypto" + fi if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then - # Packages are named python34- - PY_PKG_VER=34 + if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then + # Packages are named python3- + PY_PKG_VER=3 + else + # Packages are named python36- + PY_PKG_VER=36 + fi else PY_PKG_VER="" From 21be3370db4f8c1f662adaef1ad7206dbb748a2e Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Mon, 14 Oct 2019 11:51:32 -0600 Subject: [PATCH 06/22] update oses --- .drone.jsonnet | 4 +- .drone.yml | 214 ++++++++++++++++++++++++++++++++++++++++++------- .kitchen.yml | 15 +++- 3 files changed, 201 insertions(+), 32 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 1e5c1ae..c04fb66 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -17,10 +17,12 @@ local distros = [ // { 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: 4, depends: [] }, { name: 'Debian 8', slug: 'debian-8', multiplier: 5, depends: [] }, { name: 'Debian 9', slug: 'debian-9', multiplier: 6, depends: [] }, - { name: 'Fedora 28', slug: 'fedora-28', multiplier: 6, depends: [] }, + { name: 'Debian 10', slug: 'debian-10', multiplier: 6, depends: [] }, { name: 'Fedora 29', slug: 'fedora-29', multiplier: 5, depends: [] }, + { name: 'Fedora 30', slug: 'fedora-30', multiplier: 6, depends: [] }, { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 4, depends: [] }, { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 3, depends: [] }, { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] }, diff --git a/.drone.yml b/.drone.yml index 521bd89..e28ac1a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,13 +24,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" + - 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'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create arch @@ -103,13 +103,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" + - sh -c 't=90; echo Sleeping 90 seconds; sleep 90' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create centos-6 @@ -221,13 +221,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" + - 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'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create centos-7 @@ -327,6 +327,85 @@ node: depends_on: - Lint +--- +kind: pipeline +name: CentOS 8 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle-build + image: alpine + commands: + - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + +- 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 10 + - docker ps -a + - bundle exec kitchen create centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + +- name: Py2 2017.7(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-2017-7-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + +- 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-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-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 @@ -339,13 +418,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" + - sh -c 't=150; echo Sleeping 150 seconds; sleep 150' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create debian-8 @@ -457,13 +536,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" + - sh -c 't=180; echo Sleeping 180 seconds; sleep 180' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create debian-9 @@ -565,7 +644,7 @@ depends_on: --- kind: pipeline -name: Fedora 28 +name: Debian 10 platform: os: linux @@ -575,16 +654,16 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" + - sh -c 't=90; echo Sleeping 90 seconds; sleep 90' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - - bundle exec kitchen create fedora-28 + - bundle exec kitchen create debian-10 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -596,7 +675,7 @@ steps: - 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-2017-7-fedora-28 + - bundle exec kitchen test py2-git-2017-7-debian-10 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -609,7 +688,7 @@ steps: - 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-fedora-28 + - bundle exec kitchen test py2-git-2018-3-debian-10 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -622,7 +701,7 @@ steps: - 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-fedora-28 + - bundle exec kitchen test py2-git-2019-2-debian-10 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -654,13 +733,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=75; echo Sleeping 75 seconds; sleep 75'" + - sh -c 't=75; echo Sleeping 75 seconds; sleep 75' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create fedora-29 @@ -721,6 +800,85 @@ node: depends_on: - Lint +--- +kind: pipeline +name: Fedora 30 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle-build + image: alpine + commands: + - sh -c 't=90; echo Sleeping 90 seconds; sleep 90' + +- 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 10 + - docker ps -a + - bundle exec kitchen create fedora-30 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + +- name: Py2 2017.7(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-2017-7-fedora-30 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + +- 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-fedora-30 + 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-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: Opensuse 15.0 @@ -733,13 +891,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" + - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create opensuse-15 @@ -812,13 +970,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" + - sh -c 't=45; echo Sleeping 45 seconds; sleep 45' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create opensuse-42 @@ -891,13 +1049,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" + - sh -c 't=30; echo Sleeping 30 seconds; sleep 30' - name: create image: saltstack/drone-salt-bootstrap-testing commands: - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create ubuntu-1604 @@ -1009,13 +1167,13 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" + - 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'" + - echo 'Waiting for docker to start' - sleep 10 - docker ps -a - bundle exec kitchen create ubuntu-1804 @@ -1117,6 +1275,6 @@ depends_on: --- kind: signature -hmac: b7e8b81af5c37f4432730a739032d9bbfb32d125b7e55ca8e94d0c08f8e40e59 +hmac: c1fd67a1728978738324f80777165bb1aacd87f09f88b235e3a8b90dec5849c7 ... diff --git a/.kitchen.yml b/.kitchen.yml index d8c5217..f15dca2 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -47,6 +47,9 @@ platforms: provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd + - name: centos-8 + driver_config: + run_command: /usr/lib/systemd/systemd - name: centos-7 driver_config: run_command: /usr/lib/systemd/systemd @@ -65,14 +68,17 @@ platforms: - name: debian-9 driver_config: run_command: /lib/systemd/systemd - - name: fedora-28 + - name: debian-10 driver_config: - image: fedora:28 - run_command: /usr/lib/systemd/systemd + run_command: /lib/systemd/systemd - name: fedora-29 driver_config: image: fedora:29 run_command: /usr/lib/systemd/systemd + - name: fedora-30 + driver_config: + image: fedora:30 + run_command: /usr/lib/systemd/systemd - name: opensuse-15 driver_config: image: opensuse/leap:15.0 @@ -114,6 +120,7 @@ suites: - arch - fedora-28 - fedora-29 + - fedora-30 - opensuse-15 - opensuse-42 - name: py2-stable-2018-3 @@ -124,6 +131,7 @@ suites: - arch - fedora-28 - fedora-29 + - fedora-30 - opensuse-15 - opensuse-42 - name: py2-stable-2019-2 @@ -134,6 +142,7 @@ suites: - arch - fedora-28 - fedora-29 + - fedora-30 - opensuse-15 - opensuse-42 From b5b00043cd5b73e932c1c7eda9ddb59f6b18d182 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Tue, 29 Oct 2019 14:56:03 -0400 Subject: [PATCH 07/22] Add Debian 10 python3 git support --- bootstrap-salt.sh | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2b41411..d8f75b6 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2516,9 +2516,16 @@ __install_pip_pkgs() { # Install pip and pip dependencies if ! __check_command_exists "${_pip_cmd} --version"; then - __PACKAGES="${_py_pkg}-setuptools ${_py_pkg}-pip gcc ${_py_pkg}-devel" + __PACKAGES="${_py_pkg}-setuptools ${_py_pkg}-pip gcc" # shellcheck disable=SC2086 - __yum_install_noinput ${__PACKAGES} || return 1 + if [ "$DISTRO_NAME_L" = "debian" ];then + __PACKAGES="${__PACKAGES} ${_py_pkg}-dev" + __apt_get_install_noinput ${__PACKAGES} || return 1 + else + __PACKAGES="${__PACKAGES} ${_py_pkg}-devel" + __yum_install_noinput ${__PACKAGES} || return 1 + fi + fi echoinfo "Installing pip packages: ${_pip_pkgs} using ${_py_exe}" @@ -2526,6 +2533,18 @@ __install_pip_pkgs() { ${_pip_cmd} install ${_pip_pkgs} || return 1 } +#--- FUNCTION ------------------------------------------------------------------------------------------------------- +# NAME: __install_tornado_pip +# PARAMETERS: python executable +# DESCRIPTION: Return 0 or 1 if successfully able to install tornado<5.0 +#---------------------------------------------------------------------------------------------------------------------- +__install_tornado_pip() { + # OS needs tornado <5.0 from pip + __check_pip_allowed "You need to allow pip based installations (-P) for Tornado <5.0 in order to install Salt on Python 3" + ## install pip if its not installed and install tornado + __install_pip_pkgs "tornado<5.0" "${1}" || return 1 +} + #--- FUNCTION ------------------------------------------------------------------------------------------------------- # NAME: __install_pip_deps # DESCRIPTION: Return 0 or 1 if successfully able to install pip packages via requirements file @@ -3140,6 +3159,24 @@ install_debian_deps() { return 0 } +install_debian_git_pre() { + if ! __check_command_exists git; then + __apt_get_install_noinput git || return 1 + fi + + if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then + __apt_get_install_noinput ca-certificates + fi + + __git_clone_and_checkout || 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_debian_git_deps() { if ! __check_command_exists git; then __apt_get_install_noinput git || return 1 @@ -3289,7 +3326,24 @@ install_debian_9_git_deps() { } install_debian_10_git_deps() { - install_debian_9_git_deps || return 1 + install_debian_git_pre || return 1 + + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then + _py=${_PY_EXE} + PY_PKG_VER=3 + __PACKAGES="python${PY_PKG_VER}-distutils" + else + PY_PKG_VER="" + _py="python" + fi + + __install_tornado_pip ${_py}|| return 1 + # shellcheck disable=SC2086 + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-jinja2" + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-yaml python${PY_PKG_VER}-zmq" + + __apt_get_install_noinput ${__PACKAGES} || return 1 + return 0 } From a2f5fb4b85fc36eff31655b3a62c8371e570e227 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Tue, 29 Oct 2019 17:07:40 -0400 Subject: [PATCH 08/22] ensure _PACKAGES is set for python2 --- bootstrap-salt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index d8f75b6..8c510d5 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3333,8 +3333,9 @@ install_debian_10_git_deps() { PY_PKG_VER=3 __PACKAGES="python${PY_PKG_VER}-distutils" else - PY_PKG_VER="" _py="python" + PY_PKG_VER="" + __PACKAGES="" fi __install_tornado_pip ${_py}|| return 1 From a6522e9ae03c372177190caf44476ad0988b41f9 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Wed, 30 Oct 2019 09:47:30 -0400 Subject: [PATCH 09/22] Fix shellcheck errors --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 8c510d5..ff5aa9e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3339,10 +3339,10 @@ install_debian_10_git_deps() { fi __install_tornado_pip ${_py}|| return 1 - # shellcheck disable=SC2086 __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-jinja2" __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-yaml python${PY_PKG_VER}-zmq" + # shellcheck disable=SC2086 __apt_get_install_noinput ${__PACKAGES} || return 1 return 0 From 73ae07949b876e0872bb768426b21b5b28b4c7fb Mon Sep 17 00:00:00 2001 From: ch3ll Date: Wed, 30 Oct 2019 10:46:14 -0400 Subject: [PATCH 10/22] Add centos8 git support --- bootstrap-salt.sh | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index cd718f8..afcc7ef 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2528,6 +2528,18 @@ __install_pip_pkgs() { ${_pip_cmd} install ${_pip_pkgs} || return 1 } +#--- FUNCTION ------------------------------------------------------------------------------------------------------- +# NAME: __install_tornado_pip +# PARAMETERS: python executable +# DESCRIPTION: Return 0 or 1 if successfully able to install tornado<5.0 +#---------------------------------------------------------------------------------------------------------------------- +__install_tornado_pip() { + # OS needs tornado <5.0 from pip + __check_pip_allowed "You need to allow pip based installations (-P) for Tornado <5.0 in order to install Salt on Python 3" + ## install pip if its not installed and install tornado + __install_pip_pkgs "tornado<5.0" "${1}" || return 1 +} + #--- FUNCTION ------------------------------------------------------------------------------------------------------- # NAME: __install_pip_deps # DESCRIPTION: Return 0 or 1 if successfully able to install pip packages via requirements file @@ -3851,13 +3863,9 @@ install_centos_git_deps() { __git_clone_and_checkout || return 1 - if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then - __PACKAGES="python3-m2crypto" - else - __PACKAGES="m2crypto" - fi if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then + _py=${_PY_EXE} if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then # Packages are named python3- PY_PKG_VER=3 @@ -3866,6 +3874,7 @@ install_centos_git_deps() { PY_PKG_VER=36 fi else + _py="python" PY_PKG_VER="" # Only Py2 needs python-futures @@ -3877,7 +3886,14 @@ install_centos_git_deps() { fi fi - __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2" + if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then + __install_tornado_pip ${_py} || return 1 + __PACKAGES="python3-m2crypto" + else + __PACKAGES="m2crypto ${PY_PKG_VER}-crypto" + fi + + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2" __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests" __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-zmq" @@ -3895,7 +3911,7 @@ install_centos_git_deps() { _PIP_PACKAGES="m2crypto!=0.33.0 jinja2 msgpack-python pycrypto PyYAML tornado<5.0 zmq futures>=2.0" # install swig and openssl on cent6 - if [ "$DISTRO_MAJOR_VERSION" -eq 6 ]; then + if [ "$DISTRO_MAJOR_VERSION" -eq 6 ] || [ "$DISTRO_MAJOR_VERSION" -eq 8 ]; then __yum_install_noinput openssl-devel swig || return 1 fi From 4f04c9562a333466b381caf169822bbe6e8c8c6c Mon Sep 17 00:00:00 2001 From: ch3ll Date: Wed, 30 Oct 2019 11:55:27 -0400 Subject: [PATCH 11/22] Set packages if does not exist --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index afcc7ef..e8bf55e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3864,6 +3864,7 @@ install_centos_git_deps() { __git_clone_and_checkout || return 1 + [ -z "${__PACKAGES}" ] && __PACKAGES="" if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then _py=${_PY_EXE} if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then From 916d343308d74b648ca9f00d12e45f387f6e71f9 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Wed, 30 Oct 2019 12:16:02 -0400 Subject: [PATCH 12/22] Fix packages variable --- bootstrap-salt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index e8bf55e..64558cd 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3864,7 +3864,7 @@ install_centos_git_deps() { __git_clone_and_checkout || return 1 - [ -z "${__PACKAGES}" ] && __PACKAGES="" + __PACKAGES="" if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then _py=${_PY_EXE} if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then @@ -3889,9 +3889,9 @@ install_centos_git_deps() { if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then __install_tornado_pip ${_py} || return 1 - __PACKAGES="python3-m2crypto" + __PACKAGES="${__PACKAGES} python3-m2crypto" else - __PACKAGES="m2crypto ${PY_PKG_VER}-crypto" + __PACKAGES="${__PACKAGES} m2crypto ${PY_PKG_VER}-crypto" fi __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2" From 5e51b067d1cbf5bc899c0d0d5a6e6a5511a8a3d9 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Wed, 30 Oct 2019 17:01:02 -0400 Subject: [PATCH 13/22] Add python3 tests and cent8 stable --- .drone.yml | 499 +++++++++++++++++++++++++++------------------- .gitignore | 1 + .kitchen.yml | 64 ++++-- bootstrap-salt.sh | 2 +- 4 files changed, 349 insertions(+), 217 deletions(-) diff --git a/.drone.yml b/.drone.yml index e28ac1a..c9efc25 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,19 +39,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-arch - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -65,6 +52,19 @@ 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: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -78,6 +78,20 @@ steps: - 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 py2-git-2019-2-arch + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -118,19 +132,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -157,19 +158,6 @@ steps: - throttle-build - create -- name: Py2 2017.7(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-2017-7-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: @@ -236,19 +224,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -262,6 +237,19 @@ 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-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: @@ -275,13 +263,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- 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 py2-stable-2017-7-centos-7 + - bundle exec kitchen test py3-git-2019-2-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -301,6 +289,19 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -314,6 +315,19 @@ steps: - 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 + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -354,19 +368,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -380,6 +381,19 @@ 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-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -393,6 +407,45 @@ steps: - 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-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-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 + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -433,19 +486,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -472,19 +512,6 @@ steps: - throttle-build - create -- name: Py2 2017.7(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-2017-7-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: @@ -551,19 +578,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -577,6 +591,19 @@ 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-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: @@ -590,13 +617,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- 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 py2-stable-2017-7-debian-9 + - bundle exec kitchen test py3-git-2019-2-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -616,6 +643,19 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -629,6 +669,19 @@ steps: - 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 + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -669,19 +722,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -695,6 +735,19 @@ 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-debian-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -708,6 +761,45 @@ steps: - 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-10 + 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-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 + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -748,19 +840,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-fedora-29 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -827,19 +906,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -906,19 +972,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-opensuse-15 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -985,19 +1038,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-opensuse-42 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1064,19 +1104,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1090,6 +1117,19 @@ 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-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: @@ -1103,13 +1143,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- 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 py2-stable-2017-7-ubuntu-1604 + - bundle exec kitchen test py3-git-2019-2-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1129,6 +1169,19 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1142,6 +1195,19 @@ steps: - 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 + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1182,19 +1248,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1208,6 +1261,19 @@ 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-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: @@ -1221,13 +1287,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- 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 py2-stable-2017-7-ubuntu-1804 + - bundle exec kitchen test py3-git-2019-2-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1247,6 +1313,19 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1260,6 +1339,20 @@ steps: - 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 + + services: - name: docker image: saltstack/drone-salt-bootstrap-testing diff --git a/.gitignore b/.gitignore index 0d8af35..48d9908 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ .idea # test-kitchen +.kitchen .bundle Gemfile.lock diff --git a/.kitchen.yml b/.kitchen.yml index f15dca2..f8313f4 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -103,26 +103,15 @@ platforms: run_command: /lib/systemd/systemd suites: - - name: py2-git-2017-7 - provisioner: - salt_version: 2017.7 - name: py2-git-2018-3 provisioner: salt_version: 2018.3 - name: py2-git-2019-2 provisioner: salt_version: 2019.2 - - name: py2-stable-2017-7 + - name: py2-git-master provisioner: - salt_version: 2017.7 - salt_bootstrap_options: -MP stable %s - excludes: - - arch - - fedora-28 - - fedora-29 - - fedora-30 - - opensuse-15 - - opensuse-42 + salt_version: master - name: py2-stable-2018-3 provisioner: salt_version: 2018.3 @@ -145,6 +134,55 @@ suites: - fedora-30 - opensuse-15 - opensuse-42 + - name: py3-git-2018-3 + provisioner: + salt_version: 2018.3 + salt_bootstrap_options: -x python3 -MPfq git %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - name: py3-git-2019-2 + provisioner: + salt_version: 2019.2 + salt_bootstrap_options: -x python3 -MPfq git %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - name: py3-stable-2018-3 + provisioner: + salt_version: 2018.3 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - name: py3-stable-2019-2 + provisioner: + salt_version: 2019.2 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - arch verifier: name: shell diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 64558cd..be65ccb 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3891,7 +3891,7 @@ install_centos_git_deps() { __install_tornado_pip ${_py} || return 1 __PACKAGES="${__PACKAGES} python3-m2crypto" else - __PACKAGES="${__PACKAGES} m2crypto ${PY_PKG_VER}-crypto" + __PACKAGES="${__PACKAGES} m2crypto python${PY_PKG_VER}-crypto" fi __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2" From 6b24948a911938dcb4fac73f9d278104175a19a4 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Wed, 30 Oct 2019 17:08:02 -0400 Subject: [PATCH 14/22] fix py3 kitchen name --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c9efc25..79106f1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,7 +84,7 @@ steps: - 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 + - bundle exec kitchen test py3-git-2019-2-arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: From 233b13744777ffa0bffb02cb02bede5c70fd5b11 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Thu, 31 Oct 2019 10:22:02 -0400 Subject: [PATCH 15/22] Use drone jsonnect to add py3 tests --- .drone.jsonnet | 10 +- .drone.yml | 572 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 422 insertions(+), 160 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index c04fb66..63a9da8 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,14 +1,16 @@ local git_suites = [ - { name: 'Py2 2017.7(Git)', slug: 'py2-git-2017-7', depends: [] }, - { name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3', depends: ['Py2 2017.7(Git)'] }, + { 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: '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: 'Py2 develop(Stable)', slug: 'py2-git-develop'}, // Don't test against Salt's develop branch. Stability is not assured. ]; local stable_suites = [ - { name: 'Py2 2017.7(Stable)', slug: 'py2-stable-2017-7', depends: ['Py2 2017.7(Git)'] }, { 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: '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)'] }, ]; local distros = [ @@ -34,8 +36,10 @@ local stable_distros = [ 'amazon-2', 'centos-6', 'centos-7', + 'centos-8', 'debian-8', 'debian-9', + 'debian-10', 'ubuntu-1604', 'ubuntu-1804', ]; diff --git a/.drone.yml b/.drone.yml index 79106f1..fcad754 100644 --- a/.drone.yml +++ b/.drone.yml @@ -52,19 +52,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: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -78,6 +65,19 @@ 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: @@ -91,7 +91,6 @@ steps: - throttle-build - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -117,7 +116,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=90; echo Sleeping 90 seconds; sleep 90' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -158,6 +157,32 @@ 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-centos-6 + 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-6 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -184,6 +209,32 @@ steps: - 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-6 + 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-6 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -209,7 +260,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' + - sh -c 't=160; echo Sleeping 160 seconds; sleep 160' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -237,19 +288,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-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: @@ -263,6 +301,19 @@ 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-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: @@ -289,19 +340,6 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -315,6 +353,19 @@ steps: - 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: @@ -353,7 +404,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=160; echo Sleeping 160 seconds; sleep 160' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -381,19 +432,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-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -407,6 +445,19 @@ 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-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -420,6 +471,19 @@ steps: - 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-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -433,6 +497,19 @@ steps: - 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-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -471,7 +548,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=150; echo Sleeping 150 seconds; sleep 150' + - sh -c 't=200; echo Sleeping 200 seconds; sleep 200' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -512,6 +589,32 @@ 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-debian-8 + 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-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -538,6 +641,32 @@ steps: - 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-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-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -563,7 +692,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=180; echo Sleeping 180 seconds; sleep 180' + - sh -c 't=240; echo Sleeping 240 seconds; sleep 240' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -591,19 +720,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-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: @@ -617,6 +733,19 @@ 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-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: @@ -643,19 +772,6 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -669,6 +785,19 @@ steps: - 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: @@ -707,7 +836,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=90; echo Sleeping 90 seconds; sleep 90' + - sh -c 't=240; echo Sleeping 240 seconds; sleep 240' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -735,19 +864,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-debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -761,6 +877,19 @@ 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-debian-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -774,6 +903,19 @@ steps: - 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-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -787,6 +929,19 @@ steps: - 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-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -825,7 +980,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=75; echo Sleeping 75 seconds; sleep 75' + - sh -c 't=100; echo Sleeping 100 seconds; sleep 100' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -866,6 +1021,32 @@ 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-fedora-29 + 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-29 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -891,7 +1072,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=90; echo Sleeping 90 seconds; sleep 90' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -932,6 +1113,32 @@ 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-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 + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -957,7 +1164,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=80; echo Sleeping 80 seconds; sleep 80' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -998,6 +1205,32 @@ 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-opensuse-15 + 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-opensuse-15 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1023,7 +1256,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=45; echo Sleeping 45 seconds; sleep 45' + - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1064,6 +1297,32 @@ 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-opensuse-42 + 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-opensuse-42 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1089,7 +1348,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=30; echo Sleeping 30 seconds; sleep 30' + - sh -c 't=40; echo Sleeping 40 seconds; sleep 40' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1117,19 +1376,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-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: @@ -1143,6 +1389,19 @@ 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-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: @@ -1169,19 +1428,6 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1195,6 +1441,19 @@ steps: - 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: @@ -1261,19 +1520,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-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: @@ -1287,6 +1533,19 @@ 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-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: @@ -1313,19 +1572,6 @@ steps: - 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: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1339,6 +1585,19 @@ steps: - 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: @@ -1352,7 +1611,6 @@ steps: - throttle-build - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1368,6 +1626,6 @@ depends_on: --- kind: signature -hmac: c1fd67a1728978738324f80777165bb1aacd87f09f88b235e3a8b90dec5849c7 +hmac: 188907a7bb96adc05e4030147a7e03026e40ceb4d4adc04dd5832f77d7d9f466 ... From 6363e8213ae4a9d0260cb2a0e48ae6933a573d25 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Thu, 31 Oct 2019 14:52:42 -0400 Subject: [PATCH 16/22] Only run python3 tests on specific OSs --- .drone.jsonnet | 23 +- .drone.yml | 558 +++++++++++++++++-------------------------------- 2 files changed, 209 insertions(+), 372 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 63a9da8..c502cdb 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,14 +1,20 @@ 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 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: 'Py2 develop(Stable)', slug: 'py2-git-develop'}, // Don't test against Salt's develop branch. Stability is not assured. ]; 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)'] }, +]; + +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)'] }, ]; @@ -44,6 +50,18 @@ local stable_distros = [ 'ubuntu-1804', ]; +local py3_distros = [ + 'amazon-2', + 'centos-7', + 'centos-8', + 'debian-8', + 'debian-9', + 'debian-10', + 'ubuntu-1604', + 'ubuntu-1804', +]; + + local Shellcheck() = { kind: 'pipeline', name: 'Lint', @@ -67,7 +85,8 @@ local Build(distro) = { project: 'open', }, - local suites = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, + local suite = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, + local suites = suite + if std.count(py3_distros, distro.slug) > 0 then git_py3_suites + stable_py3_suites else [], steps: [ { diff --git a/.drone.yml b/.drone.yml index fcad754..ebc0e36 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,32 +65,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 - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -116,7 +90,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' + - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -157,32 +131,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-centos-6 - 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-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -209,32 +157,6 @@ steps: - 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-6 - 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-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -301,32 +223,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-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: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -353,6 +249,32 @@ 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-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 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -445,32 +367,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-centos-8 - 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-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -497,6 +393,32 @@ 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-centos-8 + 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-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -589,32 +511,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-debian-8 - 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-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -641,6 +537,32 @@ 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-debian-8 + 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-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -733,32 +655,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-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: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -785,6 +681,32 @@ 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-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 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -877,32 +799,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-debian-10 - 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-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -929,6 +825,32 @@ 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-debian-10 + 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-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -980,7 +902,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=100; echo Sleeping 100 seconds; sleep 100' + - sh -c 't=50; echo Sleeping 50 seconds; sleep 50' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1021,32 +943,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-fedora-29 - 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-29 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1072,7 +968,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' + - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1113,32 +1009,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-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 - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1164,7 +1034,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=80; echo Sleeping 80 seconds; sleep 80' + - sh -c 't=40; echo Sleeping 40 seconds; sleep 40' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1205,32 +1075,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-opensuse-15 - 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-opensuse-15 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1256,7 +1100,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=30; echo Sleeping 30 seconds; sleep 30' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1297,32 +1141,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-opensuse-42 - 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-opensuse-42 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1389,32 +1207,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-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: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1441,6 +1233,32 @@ 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-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 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1533,32 +1351,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-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: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1585,6 +1377,32 @@ 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-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 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1626,6 +1444,6 @@ depends_on: --- kind: signature -hmac: 188907a7bb96adc05e4030147a7e03026e40ceb4d4adc04dd5832f77d7d9f466 +hmac: aaf26c5b82aa9f009d383c3c5ab1f59bd306c74e38b5ea57f3482fbb62b98b31 ... From e9e21a19a7a453058a582557aa5294ff18e6edfa Mon Sep 17 00:00:00 2001 From: ch3ll Date: Thu, 31 Oct 2019 17:18:47 -0400 Subject: [PATCH 17/22] Remove suse 42, fed28 and add fed31 --- .drone.jsonnet | 17 +- .drone.yml | 468 ++++++++++++++++++------------------------------- .kitchen.yml | 35 +--- 3 files changed, 192 insertions(+), 328 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index c502cdb..351c32c 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -29,10 +29,9 @@ local distros = [ { name: 'Debian 8', slug: 'debian-8', multiplier: 5, depends: [] }, { name: 'Debian 9', slug: 'debian-9', multiplier: 6, depends: [] }, { name: 'Debian 10', slug: 'debian-10', multiplier: 6, depends: [] }, - { name: 'Fedora 29', slug: 'fedora-29', multiplier: 5, depends: [] }, { name: 'Fedora 30', slug: 'fedora-30', multiplier: 6, depends: [] }, + { name: 'Fedora 31', slug: 'fedora-31', multiplier: 6, depends: [] }, { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 4, depends: [] }, - { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 3, depends: [] }, { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] }, { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] }, ]; @@ -54,13 +53,18 @@ local py3_distros = [ 'amazon-2', 'centos-7', 'centos-8', - 'debian-8', 'debian-9', 'debian-10', 'ubuntu-1604', 'ubuntu-1804', + 'fedora-30', + 'fedora-31', ]; +local py2_blacklist = [ + 'centos-8', + 'debian-10', +]; local Shellcheck() = { kind: 'pipeline', @@ -85,7 +89,12 @@ local Build(distro) = { project: 'open', }, - local suite = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, + local suite = + if std.count(py2_blacklist, distro.slug) > 0 then + [] + else if std.count(stable_distros, distro.slug) > 0 then + git_suites + stable_suites + else git_suites, local suites = suite + if std.count(py3_distros, distro.slug) > 0 then git_py3_suites + stable_py3_suites else [], steps: [ diff --git a/.drone.yml b/.drone.yml index ebc0e36..b74e957 100644 --- a/.drone.yml +++ b/.drone.yml @@ -326,7 +326,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=160; echo Sleeping 160 seconds; sleep 160' + - sh -c 't=80; echo Sleeping 80 seconds; sleep 80' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -341,58 +341,6 @@ steps: 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-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-centos-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-centos-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-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -470,7 +418,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=200; echo Sleeping 200 seconds; sleep 200' + - sh -c 't=100; echo Sleeping 100 seconds; sleep 100' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -537,58 +485,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-debian-8 - 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-8 - 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-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-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -758,7 +654,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=240; echo Sleeping 240 seconds; sleep 240' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -773,58 +669,6 @@ steps: 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-10 - 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-10 - 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-10 - 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-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -890,72 +734,6 @@ node: depends_on: - Lint ---- -kind: pipeline -name: Fedora 29 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=50; echo Sleeping 50 seconds; sleep 50' - -- 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 10 - - docker ps -a - - bundle exec kitchen create fedora-29 - 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-fedora-29 - 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-fedora-29 - 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 @@ -968,7 +746,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=180; echo Sleeping 180 seconds; sleep 180' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1009,6 +787,176 @@ 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-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 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 + +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=180; echo Sleeping 180 seconds; sleep 180' + +- 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 10 + - docker ps -a + - bundle exec kitchen create fedora-31 + 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-fedora-31 + 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-fedora-31 + 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-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 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-31 + 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-31 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1088,72 +1036,6 @@ node: depends_on: - Lint ---- -kind: pipeline -name: Opensuse 42.3 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=30; echo Sleeping 30 seconds; sleep 30' - -- 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 10 - - docker ps -a - - bundle exec kitchen create opensuse-42 - 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-42 - 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-42 - 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 @@ -1444,6 +1326,6 @@ depends_on: --- kind: signature -hmac: aaf26c5b82aa9f009d383c3c5ab1f59bd306c74e38b5ea57f3482fbb62b98b31 +hmac: 5e82d36d8b41c6fd2a9b5e3dd58f3ac5d0bece39053bee5041026a3488e3eb8e ... diff --git a/.kitchen.yml b/.kitchen.yml index f8313f4..3fd2af7 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -71,14 +71,14 @@ platforms: - name: debian-10 driver_config: run_command: /lib/systemd/systemd - - name: fedora-29 - driver_config: - image: fedora:29 - run_command: /usr/lib/systemd/systemd - name: fedora-30 driver_config: image: fedora:30 run_command: /usr/lib/systemd/systemd + - name: fedora-31 + driver_config: + image: fedora:31 + run_command: /usr/lib/systemd/systemd - name: opensuse-15 driver_config: image: opensuse/leap:15.0 @@ -88,13 +88,6 @@ platforms: - systemctl enable sshd.service provisioner: salt_bootstrap_options: -MPfq -y -x python2 git %s - - name: opensuse-42 - driver_config: - image: opensuse/leap:42.3 - run_command: /usr/lib/systemd/systemd - provision_command: - - zypper --non-interactive install --auto-agree-with-licenses dbus-1 - - systemctl enable sshd.service - name: ubuntu-18.04 driver_config: run_command: /lib/systemd/systemd @@ -118,22 +111,14 @@ suites: salt_bootstrap_options: -MP stable %s excludes: - arch - - fedora-28 - - fedora-29 - - fedora-30 - opensuse-15 - - opensuse-42 - name: py2-stable-2019-2 provisioner: salt_version: 2019.2 salt_bootstrap_options: -MP stable %s excludes: - arch - - fedora-28 - - fedora-29 - - fedora-30 - opensuse-15 - - opensuse-42 - name: py3-git-2018-3 provisioner: salt_version: 2018.3 @@ -142,10 +127,7 @@ suites: - amazon-1 - centos-6 - debian-8 - - fedora-29 - - fedora-30 - opensuse-15 - - opensuse-42 - name: py3-git-2019-2 provisioner: salt_version: 2019.2 @@ -154,10 +136,7 @@ suites: - amazon-1 - centos-6 - debian-8 - - fedora-29 - - fedora-30 - opensuse-15 - - opensuse-42 - name: py3-stable-2018-3 provisioner: salt_version: 2018.3 @@ -166,10 +145,7 @@ suites: - amazon-1 - centos-6 - debian-8 - - fedora-29 - - fedora-30 - opensuse-15 - - opensuse-42 - name: py3-stable-2019-2 provisioner: salt_version: 2019.2 @@ -178,10 +154,7 @@ suites: - amazon-1 - centos-6 - debian-8 - - fedora-29 - - fedora-30 - opensuse-15 - - opensuse-42 - arch verifier: From a08294b65726305a4ba65ce86a0f11c9fc9683ac Mon Sep 17 00:00:00 2001 From: ch3ll Date: Fri, 1 Nov 2019 11:32:07 -0400 Subject: [PATCH 18/22] Install openssl/swig when py3 and >cent6 --- bootstrap-salt.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index be65ccb..585fa75 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3865,8 +3865,12 @@ install_centos_git_deps() { __PACKAGES="" + _install_m2crypto_req=false if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then _py=${_PY_EXE} + if [ "$DISTRO_MAJOR_VERSION" -gt 6 ]; then + _install_m2crypto_req=true + fi if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then # Packages are named python3- PY_PKG_VER=3 @@ -3875,6 +3879,9 @@ install_centos_git_deps() { PY_PKG_VER=36 fi else + if [ "$DISTRO_MAJOR_VERSION" -eq 6 ]; then + _install_m2crypto_req=true + fi _py="python" PY_PKG_VER="" @@ -3912,7 +3919,7 @@ install_centos_git_deps() { _PIP_PACKAGES="m2crypto!=0.33.0 jinja2 msgpack-python pycrypto PyYAML tornado<5.0 zmq futures>=2.0" # install swig and openssl on cent6 - if [ "$DISTRO_MAJOR_VERSION" -eq 6 ] || [ "$DISTRO_MAJOR_VERSION" -eq 8 ]; then + if $_install_m2crypto_req; then __yum_install_noinput openssl-devel swig || return 1 fi From cef90c40f672ec1358e7a33b46409f92697656bf Mon Sep 17 00:00:00 2001 From: ch3ll Date: Fri, 1 Nov 2019 12:02:25 -0400 Subject: [PATCH 19/22] Do not run 2018.3 stable tests for deb10/cent8 --- .drone.jsonnet | 11 ++++++++++- .drone.yml | 32 +++----------------------------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 351c32c..20b87e9 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -66,6 +66,11 @@ local py2_blacklist = [ 'debian-10', ]; +local blacklist_2018 = [ + 'centos-8', + 'debian-10', +]; + local Shellcheck() = { kind: 'pipeline', name: 'Lint', @@ -95,7 +100,11 @@ local Build(distro) = { else if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, - local suites = suite + if std.count(py3_distros, distro.slug) > 0 then git_py3_suites + stable_py3_suites else [], + local suites = suite + if std.count(blacklist_2018, distro.slug) > 0 then + git_py3_suites + stable_py3_suites[1:] + else if std.count(py3_distros, distro.slug) > 0 then + git_py3_suites + stable_py3_suites + else [], steps: [ { diff --git a/.drone.yml b/.drone.yml index b74e957..d08c190 100644 --- a/.drone.yml +++ b/.drone.yml @@ -326,7 +326,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=80; echo Sleeping 80 seconds; sleep 80' + - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -367,19 +367,6 @@ steps: - 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-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py3 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -654,7 +641,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' + - sh -c 't=90; echo Sleeping 90 seconds; sleep 90' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -695,19 +682,6 @@ steps: - 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-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py3 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1326,6 +1300,6 @@ depends_on: --- kind: signature -hmac: 5e82d36d8b41c6fd2a9b5e3dd58f3ac5d0bece39053bee5041026a3488e3eb8e +hmac: 65ce1b99b73ea3cda568a76e4103c54cb7221387258ecc03ba0df9701b3b888c ... From 344aee35e041160f1745210117615efa2bbf489c Mon Sep 17 00:00:00 2001 From: ch3ll Date: Fri, 1 Nov 2019 12:31:19 -0400 Subject: [PATCH 20/22] Add fedora stable support --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 585fa75..07ab8a1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1790,7 +1790,7 @@ elif [ "${DISTRO_NAME_L}" = "debian" ]; then __debian_codename_translation fi -if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian|ubuntu|centos|red_hat|oracle|scientific|amazon)')" = "" ] && [ "$ITYPE" = "stable" ] && [ "$STABLE_REV" != "latest" ]; then +if [ "$(echo "${DISTRO_NAME_L}" | grep -E '(debian|ubuntu|centos|red_hat|oracle|scientific|amazon|fedora)')" = "" ] && [ "$ITYPE" = "stable" ] && [ "$STABLE_REV" != "latest" ]; then echoerror "${DISTRO_NAME} does not have major version pegged packages support" exit 1 fi From 762a8b8b35fcb30da72cc84b3a59ea3838c84cab Mon Sep 17 00:00:00 2001 From: ch3ll Date: Fri, 1 Nov 2019 14:13:20 -0400 Subject: [PATCH 21/22] Remove fedora 31 tests - will add a separate PR for this --- .drone.jsonnet | 2 - .drone.yml | 120 +------------------------------------------------ 2 files changed, 1 insertion(+), 121 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 20b87e9..e7145b5 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -30,7 +30,6 @@ local distros = [ { name: 'Debian 9', slug: 'debian-9', multiplier: 6, depends: [] }, { name: 'Debian 10', slug: 'debian-10', multiplier: 6, depends: [] }, { name: 'Fedora 30', slug: 'fedora-30', multiplier: 6, depends: [] }, - { name: 'Fedora 31', slug: 'fedora-31', multiplier: 6, depends: [] }, { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 4, depends: [] }, { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] }, { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] }, @@ -58,7 +57,6 @@ local py3_distros = [ 'ubuntu-1604', 'ubuntu-1804', 'fedora-30', - 'fedora-31', ]; local py2_blacklist = [ diff --git a/.drone.yml b/.drone.yml index d08c190..f7d4ecf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -826,124 +826,6 @@ node: depends_on: - Lint ---- -kind: pipeline -name: Fedora 31 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - sh -c 't=180; echo Sleeping 180 seconds; sleep 180' - -- 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 10 - - docker ps -a - - bundle exec kitchen create fedora-31 - 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-fedora-31 - 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-fedora-31 - 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-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 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-31 - 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-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.0 @@ -1300,6 +1182,6 @@ depends_on: --- kind: signature -hmac: 65ce1b99b73ea3cda568a76e4103c54cb7221387258ecc03ba0df9701b3b888c +hmac: 906ceab2f0ec44b6e9c99f698feeb4874c503fd9db2a8525ed2916445069c403 ... From dc8604a941273ec67da49f10347dd4348c99fee3 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Mon, 4 Nov 2019 09:54:50 -0500 Subject: [PATCH 22/22] Update changes for 2019.11.04 release --- AUTHORS.rst | 2 ++ ChangeLog | 6 ++++++ bootstrap-salt.sh | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 1f824bd..3fc7c87 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -89,6 +89,7 @@ Justin Findlay jfindlay jfindlay@gmail.com Karl Grzeszczak karlgrz Kenneth Wilke KennethWilke Kevin Quinn kevinquinnyo kevin.quinn@totalserversolutions.com +kiemlicz kiemlicz Ky-Anh Huynh icy Liu Xiaohui oreh herolxh@gmail.com lomeroe lomeroe @@ -150,6 +151,7 @@ Shane Lee twangboy slee@saltstack.com Shawn Butts shawnbutts Skyler Berg skylerberg skylertheberg@gmail.com Stanislav B stanislavb +stanzgy stanzgy stanzgy@gmail.com Steve Groesz wolfpackmars2 wolfpackmars2@yahoo.com Sven R hackacad admin@hackacad.net sybix sybix diff --git a/ChangeLog b/ChangeLog index 8002196..dd36fa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ Version TBD (In Progress on the Develop Branch): +Version 2019.11.04: + * Fix busybox mktemp compatibility (stanzgy) #1369 + * Install debian 10 packages on debian 10 instead of 9 (kiemlicz) #1375 + * move centos to python36, use python specified by -x (Ch3LL,bryceml) #1380 + * Add debian 10 git install support (Ch3LL) #1378 + Version 2019.10.03: * Fix possible typo with `gnupg-curl` vs `gnupg curl` (zahiar) * Install only python3 packges if requested on ubuntu (noelmcloughlin) #1356 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a7c79c7..9bc4030 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2019.10.03" +__ScriptVersion="2019.11.04" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"