From ff81747b1d7fc364b05e781f15e59b79776bb785 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Feb 2019 12:17:16 +0000 Subject: [PATCH 01/84] Update change log for release --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index b7b623b..eb2b383 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ Version TBD (In Progress on the Develop Branch): +Version 2019.02.27: + * Add support for bunsenlabs devian derivative (kevinquinnyo) #1300 + * Add support for TurnKey devian derivative (dafyddj) #1313 + * Fix BSD develop install (hackacad) #1316 + * Ensure python-concurrent.futures is installed for Ubuntu (garethgreenaway) #1321 + Version 2019.01.08: * use official amazon linux 2 repo for amazon linux 2 (mchugh19) #1287 * Add release info to applicable docs (rallytime) #1292 From 2928105cb8c876b2bf3911bff23cd995e6f6f4d6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Feb 2019 12:17:30 +0000 Subject: [PATCH 02/84] Update authors --- AUTHORS.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index c0a444a..93e65f0 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -40,6 +40,7 @@ Chris Buechler cbuechler cmb@pfsense.org Christer Edwards cedwards Christian McHugh mchugh19 Clark Perkins iclarkperkins clark.perkins@digitalreasoning.com +Dafydd Jones dafyddj dafydd@techneg.it Dag Viggo Lokøen dagvl dag.viggo@lokoen.org Dan Mick dmick dan.mick@inktank.com Daniel Poelzleithner poelzi @@ -62,6 +63,7 @@ EYJ eyj fizmat fizmat Forrest Alvarez gravyboat Fred Reimer freimer freimer@freimer.org +Gareth J. Greenaway garethgreenaway gareth@wiked.org Geoff Garside geoffgarside geoff@geoffgarside.co.uk George aflat gstock.public@gmail.com gdm85 gdm85 @@ -85,6 +87,7 @@ Justin Anderson justinta justin.ta@outlook.com Justin Findlay jfindlay jfindlay@gmail.com Karl Grzeszczak karlgrz Kenneth Wilke KennethWilke +Kevin Quinn kevinquinnyo kevin.quinn@totalserversolutions.com Ky-Anh Huynh icy lomeroe lomeroe Liu Xiaohui oreh herolxh@gmail.com @@ -143,6 +146,7 @@ Shawn Butts shawnbutts Skyler Berg skylerberg skylertheberg@gmail.com Stanislav B stanislavb Steve Groesz wolfpackmars2 wolfpackmars2@yahoo.com +Sven R hackacad admin@hackacad.net sybix sybix Tate Eskew tateeskew Thomas S. Hatch thatch45 thatch45@saltstack.com From 67967edf069e1109296364d1e71243f4430fc3b5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Feb 2019 12:18:11 +0000 Subject: [PATCH 03/84] Update version for release --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index bbfd70e..b7cc712 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2019.01.08" +__ScriptVersion="2019.02.27" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" From 087b1c5fdae3412e91678617e34436638928b654 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Feb 2019 16:26:28 +0000 Subject: [PATCH 04/84] Add the 2019.02.27 release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 04b5632..9796746 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.02.27: ``23728e4b5e54f564062070e3be53c5602b55c24c9a76671968abbf3d609258cb`` - 2019.01.08: ``ab7f29b75711da4bb79aff98d46654f910d569ebe3e908753a3c5119017bb163`` - 2018.08.15: ``6d414a39439a7335af1b78203f9d37e11c972b3c49c519742c6405e2944c6c4b`` - 2018.08.13: ``98284bdc2b5ebaeb619b22090374e42a68e8fdefe6bff1e73bd1760db4407ed0`` From 44d4ff5e8171c0da9eabe01206004223584d6018 Mon Sep 17 00:00:00 2001 From: Pulu Anau Date: Wed, 27 Feb 2019 16:40:18 -0800 Subject: [PATCH 05/84] Allow stable version selection for amazon linux --- bootstrap-salt.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b7cc712..d8d7b50 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4789,8 +4789,7 @@ install_amazon_linux_ami_2_deps() { if [ $_DISABLE_REPOS -eq $BS_FALSE ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then __REPO_FILENAME="saltstack-repo.repo" - base_url="$HTTP_VAL://${_REPO_URL}/yum/redhat/7/\$basearch/$repo_rev/" - base_url="$HTTP_VAL://${_REPO_URL}/yum/amazon/2/\$basearch/latest/" + base_url="$HTTP_VAL://${_REPO_URL}/yum/amazon/2/\$basearch/$repo_rev/" gpg_key="${base_url}SALTSTACK-GPG-KEY.pub ${base_url}base/RPM-GPG-KEY-CentOS-7" repo_name="SaltStack repo for Amazon Linux 2.0" From e8acc863debc301b19090d65a560696ee6c46e9d Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 7 Mar 2019 17:15:51 +1100 Subject: [PATCH 06/84] added support for FreeBSD 12 --- bootstrap-salt.sh | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b7cc712..6e51bd8 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5162,17 +5162,21 @@ __configure_freebsd_pkg_details() { fi FROM_FREEBSD="-r FreeBSD" - ## add saltstack freebsd repo - salt_conf_file=/usr/local/etc/pkg/repos/saltstack.conf - { - echo "SaltStack:{" - echo " url: \"${SALTPKGCONFURL}\"," - echo " mirror_type: \"http\"," - echo " enabled: true" - echo " priority: 10" - echo "}" - } > $salt_conf_file - FROM_SALTSTACK="-r SaltStack" + ##### Workaround : Waiting for SaltStack Repository to be available for FreeBSD 12 #### + if [ 12 -ne $( freebsd-version -k | cut -d. -f1 ) ]; then + ## add saltstack freebsd repo + salt_conf_file=/usr/local/etc/pkg/repos/saltstack.conf + { + echo "SaltStack:{" + echo " url: \"${SALTPKGCONFURL}\"," + echo " mirror_type: \"http\"," + echo " enabled: true" + echo " priority: 10" + echo "}" + } > $salt_conf_file + FROM_SALTSTACK="-r SaltStack" + fi + ##### End Workaround : Waiting for SaltStack Repository to be available for FreeBSD 12 #### ## ensure future ports builds use pkgng echo "WITH_PKGNG= yes" >> /etc/make.conf @@ -5230,6 +5234,10 @@ install_freebsd_11_stable_deps() { install_freebsd_9_stable_deps } +install_freebsd_12_stable_deps() { + install_freebsd_9_stable_deps +} + install_freebsd_git_deps() { install_freebsd_9_stable_deps || return 1 @@ -5316,6 +5324,16 @@ install_freebsd_11_stable() { return 0 } +install_freebsd_12_stable() { +# +# installing latest version of salt from FreeBSD CURRENT ports repo +# + # shellcheck disable=SC2086 + /usr/local/sbin/pkg install ${FROM_FREEBSD} -y sysutils/py-salt || return 1 + + return 0 +} + install_freebsd_git() { # /usr/local/bin/python2 in FreeBSD is a symlink to /usr/local/bin/python2.7 @@ -5382,6 +5400,10 @@ install_freebsd_11_stable_post() { install_freebsd_9_stable_post } +install_freebsd_12_stable_post() { + install_freebsd_9_stable_post +} + install_freebsd_git_post() { if [ -f $salt_conf_file ]; then rm -f $salt_conf_file From 8ff6eacb1c9a9cfead130b68b766428e0dd24dd9 Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Fri, 8 Mar 2019 09:29:39 +1100 Subject: [PATCH 07/84] use already calculated FreeBSD release variable Co-Authored-By: sticky-note <46799934+sticky-note@users.noreply.github.com> --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 6e51bd8..97021b5 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5163,7 +5163,7 @@ __configure_freebsd_pkg_details() { FROM_FREEBSD="-r FreeBSD" ##### Workaround : Waiting for SaltStack Repository to be available for FreeBSD 12 #### - if [ 12 -ne $( freebsd-version -k | cut -d. -f1 ) ]; then + if [ ${DISTRO_MAJOR_VERSION} -ne 12 ]; then ## add saltstack freebsd repo salt_conf_file=/usr/local/etc/pkg/repos/saltstack.conf { From e229fb3d15bc1db4af1dfb49d181eb43ca468e5b Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 8 Mar 2019 09:38:21 +1100 Subject: [PATCH 08/84] Shellcheck: Double quote to prevent globbing and word splitting. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 97021b5..eaec73a 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5163,7 +5163,7 @@ __configure_freebsd_pkg_details() { FROM_FREEBSD="-r FreeBSD" ##### Workaround : Waiting for SaltStack Repository to be available for FreeBSD 12 #### - if [ ${DISTRO_MAJOR_VERSION} -ne 12 ]; then + if [ "${DISTRO_MAJOR_VERSION}" -ne 12 ]; then ## add saltstack freebsd repo salt_conf_file=/usr/local/etc/pkg/repos/saltstack.conf { From 462905f137b1055cb3baa1ad71213e3efcd610b1 Mon Sep 17 00:00:00 2001 From: Matt McKinnon Date: Wed, 20 Mar 2019 14:19:18 -0400 Subject: [PATCH 09/84] refactor based on error output rather than return code --- bootstrap-salt.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 57ff6c2..f231872 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1818,27 +1818,27 @@ __wait_for_apt(){ WAIT_TIMEOUT=900 # Run our passed in apt command - "${@}" + APT_ERR=$(mktemp /tmp/apt_error.XXXX) + "${@}" 2>$APT_ERR APT_RETURN=$? - # If our exit code from apt is 100, then we're waiting on a lock - while [ $APT_RETURN -eq 100 ]; do + # Make sure we're not waiting on a lock + while [ $APT_RETURN -ne 0 ] && [ $(grep -c "^E: Could not get lock" $APT_ERR) -ge 1 ]; do echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..." sleep 1 WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1)) - # If timeout reaches 0, abort. if [ "$WAIT_TIMEOUT" -eq 0 ]; then echoerror "Apt, apt-get, aptitude, or dpkg process is taking too long." echoerror "Bootstrap script cannot proceed. Aborting." return 1 else - # Try running apt again until our return code != 100 "${@}" APT_RETURN=$? fi done + rm $APT_ERR return $APT_RETURN } From 0a3d5c3911550a46e0c0c2efea62fd1b53429c47 Mon Sep 17 00:00:00 2001 From: Matt McKinnon Date: Wed, 20 Mar 2019 14:36:28 -0400 Subject: [PATCH 10/84] only create one temp file and remove during cleanup --- bootstrap-salt.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f231872..73b9a2e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -521,6 +521,12 @@ __exit_cleanup() { rm -f "$LOGPIPE" fi + # Remove the temporary apt error file when the script exits + if [ -f "$APT_ERR" ]; then + echodebug "Removing the temporary apt error file $APT_ERR" + rm -f "$APT_ERR" + fi + # Kill tee when exiting, CentOS, at least requires this # shellcheck disable=SC2009 TEE_PID=$(ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}') @@ -1813,12 +1819,12 @@ __function_defined() { # a boot process, such as on AWS AMIs. This func will wait until the boot # process is finished so the script doesn't exit on a locked proc. #---------------------------------------------------------------------------------------------------------------------- +APT_ERR=$(mktemp /tmp/apt_error.XXXX) __wait_for_apt(){ # Timeout set at 15 minutes WAIT_TIMEOUT=900 # Run our passed in apt command - APT_ERR=$(mktemp /tmp/apt_error.XXXX) "${@}" 2>$APT_ERR APT_RETURN=$? @@ -1838,7 +1844,6 @@ __wait_for_apt(){ fi done - rm $APT_ERR return $APT_RETURN } From 060d4d81833fcf8f085ac73b8d5a251b65d6a194 Mon Sep 17 00:00:00 2001 From: Matt McKinnon Date: Thu, 21 Mar 2019 08:55:37 -0400 Subject: [PATCH 11/84] modify grep test for clarity --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 73b9a2e..f40dc41 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1829,7 +1829,7 @@ __wait_for_apt(){ APT_RETURN=$? # Make sure we're not waiting on a lock - while [ $APT_RETURN -ne 0 ] && [ $(grep -c "^E: Could not get lock" $APT_ERR) -ge 1 ]; do + while [ $APT_RETURN -ne 0 ] && grep -q -v '^E: Could not get lock' "$APT_ERR"; do echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..." sleep 1 WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1)) From ee11a3066e0baaeaa146a267ac8da99ab504b014 Mon Sep 17 00:00:00 2001 From: Matt McKinnon Date: Fri, 29 Mar 2019 11:55:29 -0400 Subject: [PATCH 12/84] make sure we grab stderr from the else apt command, too --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f40dc41..f34b5a3 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1829,7 +1829,7 @@ __wait_for_apt(){ APT_RETURN=$? # Make sure we're not waiting on a lock - while [ $APT_RETURN -ne 0 ] && grep -q -v '^E: Could not get lock' "$APT_ERR"; do + while [ $APT_RETURN -ne 0 ] && grep -q '^E: Could not get lock' "$APT_ERR"; do echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..." sleep 1 WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1)) @@ -1839,7 +1839,7 @@ __wait_for_apt(){ echoerror "Bootstrap script cannot proceed. Aborting." return 1 else - "${@}" + "${@}" 2>$APT_ERR APT_RETURN=$? fi done From cb4cb5bf8a21df1f37054ac354936267539905f5 Mon Sep 17 00:00:00 2001 From: Matt McKinnon Date: Fri, 5 Apr 2019 08:57:47 -0400 Subject: [PATCH 13/84] double quote variable to make shellcheck happier --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f34b5a3..cc3f475 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1825,7 +1825,7 @@ __wait_for_apt(){ WAIT_TIMEOUT=900 # Run our passed in apt command - "${@}" 2>$APT_ERR + "${@}" 2>"$APT_ERR" APT_RETURN=$? # Make sure we're not waiting on a lock @@ -1839,7 +1839,7 @@ __wait_for_apt(){ echoerror "Bootstrap script cannot proceed. Aborting." return 1 else - "${@}" 2>$APT_ERR + "${@}" 2>"$APT_ERR" APT_RETURN=$? fi done From a36c0d8f19b6e81c5d7b538f30fc224e3d2f2462 Mon Sep 17 00:00:00 2001 From: twangboy Date: Fri, 12 Apr 2019 13:56:06 -0600 Subject: [PATCH 14/84] Add TLS support up to TLS 1.2 --- bootstrap-salt.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1 index 747c74d..34c8984 100644 --- a/bootstrap-salt.ps1 +++ b/bootstrap-salt.ps1 @@ -99,6 +99,9 @@ Param( [string]$repourl= "https://repo.saltstack.com/windows" ) +# Powershell supports only TLS 1.0 by default. Add support up to TLS 1.2 +[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12' + #=============================================================================== # Script Functions #=============================================================================== From d46de5ecbdcd65bc2f959dccff2e6a92631fb320 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 12:00:58 +0100 Subject: [PATCH 15/84] `python-xml` or `python2-xml` is required in Opensuse 15 git installations --- bootstrap-salt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index cc3f475..5008548 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6082,7 +6082,8 @@ install_opensuse_15_git_deps() { fi __PACKAGES="${__PACKAGES} libzmq5 python${PY_PKG_VER}-Jinja2 python${PY_PKG_VER}-msgpack" - __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pycrypto python${PY_PKG_VER}-pyzmq" + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pycrypto python${PY_PKG_VER}-pyzmq " + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-xml" if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then # We're on the develop branch, install whichever tornado is on the requirements file From d221a9bb2d8704d3f8cf1a7072b38be321c0d70d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 13:32:03 +0100 Subject: [PATCH 16/84] Another 2 required packages for Opensuse 15 Py2 Git installation --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 5008548..b120e2b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6075,14 +6075,14 @@ install_opensuse_15_git_deps() { PY_PKG_VER=2 # This is required by some of the python2 packages below - __PACKAGES="libpython2_7-1_0" + __PACKAGES="libpython2_7-1_0 python2-futures python-ipaddress" else PY_PKG_VER=3 __PACKAGES="" fi __PACKAGES="${__PACKAGES} libzmq5 python${PY_PKG_VER}-Jinja2 python${PY_PKG_VER}-msgpack" - __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pycrypto python${PY_PKG_VER}-pyzmq " + __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-pycrypto python${PY_PKG_VER}-pyzmq" __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-xml" if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then From 2ac8188cc9aa5d521a1a3a817f03391d0cafeca0 Mon Sep 17 00:00:00 2001 From: Nick Henry Date: Tue, 16 Apr 2019 19:28:16 -0600 Subject: [PATCH 17/84] Fix for Amazon Linux Images Specifically `amazonlinux:2` from https://hub.docker.com/_/amazonlinux --- bootstrap-salt.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b120e2b..f6c7d42 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -529,7 +529,7 @@ __exit_cleanup() { # Kill tee when exiting, CentOS, at least requires this # shellcheck disable=SC2009 - TEE_PID=$(ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}') + TEE_PID=$(/usr/bin/ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}') [ "$TEE_PID" = "" ] && exit $EXIT_CODE @@ -555,7 +555,7 @@ trap "__exit_cleanup" EXIT INT # Let's discover how we're being called # shellcheck disable=SC2009 -CALLER=$(ps -a -o pid,args | grep $$ | grep -v grep | tr -s ' ' | cut -d ' ' -f 3) +CALLER=$(/usr/bin/ps -a -o pid,args | grep $$ | grep -v grep | tr -s ' ' | cut -d ' ' -f 3) if [ "${CALLER}x" = "${0}x" ]; then CALLER="shell pipe" @@ -4541,7 +4541,7 @@ daemons_running_alpine_linux() { [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue # shellcheck disable=SC2009 - if [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then + if [ "$(/usr/bin/ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then echoerror "salt-$fname was not found running" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi @@ -6811,7 +6811,7 @@ daemons_running() { echoerror "salt-$fname was not found running" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi - elif [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then + elif [ "$(/usr/bin/ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then echoerror "salt-$fname was not found running" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi @@ -7122,7 +7122,7 @@ if [ "$DAEMONS_RUNNING_FUNC" != "null" ] && [ ${_START_DAEMONS} -eq $BS_TRUE ]; done echodebug "Running Processes:" - echodebug "$(ps auxwww)" + echodebug "$(/usr/bin/ps auxwww)" exit 1 fi From 45cb333949efbdd5ac3d6340322d7a51af3407ef Mon Sep 17 00:00:00 2001 From: Nick Henry Date: Tue, 16 Apr 2019 19:49:02 -0600 Subject: [PATCH 18/84] Install procps-ng to get rid of 'ps: command not found' errors --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f6c7d42..439c673 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4818,7 +4818,7 @@ _eof # Package python-ordereddict-1.1-2.el6.noarch is obsoleted by python26-2.6.9-2.88.amzn1.x86_64 # which is already installed - __PACKAGES="m2crypto ${pkg_append}-crypto ${pkg_append}-jinja2 PyYAML" + __PACKAGES="m2crypto ${pkg_append}-crypto ${pkg_append}-jinja2 PyYAML procps-ng" __PACKAGES="${__PACKAGES} ${pkg_append}-msgpack ${pkg_append}-requests ${pkg_append}-zmq" __PACKAGES="${__PACKAGES} ${pkg_append}-futures" From adad3ca8852c96805180307df5219659ce25d2b9 Mon Sep 17 00:00:00 2001 From: Nick Henry Date: Tue, 16 Apr 2019 19:56:21 -0600 Subject: [PATCH 19/84] Revert "Fix for Amazon Linux Images" This reverts commit c381b0d82c6c6ea7bce7d1d4dc63ce90c4323d02. --- bootstrap-salt.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 439c673..78d3ab4 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -529,7 +529,7 @@ __exit_cleanup() { # Kill tee when exiting, CentOS, at least requires this # shellcheck disable=SC2009 - TEE_PID=$(/usr/bin/ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}') + TEE_PID=$(ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}') [ "$TEE_PID" = "" ] && exit $EXIT_CODE @@ -555,7 +555,7 @@ trap "__exit_cleanup" EXIT INT # Let's discover how we're being called # shellcheck disable=SC2009 -CALLER=$(/usr/bin/ps -a -o pid,args | grep $$ | grep -v grep | tr -s ' ' | cut -d ' ' -f 3) +CALLER=$(ps -a -o pid,args | grep $$ | grep -v grep | tr -s ' ' | cut -d ' ' -f 3) if [ "${CALLER}x" = "${0}x" ]; then CALLER="shell pipe" @@ -4541,7 +4541,7 @@ daemons_running_alpine_linux() { [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue # shellcheck disable=SC2009 - if [ "$(/usr/bin/ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then + if [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then echoerror "salt-$fname was not found running" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi @@ -6811,7 +6811,7 @@ daemons_running() { echoerror "salt-$fname was not found running" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi - elif [ "$(/usr/bin/ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then + elif [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then echoerror "salt-$fname was not found running" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi @@ -7122,7 +7122,7 @@ if [ "$DAEMONS_RUNNING_FUNC" != "null" ] && [ ${_START_DAEMONS} -eq $BS_TRUE ]; done echodebug "Running Processes:" - echodebug "$(/usr/bin/ps auxwww)" + echodebug "$(ps auxwww)" exit 1 fi From 541ff9c2a05c7b03f977ad258e43c4abbcff4011 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Fri, 26 Apr 2019 14:20:09 +0200 Subject: [PATCH 20/84] apt_key_fetch: use curl using curl + apt-key rather than keyserver-options no-check-cert which is not always supported --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 78d3ab4..f9dfec6 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1875,7 +1875,7 @@ __apt_key_fetch() { url=$1 # shellcheck disable=SC2086 - __wait_for_apt apt-key adv ${_GPG_ARGS} --fetch-keys "$url"; return $? + __wait_for_apt curl ${_CURL_ARGS} -sSL "$url" | apt-key add -; return $? } # ---------- end of function __apt_key_fetch ---------- From 53333c42f3b4cc4e5b728138fb8fa0c63281e481 Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Fri, 26 Apr 2019 18:10:45 +0200 Subject: [PATCH 21/84] Update bootstrap-salt.sh Co-Authored-By: greut --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f9dfec6..f3c8112 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1875,7 +1875,7 @@ __apt_key_fetch() { url=$1 # shellcheck disable=SC2086 - __wait_for_apt curl ${_CURL_ARGS} -sSL "$url" | apt-key add -; return $? + __fetch_url - "$url" | apt-key add -; return $? } # ---------- end of function __apt_key_fetch ---------- From a36611a43af4a0f9b04bc64aeace59e3eb356cbf Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Mon, 13 May 2019 08:26:12 +0200 Subject: [PATCH 22/84] apt_key: refatoring Signed-off-by: Yoan Blanc --- bootstrap-salt.sh | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f3c8112..cd28495 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1866,6 +1866,26 @@ __apt_get_upgrade_noinput() { } # ---------- end of function __apt_get_upgrade_noinput ---------- +#--- FUNCTION ------------------------------------------------------------------------------------------------------- +# NAME: __temp_gpg_pub +# DESCRIPTION: Create a temporary file for downloading a GPG public key. +#---------------------------------------------------------------------------------------------------------------------- +__temp_gpg_pub() { + if __check_command_exists mktemp; then + tempfile="$(mktemp /tmp/salt-gpg-XXXXXXXX.pub 2>/dev/null)" + + if [ -z "$tempfile" ]; then + echoerror "Failed to create temporary file in /tmp" + return 1 + fi + else + tempfile="/tmp/salt-gpg-$$.pub" + fi + + echo $tempfile +} # ----------- end of function __temp_gpg_pub ----------- + + #--- FUNCTION ------------------------------------------------------------------------------------------------------- # NAME: __apt_key_fetch # DESCRIPTION: Download and import GPG public key for "apt-secure" @@ -1874,8 +1894,13 @@ __apt_get_upgrade_noinput() { __apt_key_fetch() { url=$1 - # shellcheck disable=SC2086 - __fetch_url - "$url" | apt-key add -; return $? + tempfile = __temp_gpg_pub || return 1 + + __fetch_url "$tempfile" "$url" || return 1 + apt-key add "$tempfile" || return 1 + rm -f "$tempfile" + + return 0 } # ---------- end of function __apt_key_fetch ---------- @@ -1887,16 +1912,7 @@ __apt_key_fetch() { __rpm_import_gpg() { url=$1 - if __check_command_exists mktemp; then - tempfile="$(mktemp /tmp/salt-gpg-XXXXXXXX.pub 2>/dev/null)" - - if [ -z "$tempfile" ]; then - echoerror "Failed to create temporary file in /tmp" - return 1 - fi - else - tempfile="/tmp/salt-gpg-$$.pub" - fi + tempfile = __temp_gpg_pub || return 1 __fetch_url "$tempfile" "$url" || return 1 rpm --import "$tempfile" || return 1 From 3dd36eb026bbfdb757edeeb280bb2c3baab16ccf Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Mon, 13 May 2019 10:05:38 +0200 Subject: [PATCH 23/84] fixup! apt_key: refatoring Signed-off-by: Yoan Blanc --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index cd28495..1a9e84b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1894,7 +1894,7 @@ __temp_gpg_pub() { __apt_key_fetch() { url=$1 - tempfile = __temp_gpg_pub || return 1 + tempfile=__temp_gpg_pub || return 1 __fetch_url "$tempfile" "$url" || return 1 apt-key add "$tempfile" || return 1 @@ -1912,7 +1912,7 @@ __apt_key_fetch() { __rpm_import_gpg() { url=$1 - tempfile = __temp_gpg_pub || return 1 + tempfile=__temp_gpg_pub || return 1 __fetch_url "$tempfile" "$url" || return 1 rpm --import "$tempfile" || return 1 From cd2242b5d803f7ec5a1052dd2cebcf377d2e8f01 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Mon, 13 May 2019 10:30:10 +0200 Subject: [PATCH 24/84] fixup! fixup! apt_key: refatoring Signed-off-by: Yoan Blanc --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 1a9e84b..fbac7da 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1894,7 +1894,7 @@ __temp_gpg_pub() { __apt_key_fetch() { url=$1 - tempfile=__temp_gpg_pub || return 1 + tempfile="$(__temp_gpg_pub)" || return 1 __fetch_url "$tempfile" "$url" || return 1 apt-key add "$tempfile" || return 1 @@ -1912,7 +1912,7 @@ __apt_key_fetch() { __rpm_import_gpg() { url=$1 - tempfile=__temp_gpg_pub || return 1 + tempfile="$(__temp_gpg_pub)" || return 1 __fetch_url "$tempfile" "$url" || return 1 rpm --import "$tempfile" || return 1 From d09e3820341b763585d586ad271df8bc6231ea8f Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Mon, 13 May 2019 10:45:33 +0200 Subject: [PATCH 25/84] fixup! fixup! fixup! apt_key: refatoring Signed-off-by: Yoan Blanc --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index fbac7da..223e3a4 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1894,7 +1894,7 @@ __temp_gpg_pub() { __apt_key_fetch() { url=$1 - tempfile="$(__temp_gpg_pub)" || return 1 + tempfile="$(__temp_gpg_pub)" __fetch_url "$tempfile" "$url" || return 1 apt-key add "$tempfile" || return 1 @@ -1912,7 +1912,7 @@ __apt_key_fetch() { __rpm_import_gpg() { url=$1 - tempfile="$(__temp_gpg_pub)" || return 1 + tempfile="$(__temp_gpg_pub)" __fetch_url "$tempfile" "$url" || return 1 rpm --import "$tempfile" || return 1 From 8aac8353608fa7f6ec77dc7aaef80ef845e2e3b8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 13:04:09 +0100 Subject: [PATCH 26/84] Start testing more plaforms on drone --- .drone.jsonnet | 10 ++-- .drone.yml | 137 +++++++++++++++++++++++++++++++++++++++++++++++-- .kitchen.yml | 23 +++++++-- 3 files changed, 158 insertions(+), 12 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 269534f..7f1b83c 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,12 +1,16 @@ local distros = [ { name: 'amazon', version: '1' }, { name: 'amazon', version: '2' }, - // { name: 'centos', version: '6' }, + { name: 'centos', version: '6' }, { name: 'centos', version: '7' }, { name: 'debian', version: '8' }, { name: 'debian', version: '9' }, - // { name: 'ubuntu', version: '1404' }, - // { name: 'ubuntu', version: '1604' }, + { name: 'fedora', version: '28' }, + { name: 'fedora', version: '29' }, + { name: 'opensuse', version: '15' }, + { name: 'opensuse', version: '42' }, + { name: 'ubuntu', version: '1404' }, + { name: 'ubuntu', version: '1604' }, { name: 'ubuntu', version: '1804' }, ]; diff --git a/.drone.yml b/.drone.yml index 07d8a12..5295f85 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,6 +50,25 @@ steps: depends_on: - run-shellcheck +--- +kind: pipeline +name: build-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: centos-6 + privileged: true + +depends_on: +- run-shellcheck + --- kind: pipeline name: build-centos-7 @@ -107,6 +126,120 @@ steps: depends_on: - run-shellcheck +--- +kind: pipeline +name: build-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: build-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: build-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: build-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: build-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: build-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + --- kind: pipeline name: build-ubuntu-1804 @@ -126,8 +259,4 @@ steps: depends_on: - run-shellcheck ---- -kind: signature -hmac: 563c4cb4cefd58c08143192bd72c5a25c5d0edbe4a6d1f5f89c87d3ca2024246 - ... diff --git a/.kitchen.yml b/.kitchen.yml index 71a43d1..f42bd6c 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -26,9 +26,13 @@ provisioner: - tests.accept_key platforms: - - name: fedora + - name: fedora-28 driver_config: - image: fedora:latest + image: fedora:28 + run_command: /usr/lib/systemd/systemd + - name: fedora-29 + driver_config: + image: fedora:29 run_command: /usr/lib/systemd/systemd - name: centos-7 driver_config: @@ -79,8 +83,15 @@ platforms: provision_command: - pacman -Syu --noconfirm systemd - systemctl enable sshd - - name: opensuse + - name: opensuse-15 driver_config: + image: opensuse/leap:15.0 + run_command: /usr/lib/systemd/systemd + provision_command: + - systemctl enable sshd.service + - name: opensuse-42 + driver_config: + image: opensuse/leap:42.3 run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service @@ -107,8 +118,10 @@ suites: excludes: - arch - centos-6 - - fedora - - opensuse + - fedora-28 + - fedora-29 + - opensuse-15 + - opensuse-42 - name: py2-stable-2018.3 provisioner: salt_version: 2018.3 From 405d90ea04a668dc5a7b4775bce3b14f186160b4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 13:17:01 +0100 Subject: [PATCH 27/84] Paralelize the suites --- .drone.jsonnet | 19 +- .drone.yml | 1538 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 1527 insertions(+), 30 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 7f1b83c..0b0b996 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,3 +1,13 @@ +local suites = [ + 'py2-git-2017.7', + 'py2-git-2018.3', + 'py2-git-2019.2', + 'py2-git-develop', + 'py2-stable-2017.7', + 'py2-stable-2018.3', + 'py2-stable-2019.2', +]; + local distros = [ { name: 'amazon', version: '1' }, { name: 'amazon', version: '2' }, @@ -29,9 +39,9 @@ local Shellcheck() = { ], }; -local Build(os, os_version) = { +local Build(suite, os, os_version) = { kind: 'pipeline', - name: std.format('build-%s-%s', [os, os_version]), + name: std.format('%s-%s-%s', [suite, os, os_version]), steps: [ { @@ -39,7 +49,7 @@ local Build(os, os_version) = { privileged: true, image: 'saltstack/drone-plugin-kitchen', settings: { - target: std.format('%s-%s', [os, os_version]), + target: std.format('%s-%s-%s', [suite, os, os_version]), requirements: 'tests/requirements.txt', }, }, @@ -53,6 +63,7 @@ local Build(os, os_version) = { [ Shellcheck(), ] + [ - Build(distro.name, distro.version) + Build(suite, distro.name, distro.version) for distro in distros + for suite in suites ] diff --git a/.drone.yml b/.drone.yml index 5295f85..04d40e2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: --- kind: pipeline -name: build-amazon-1 +name: py2-git-2017.7-amazon-1 platform: os: linux @@ -25,7 +25,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: amazon-1 + target: py2-git-2017.7-amazon-1 privileged: true depends_on: @@ -33,7 +33,7 @@ depends_on: --- kind: pipeline -name: build-amazon-2 +name: py2-git-2018.3-amazon-1 platform: os: linux @@ -44,7 +44,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: amazon-2 + target: py2-git-2018.3-amazon-1 privileged: true depends_on: @@ -52,7 +52,7 @@ depends_on: --- kind: pipeline -name: build-centos-6 +name: py2-git-2019.2-amazon-1 platform: os: linux @@ -63,7 +63,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: centos-6 + target: py2-git-2019.2-amazon-1 privileged: true depends_on: @@ -71,7 +71,7 @@ depends_on: --- kind: pipeline -name: build-centos-7 +name: py2-git-develop-amazon-1 platform: os: linux @@ -82,7 +82,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: centos-7 + target: py2-git-develop-amazon-1 privileged: true depends_on: @@ -90,7 +90,7 @@ depends_on: --- kind: pipeline -name: build-debian-8 +name: py2-stable-2017.7-amazon-1 platform: os: linux @@ -101,7 +101,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: debian-8 + target: py2-stable-2017.7-amazon-1 privileged: true depends_on: @@ -109,7 +109,7 @@ depends_on: --- kind: pipeline -name: build-debian-9 +name: py2-stable-2018.3-amazon-1 platform: os: linux @@ -120,7 +120,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: debian-9 + target: py2-stable-2018.3-amazon-1 privileged: true depends_on: @@ -128,7 +128,7 @@ depends_on: --- kind: pipeline -name: build-fedora-28 +name: py2-stable-2019.2-amazon-1 platform: os: linux @@ -139,7 +139,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: fedora-28 + target: py2-stable-2019.2-amazon-1 privileged: true depends_on: @@ -147,7 +147,7 @@ depends_on: --- kind: pipeline -name: build-fedora-29 +name: py2-git-2017.7-amazon-2 platform: os: linux @@ -158,7 +158,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: fedora-29 + target: py2-git-2017.7-amazon-2 privileged: true depends_on: @@ -166,7 +166,7 @@ depends_on: --- kind: pipeline -name: build-opensuse-15 +name: py2-git-2018.3-amazon-2 platform: os: linux @@ -177,7 +177,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: opensuse-15 + target: py2-git-2018.3-amazon-2 privileged: true depends_on: @@ -185,7 +185,7 @@ depends_on: --- kind: pipeline -name: build-opensuse-42 +name: py2-git-2019.2-amazon-2 platform: os: linux @@ -196,7 +196,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: opensuse-42 + target: py2-git-2019.2-amazon-2 privileged: true depends_on: @@ -204,7 +204,7 @@ depends_on: --- kind: pipeline -name: build-ubuntu-1404 +name: py2-git-develop-amazon-2 platform: os: linux @@ -215,7 +215,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: ubuntu-1404 + target: py2-git-develop-amazon-2 privileged: true depends_on: @@ -223,7 +223,7 @@ depends_on: --- kind: pipeline -name: build-ubuntu-1604 +name: py2-stable-2017.7-amazon-2 platform: os: linux @@ -234,7 +234,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: ubuntu-1604 + target: py2-stable-2017.7-amazon-2 privileged: true depends_on: @@ -242,7 +242,7 @@ depends_on: --- kind: pipeline -name: build-ubuntu-1804 +name: py2-stable-2018.3-amazon-2 platform: os: linux @@ -253,10 +253,1496 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: ubuntu-1804 + target: py2-stable-2018.3-amazon-2 privileged: true depends_on: - run-shellcheck +--- +kind: pipeline +name: py2-stable-2019.2-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017.7-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017.7-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018.3-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018.3-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019.2-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019.2-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017.7-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017.7-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018.3-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018.3-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019.2-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019.2-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: signature +hmac: ea705e5194cc7bc20d8022398adcb86a218e78b50fc630e924569b0cb8a80c30 + ... From eff09e693b11c05ad348d609feac5b3b18e8a095 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 13:31:07 +0100 Subject: [PATCH 28/84] Fix names and no exclusions --- .drone.jsonnet | 12 +- .drone.yml | 314 ++++++++++++++++++++++++------------------------- .kitchen.yml | 27 ++--- 3 files changed, 173 insertions(+), 180 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0b0b996..6a3e6ce 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,11 +1,11 @@ local suites = [ - 'py2-git-2017.7', - 'py2-git-2018.3', - 'py2-git-2019.2', + 'py2-git-2017-7', + 'py2-git-2018-3', + 'py2-git-2019-2', 'py2-git-develop', - 'py2-stable-2017.7', - 'py2-stable-2018.3', - 'py2-stable-2019.2', + 'py2-stable-2017-7', + 'py2-stable-2018-3', + 'py2-stable-2019-2', ]; local distros = [ diff --git a/.drone.yml b/.drone.yml index 04d40e2..3625bcd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: --- kind: pipeline -name: py2-git-2017.7-amazon-1 +name: py2-git-2017-7-amazon-1 platform: os: linux @@ -25,7 +25,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-amazon-1 + target: py2-git-2017-7-amazon-1 privileged: true depends_on: @@ -33,7 +33,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-amazon-1 +name: py2-git-2018-3-amazon-1 platform: os: linux @@ -44,7 +44,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-amazon-1 + target: py2-git-2018-3-amazon-1 privileged: true depends_on: @@ -52,7 +52,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-amazon-1 +name: py2-git-2019-2-amazon-1 platform: os: linux @@ -63,7 +63,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-amazon-1 + target: py2-git-2019-2-amazon-1 privileged: true depends_on: @@ -90,7 +90,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-amazon-1 +name: py2-stable-2017-7-amazon-1 platform: os: linux @@ -101,7 +101,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-amazon-1 + target: py2-stable-2017-7-amazon-1 privileged: true depends_on: @@ -109,7 +109,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-amazon-1 +name: py2-stable-2018-3-amazon-1 platform: os: linux @@ -120,7 +120,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-amazon-1 + target: py2-stable-2018-3-amazon-1 privileged: true depends_on: @@ -128,7 +128,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-amazon-1 +name: py2-stable-2019-2-amazon-1 platform: os: linux @@ -139,7 +139,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-amazon-1 + target: py2-stable-2019-2-amazon-1 privileged: true depends_on: @@ -147,7 +147,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-amazon-2 +name: py2-git-2017-7-amazon-2 platform: os: linux @@ -158,7 +158,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-amazon-2 + target: py2-git-2017-7-amazon-2 privileged: true depends_on: @@ -166,7 +166,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-amazon-2 +name: py2-git-2018-3-amazon-2 platform: os: linux @@ -177,7 +177,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-amazon-2 + target: py2-git-2018-3-amazon-2 privileged: true depends_on: @@ -185,7 +185,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-amazon-2 +name: py2-git-2019-2-amazon-2 platform: os: linux @@ -196,7 +196,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-amazon-2 + target: py2-git-2019-2-amazon-2 privileged: true depends_on: @@ -223,7 +223,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-amazon-2 +name: py2-stable-2017-7-amazon-2 platform: os: linux @@ -234,7 +234,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-amazon-2 + target: py2-stable-2017-7-amazon-2 privileged: true depends_on: @@ -242,7 +242,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-amazon-2 +name: py2-stable-2018-3-amazon-2 platform: os: linux @@ -253,7 +253,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-amazon-2 + target: py2-stable-2018-3-amazon-2 privileged: true depends_on: @@ -261,7 +261,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-amazon-2 +name: py2-stable-2019-2-amazon-2 platform: os: linux @@ -272,7 +272,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-amazon-2 + target: py2-stable-2019-2-amazon-2 privileged: true depends_on: @@ -280,7 +280,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-centos-6 +name: py2-git-2017-7-centos-6 platform: os: linux @@ -291,7 +291,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-centos-6 + target: py2-git-2017-7-centos-6 privileged: true depends_on: @@ -299,7 +299,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-centos-6 +name: py2-git-2018-3-centos-6 platform: os: linux @@ -310,7 +310,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-centos-6 + target: py2-git-2018-3-centos-6 privileged: true depends_on: @@ -318,7 +318,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-centos-6 +name: py2-git-2019-2-centos-6 platform: os: linux @@ -329,7 +329,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-centos-6 + target: py2-git-2019-2-centos-6 privileged: true depends_on: @@ -356,7 +356,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-centos-6 +name: py2-stable-2017-7-centos-6 platform: os: linux @@ -367,7 +367,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-centos-6 + target: py2-stable-2017-7-centos-6 privileged: true depends_on: @@ -375,7 +375,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-centos-6 +name: py2-stable-2018-3-centos-6 platform: os: linux @@ -386,7 +386,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-centos-6 + target: py2-stable-2018-3-centos-6 privileged: true depends_on: @@ -394,7 +394,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-centos-6 +name: py2-stable-2019-2-centos-6 platform: os: linux @@ -405,7 +405,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-centos-6 + target: py2-stable-2019-2-centos-6 privileged: true depends_on: @@ -413,7 +413,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-centos-7 +name: py2-git-2017-7-centos-7 platform: os: linux @@ -424,7 +424,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-centos-7 + target: py2-git-2017-7-centos-7 privileged: true depends_on: @@ -432,7 +432,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-centos-7 +name: py2-git-2018-3-centos-7 platform: os: linux @@ -443,7 +443,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-centos-7 + target: py2-git-2018-3-centos-7 privileged: true depends_on: @@ -451,7 +451,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-centos-7 +name: py2-git-2019-2-centos-7 platform: os: linux @@ -462,7 +462,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-centos-7 + target: py2-git-2019-2-centos-7 privileged: true depends_on: @@ -489,7 +489,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-centos-7 +name: py2-stable-2017-7-centos-7 platform: os: linux @@ -500,7 +500,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-centos-7 + target: py2-stable-2017-7-centos-7 privileged: true depends_on: @@ -508,7 +508,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-centos-7 +name: py2-stable-2018-3-centos-7 platform: os: linux @@ -519,7 +519,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-centos-7 + target: py2-stable-2018-3-centos-7 privileged: true depends_on: @@ -527,7 +527,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-centos-7 +name: py2-stable-2019-2-centos-7 platform: os: linux @@ -538,7 +538,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-centos-7 + target: py2-stable-2019-2-centos-7 privileged: true depends_on: @@ -546,7 +546,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-debian-8 +name: py2-git-2017-7-debian-8 platform: os: linux @@ -557,7 +557,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-debian-8 + target: py2-git-2017-7-debian-8 privileged: true depends_on: @@ -565,7 +565,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-debian-8 +name: py2-git-2018-3-debian-8 platform: os: linux @@ -576,7 +576,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-debian-8 + target: py2-git-2018-3-debian-8 privileged: true depends_on: @@ -584,7 +584,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-debian-8 +name: py2-git-2019-2-debian-8 platform: os: linux @@ -595,7 +595,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-debian-8 + target: py2-git-2019-2-debian-8 privileged: true depends_on: @@ -622,7 +622,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-debian-8 +name: py2-stable-2017-7-debian-8 platform: os: linux @@ -633,7 +633,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-debian-8 + target: py2-stable-2017-7-debian-8 privileged: true depends_on: @@ -641,7 +641,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-debian-8 +name: py2-stable-2018-3-debian-8 platform: os: linux @@ -652,7 +652,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-debian-8 + target: py2-stable-2018-3-debian-8 privileged: true depends_on: @@ -660,7 +660,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-debian-8 +name: py2-stable-2019-2-debian-8 platform: os: linux @@ -671,7 +671,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-debian-8 + target: py2-stable-2019-2-debian-8 privileged: true depends_on: @@ -679,7 +679,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-debian-9 +name: py2-git-2017-7-debian-9 platform: os: linux @@ -690,7 +690,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-debian-9 + target: py2-git-2017-7-debian-9 privileged: true depends_on: @@ -698,7 +698,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-debian-9 +name: py2-git-2018-3-debian-9 platform: os: linux @@ -709,7 +709,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-debian-9 + target: py2-git-2018-3-debian-9 privileged: true depends_on: @@ -717,7 +717,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-debian-9 +name: py2-git-2019-2-debian-9 platform: os: linux @@ -728,7 +728,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-debian-9 + target: py2-git-2019-2-debian-9 privileged: true depends_on: @@ -755,7 +755,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-debian-9 +name: py2-stable-2017-7-debian-9 platform: os: linux @@ -766,7 +766,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-debian-9 + target: py2-stable-2017-7-debian-9 privileged: true depends_on: @@ -774,7 +774,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-debian-9 +name: py2-stable-2018-3-debian-9 platform: os: linux @@ -785,7 +785,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-debian-9 + target: py2-stable-2018-3-debian-9 privileged: true depends_on: @@ -793,7 +793,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-debian-9 +name: py2-stable-2019-2-debian-9 platform: os: linux @@ -804,7 +804,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-debian-9 + target: py2-stable-2019-2-debian-9 privileged: true depends_on: @@ -812,7 +812,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-fedora-28 +name: py2-git-2017-7-fedora-28 platform: os: linux @@ -823,7 +823,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-fedora-28 + target: py2-git-2017-7-fedora-28 privileged: true depends_on: @@ -831,7 +831,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-fedora-28 +name: py2-git-2018-3-fedora-28 platform: os: linux @@ -842,7 +842,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-fedora-28 + target: py2-git-2018-3-fedora-28 privileged: true depends_on: @@ -850,7 +850,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-fedora-28 +name: py2-git-2019-2-fedora-28 platform: os: linux @@ -861,7 +861,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-fedora-28 + target: py2-git-2019-2-fedora-28 privileged: true depends_on: @@ -888,7 +888,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-fedora-28 +name: py2-stable-2017-7-fedora-28 platform: os: linux @@ -899,7 +899,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-fedora-28 + target: py2-stable-2017-7-fedora-28 privileged: true depends_on: @@ -907,7 +907,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-fedora-28 +name: py2-stable-2018-3-fedora-28 platform: os: linux @@ -918,7 +918,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-fedora-28 + target: py2-stable-2018-3-fedora-28 privileged: true depends_on: @@ -926,7 +926,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-fedora-28 +name: py2-stable-2019-2-fedora-28 platform: os: linux @@ -937,7 +937,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-fedora-28 + target: py2-stable-2019-2-fedora-28 privileged: true depends_on: @@ -945,7 +945,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-fedora-29 +name: py2-git-2017-7-fedora-29 platform: os: linux @@ -956,7 +956,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-fedora-29 + target: py2-git-2017-7-fedora-29 privileged: true depends_on: @@ -964,7 +964,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-fedora-29 +name: py2-git-2018-3-fedora-29 platform: os: linux @@ -975,7 +975,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-fedora-29 + target: py2-git-2018-3-fedora-29 privileged: true depends_on: @@ -983,7 +983,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-fedora-29 +name: py2-git-2019-2-fedora-29 platform: os: linux @@ -994,7 +994,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-fedora-29 + target: py2-git-2019-2-fedora-29 privileged: true depends_on: @@ -1021,7 +1021,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-fedora-29 +name: py2-stable-2017-7-fedora-29 platform: os: linux @@ -1032,7 +1032,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-fedora-29 + target: py2-stable-2017-7-fedora-29 privileged: true depends_on: @@ -1040,7 +1040,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-fedora-29 +name: py2-stable-2018-3-fedora-29 platform: os: linux @@ -1051,7 +1051,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-fedora-29 + target: py2-stable-2018-3-fedora-29 privileged: true depends_on: @@ -1059,7 +1059,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-fedora-29 +name: py2-stable-2019-2-fedora-29 platform: os: linux @@ -1070,7 +1070,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-fedora-29 + target: py2-stable-2019-2-fedora-29 privileged: true depends_on: @@ -1078,7 +1078,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-opensuse-15 +name: py2-git-2017-7-opensuse-15 platform: os: linux @@ -1089,7 +1089,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-opensuse-15 + target: py2-git-2017-7-opensuse-15 privileged: true depends_on: @@ -1097,7 +1097,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-opensuse-15 +name: py2-git-2018-3-opensuse-15 platform: os: linux @@ -1108,7 +1108,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-opensuse-15 + target: py2-git-2018-3-opensuse-15 privileged: true depends_on: @@ -1116,7 +1116,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-opensuse-15 +name: py2-git-2019-2-opensuse-15 platform: os: linux @@ -1127,7 +1127,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-opensuse-15 + target: py2-git-2019-2-opensuse-15 privileged: true depends_on: @@ -1154,7 +1154,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-opensuse-15 +name: py2-stable-2017-7-opensuse-15 platform: os: linux @@ -1165,7 +1165,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-opensuse-15 + target: py2-stable-2017-7-opensuse-15 privileged: true depends_on: @@ -1173,7 +1173,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-opensuse-15 +name: py2-stable-2018-3-opensuse-15 platform: os: linux @@ -1184,7 +1184,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-opensuse-15 + target: py2-stable-2018-3-opensuse-15 privileged: true depends_on: @@ -1192,7 +1192,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-opensuse-15 +name: py2-stable-2019-2-opensuse-15 platform: os: linux @@ -1203,7 +1203,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-opensuse-15 + target: py2-stable-2019-2-opensuse-15 privileged: true depends_on: @@ -1211,7 +1211,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-opensuse-42 +name: py2-git-2017-7-opensuse-42 platform: os: linux @@ -1222,7 +1222,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-opensuse-42 + target: py2-git-2017-7-opensuse-42 privileged: true depends_on: @@ -1230,7 +1230,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-opensuse-42 +name: py2-git-2018-3-opensuse-42 platform: os: linux @@ -1241,7 +1241,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-opensuse-42 + target: py2-git-2018-3-opensuse-42 privileged: true depends_on: @@ -1249,7 +1249,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-opensuse-42 +name: py2-git-2019-2-opensuse-42 platform: os: linux @@ -1260,7 +1260,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-opensuse-42 + target: py2-git-2019-2-opensuse-42 privileged: true depends_on: @@ -1287,7 +1287,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-opensuse-42 +name: py2-stable-2017-7-opensuse-42 platform: os: linux @@ -1298,7 +1298,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-opensuse-42 + target: py2-stable-2017-7-opensuse-42 privileged: true depends_on: @@ -1306,7 +1306,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-opensuse-42 +name: py2-stable-2018-3-opensuse-42 platform: os: linux @@ -1317,7 +1317,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-opensuse-42 + target: py2-stable-2018-3-opensuse-42 privileged: true depends_on: @@ -1325,7 +1325,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-opensuse-42 +name: py2-stable-2019-2-opensuse-42 platform: os: linux @@ -1336,7 +1336,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-opensuse-42 + target: py2-stable-2019-2-opensuse-42 privileged: true depends_on: @@ -1344,7 +1344,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-ubuntu-1404 +name: py2-git-2017-7-ubuntu-1404 platform: os: linux @@ -1355,7 +1355,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-ubuntu-1404 + target: py2-git-2017-7-ubuntu-1404 privileged: true depends_on: @@ -1363,7 +1363,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-ubuntu-1404 +name: py2-git-2018-3-ubuntu-1404 platform: os: linux @@ -1374,7 +1374,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-ubuntu-1404 + target: py2-git-2018-3-ubuntu-1404 privileged: true depends_on: @@ -1382,7 +1382,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-ubuntu-1404 +name: py2-git-2019-2-ubuntu-1404 platform: os: linux @@ -1393,7 +1393,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-ubuntu-1404 + target: py2-git-2019-2-ubuntu-1404 privileged: true depends_on: @@ -1420,7 +1420,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-ubuntu-1404 +name: py2-stable-2017-7-ubuntu-1404 platform: os: linux @@ -1431,7 +1431,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-ubuntu-1404 + target: py2-stable-2017-7-ubuntu-1404 privileged: true depends_on: @@ -1439,7 +1439,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-ubuntu-1404 +name: py2-stable-2018-3-ubuntu-1404 platform: os: linux @@ -1450,7 +1450,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-ubuntu-1404 + target: py2-stable-2018-3-ubuntu-1404 privileged: true depends_on: @@ -1458,7 +1458,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-ubuntu-1404 +name: py2-stable-2019-2-ubuntu-1404 platform: os: linux @@ -1469,7 +1469,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-ubuntu-1404 + target: py2-stable-2019-2-ubuntu-1404 privileged: true depends_on: @@ -1477,7 +1477,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-ubuntu-1604 +name: py2-git-2017-7-ubuntu-1604 platform: os: linux @@ -1488,7 +1488,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-ubuntu-1604 + target: py2-git-2017-7-ubuntu-1604 privileged: true depends_on: @@ -1496,7 +1496,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-ubuntu-1604 +name: py2-git-2018-3-ubuntu-1604 platform: os: linux @@ -1507,7 +1507,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-ubuntu-1604 + target: py2-git-2018-3-ubuntu-1604 privileged: true depends_on: @@ -1515,7 +1515,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-ubuntu-1604 +name: py2-git-2019-2-ubuntu-1604 platform: os: linux @@ -1526,7 +1526,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-ubuntu-1604 + target: py2-git-2019-2-ubuntu-1604 privileged: true depends_on: @@ -1553,7 +1553,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-ubuntu-1604 +name: py2-stable-2017-7-ubuntu-1604 platform: os: linux @@ -1564,7 +1564,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-ubuntu-1604 + target: py2-stable-2017-7-ubuntu-1604 privileged: true depends_on: @@ -1572,7 +1572,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-ubuntu-1604 +name: py2-stable-2018-3-ubuntu-1604 platform: os: linux @@ -1583,7 +1583,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-ubuntu-1604 + target: py2-stable-2018-3-ubuntu-1604 privileged: true depends_on: @@ -1591,7 +1591,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-ubuntu-1604 +name: py2-stable-2019-2-ubuntu-1604 platform: os: linux @@ -1602,7 +1602,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-ubuntu-1604 + target: py2-stable-2019-2-ubuntu-1604 privileged: true depends_on: @@ -1610,7 +1610,7 @@ depends_on: --- kind: pipeline -name: py2-git-2017.7-ubuntu-1804 +name: py2-git-2017-7-ubuntu-1804 platform: os: linux @@ -1621,7 +1621,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017.7-ubuntu-1804 + target: py2-git-2017-7-ubuntu-1804 privileged: true depends_on: @@ -1629,7 +1629,7 @@ depends_on: --- kind: pipeline -name: py2-git-2018.3-ubuntu-1804 +name: py2-git-2018-3-ubuntu-1804 platform: os: linux @@ -1640,7 +1640,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018.3-ubuntu-1804 + target: py2-git-2018-3-ubuntu-1804 privileged: true depends_on: @@ -1648,7 +1648,7 @@ depends_on: --- kind: pipeline -name: py2-git-2019.2-ubuntu-1804 +name: py2-git-2019-2-ubuntu-1804 platform: os: linux @@ -1659,7 +1659,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019.2-ubuntu-1804 + target: py2-git-2019-2-ubuntu-1804 privileged: true depends_on: @@ -1686,7 +1686,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2017.7-ubuntu-1804 +name: py2-stable-2017-7-ubuntu-1804 platform: os: linux @@ -1697,7 +1697,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2017.7-ubuntu-1804 + target: py2-stable-2017-7-ubuntu-1804 privileged: true depends_on: @@ -1705,7 +1705,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2018.3-ubuntu-1804 +name: py2-stable-2018-3-ubuntu-1804 platform: os: linux @@ -1716,7 +1716,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2018.3-ubuntu-1804 + target: py2-stable-2018-3-ubuntu-1804 privileged: true depends_on: @@ -1724,7 +1724,7 @@ depends_on: --- kind: pipeline -name: py2-stable-2019.2-ubuntu-1804 +name: py2-stable-2019-2-ubuntu-1804 platform: os: linux @@ -1735,7 +1735,7 @@ steps: image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-stable-2019.2-ubuntu-1804 + target: py2-stable-2019-2-ubuntu-1804 privileged: true depends_on: @@ -1743,6 +1743,6 @@ depends_on: --- kind: signature -hmac: ea705e5194cc7bc20d8022398adcb86a218e78b50fc630e924569b0cb8a80c30 +hmac: 46202f72731770191f9a5d808cb5b739622a68251a07c4be552a95ddfd68cd8e ... diff --git a/.kitchen.yml b/.kitchen.yml index f42bd6c..0c500d1 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -97,37 +97,30 @@ platforms: - systemctl enable sshd.service suites: - - name: py2-git-2017.7 + - name: py2-git-2017-7 provisioner: salt_version: 2017.7 - excludes: - - arch - - name: py2-git-2018.3 + - name: py2-git-2018-3 provisioner: salt_version: 2018.3 - - name: py2-git-2019.2 + - name: py2-git-2019-2 provisioner: salt_version: 2019.2 - name: py2-git-develop provisioner: salt_version: develop - - name: py2-stable-2017.7 + - name: py2-stable-2017-7 provisioner: salt_version: 2017.7 salt_bootstrap_options: -MP stable %s - excludes: - - arch - - centos-6 - - fedora-28 - - fedora-29 - - opensuse-15 - - opensuse-42 - - name: py2-stable-2018.3 + - name: py2-stable-2018-3 provisioner: salt_version: 2018.3 - salt_bootstrap_options: -MP stable - excludes: - - centos-6 + salt_bootstrap_options: -MP stable %s + - name: py2-stable-2019-2 + provisioner: + salt_version: 2019.2 + salt_bootstrap_options: -MP stable %s verifier: name: shell From 2ee3ab17d6ffc7bfd5127a108ad781c01e7d0da8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 13:58:12 +0100 Subject: [PATCH 29/84] Fix stable exclusions --- .drone.jsonnet | 55 +- .drone.yml | 1332 +++++++++++++++++++++++++++++++++++++++++++++++- .kitchen.yml | 21 + 3 files changed, 1388 insertions(+), 20 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 6a3e6ce..6f75128 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -8,20 +8,33 @@ local suites = [ 'py2-stable-2019-2', ]; -local distros = [ - { name: 'amazon', version: '1' }, - { name: 'amazon', version: '2' }, - { name: 'centos', version: '6' }, - { name: 'centos', version: '7' }, - { name: 'debian', version: '8' }, - { name: 'debian', version: '9' }, - { name: 'fedora', version: '28' }, - { name: 'fedora', version: '29' }, - { name: 'opensuse', version: '15' }, - { name: 'opensuse', version: '42' }, - { name: 'ubuntu', version: '1404' }, - { name: 'ubuntu', version: '1604' }, - { name: 'ubuntu', version: '1804' }, +local git_distros = [ + 'arch', + 'amazon-1', + 'amazon-2', + 'centos-6', + 'centos-7', + 'debian-8', + 'debian-9', + 'fedora-28', + 'fedora-29', + 'opensuse-15', + 'opensuse-42', + 'ubuntu-1404', + 'ubuntu-1604', + 'ubuntu-1804', +]; + +local stable_distros = [ + 'amazon-1', + 'amazon-2', + 'centos-6', + 'centos-7', + 'debian-8', + 'debian-9', + 'ubuntu-1404', + 'ubuntu-1604', + 'ubuntu-1804', ]; local Shellcheck() = { @@ -39,9 +52,9 @@ local Shellcheck() = { ], }; -local Build(suite, os, os_version) = { +local Build(suite, distro) = { kind: 'pipeline', - name: std.format('%s-%s-%s', [suite, os, os_version]), + name: std.format('%s-%s', [suite, distro]), steps: [ { @@ -49,7 +62,7 @@ local Build(suite, os, os_version) = { privileged: true, image: 'saltstack/drone-plugin-kitchen', settings: { - target: std.format('%s-%s-%s', [suite, os, os_version]), + target: std.format('%s-%s', [suite, distro]), requirements: 'tests/requirements.txt', }, }, @@ -63,7 +76,11 @@ local Build(suite, os, os_version) = { [ Shellcheck(), ] + [ - Build(suite, distro.name, distro.version) - for distro in distros + Build(suite, distro) + for distro in stable_distros + for suite in suites +] + [ + Build(suite, distro) + for distro in git_distros for suite in suites ] diff --git a/.drone.yml b/.drone.yml index 3625bcd..6fdb040 100644 --- a/.drone.yml +++ b/.drone.yml @@ -810,6 +810,1336 @@ steps: depends_on: - run-shellcheck +--- +kind: pipeline +name: py2-git-2017-7-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-develop-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-develop-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2017-7-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-debian-9 + privileged: true + +depends_on: +- run-shellcheck + --- kind: pipeline name: py2-git-2017-7-fedora-28 @@ -1743,6 +3073,6 @@ depends_on: --- kind: signature -hmac: 46202f72731770191f9a5d808cb5b739622a68251a07c4be552a95ddfd68cd8e +hmac: 4747c28ac6976a7f26a00f11fa96efb8e3e070d5029d1637a3bdf62bf3117141 ... diff --git a/.kitchen.yml b/.kitchen.yml index 0c500d1..8e30d77 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -113,14 +113,35 @@ suites: provisioner: salt_version: 2017.7 salt_bootstrap_options: -MP stable %s + excludes: + - arch + - fedora-28 + - fedora-29 + - opensuse-15 + - opensuse-42 + - ubuntu-1404 - name: py2-stable-2018-3 provisioner: salt_version: 2018.3 salt_bootstrap_options: -MP stable %s + excludes: + - arch + - fedora-28 + - fedora-29 + - opensuse-15 + - opensuse-42 + - ubuntu-1404 - name: py2-stable-2019-2 provisioner: salt_version: 2019.2 salt_bootstrap_options: -MP stable %s + excludes: + - arch + - fedora-28 + - fedora-29 + - opensuse-15 + - opensuse-42 + - ubuntu-1404 verifier: name: shell From e07f005865d4a514a08ac2b01b72e55c4e10f9b1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 14:03:16 +0100 Subject: [PATCH 30/84] Don't duplicate --- .drone.jsonnet | 9 +- .drone.yml | 1484 +----------------------------------------------- 2 files changed, 7 insertions(+), 1486 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 6f75128..15c9b4e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,8 +1,11 @@ -local suites = [ +local git_suites = [ 'py2-git-2017-7', 'py2-git-2018-3', 'py2-git-2019-2', 'py2-git-develop', +]; + +local stable_suites = [ 'py2-stable-2017-7', 'py2-stable-2018-3', 'py2-stable-2019-2', @@ -78,9 +81,9 @@ local Build(suite, distro) = { ] + [ Build(suite, distro) for distro in stable_distros - for suite in suites + for suite in stable_suites ] + [ Build(suite, distro) for distro in git_distros - for suite in suites + for suite in git_suites ] diff --git a/.drone.yml b/.drone.yml index 6fdb040..9f18aa8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,82 +12,6 @@ steps: commands: - shellcheck -s sh -f checkstyle bootstrap-salt.sh ---- -kind: pipeline -name: py2-git-2017-7-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-amazon-1 @@ -145,82 +69,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-amazon-2 @@ -278,82 +126,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-centos-6 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-centos-6 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-centos-6 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-centos-6 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-centos-6 @@ -411,82 +183,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-centos-7 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-centos-7 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-centos-7 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-centos-7 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-centos-7 @@ -544,82 +240,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-debian-8 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-debian-8 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-debian-8 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-debian-8 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-debian-8 @@ -677,82 +297,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-debian-9 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-debian-9 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-debian-9 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-debian-9 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-debian-9 @@ -810,82 +354,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-ubuntu-1404 @@ -943,82 +411,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-ubuntu-1604 @@ -1076,82 +468,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-2017-7-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-develop-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-stable-2017-7-ubuntu-1804 @@ -1285,63 +601,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-arch - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-arch - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-arch - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-amazon-1 @@ -1418,63 +677,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-amazon-2 @@ -1551,63 +753,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-centos-6 @@ -1684,63 +829,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-6 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-6 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-6 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-centos-7 @@ -1817,63 +905,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-7 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-7 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-7 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-debian-8 @@ -1950,63 +981,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-8 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-8 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-8 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-debian-9 @@ -2083,63 +1057,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-9 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-9 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-9 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-fedora-28 @@ -2216,63 +1133,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-fedora-28 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-fedora-28 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-fedora-28 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-fedora-29 @@ -2349,63 +1209,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-fedora-29 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-fedora-29 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-fedora-29 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-opensuse-15 @@ -2482,63 +1285,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-opensuse-15 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-opensuse-15 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-opensuse-15 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-opensuse-42 @@ -2615,63 +1361,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-opensuse-42 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-opensuse-42 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-opensuse-42 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-ubuntu-1404 @@ -2748,63 +1437,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-ubuntu-1604 @@ -2881,63 +1513,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-ubuntu-1804 @@ -3014,65 +1589,8 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-stable-2017-7-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - --- kind: signature -hmac: 4747c28ac6976a7f26a00f11fa96efb8e3e070d5029d1637a3bdf62bf3117141 +hmac: 2d994326935f65cd989495a029521d668a48458529aa808cf428bce6754cdeee ... From 5a054e041e2b459b124decdb225c36911523ee2e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 14:10:45 +0100 Subject: [PATCH 31/84] Don't test against Salt's develop branch. Stability is not assured. --- .drone.jsonnet | 2 +- .drone.yml | 268 +------------------------------------------------ .kitchen.yml | 3 - 3 files changed, 2 insertions(+), 271 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 15c9b4e..de8106a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -2,7 +2,7 @@ local git_suites = [ 'py2-git-2017-7', 'py2-git-2018-3', 'py2-git-2019-2', - 'py2-git-develop', + // 'py2-git-develop', // Don't test against Salt's develop branch. Stability is not assured. ]; local stable_suites = [ diff --git a/.drone.yml b/.drone.yml index 9f18aa8..1ab7eac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -582,25 +582,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-arch - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-amazon-1 @@ -658,25 +639,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-amazon-2 @@ -734,25 +696,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-centos-6 @@ -810,25 +753,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-centos-6 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-centos-7 @@ -886,25 +810,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-centos-7 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-debian-8 @@ -962,25 +867,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-debian-8 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-debian-9 @@ -1038,25 +924,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-debian-9 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-fedora-28 @@ -1114,25 +981,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-fedora-28 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-fedora-29 @@ -1190,25 +1038,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-fedora-29 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-opensuse-15 @@ -1266,25 +1095,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-opensuse-15 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-opensuse-42 @@ -1342,25 +1152,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-opensuse-42 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-ubuntu-1404 @@ -1418,25 +1209,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-ubuntu-1604 @@ -1494,25 +1266,6 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - --- kind: pipeline name: py2-git-2017-7-ubuntu-1804 @@ -1570,27 +1323,8 @@ steps: depends_on: - run-shellcheck ---- -kind: pipeline -name: py2-git-develop-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: build - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-develop-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - --- kind: signature -hmac: 2d994326935f65cd989495a029521d668a48458529aa808cf428bce6754cdeee +hmac: d5884d09e97fe99082b4ff515d890e9423b377d1f6f22a70cfc88673cf82c711 ... diff --git a/.kitchen.yml b/.kitchen.yml index 8e30d77..411dbd4 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -106,9 +106,6 @@ suites: - name: py2-git-2019-2 provisioner: salt_version: 2019.2 - - name: py2-git-develop - provisioner: - salt_version: develop - name: py2-stable-2017-7 provisioner: salt_version: 2017.7 From 9889a6f1b29c9ec704873b49b8986905a9f6b91e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 14:15:34 +0100 Subject: [PATCH 32/84] Make sure Opensuse LEAP 15 runs salt under python 2 --- .kitchen.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.kitchen.yml b/.kitchen.yml index 411dbd4..d099b21 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -89,6 +89,8 @@ platforms: run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service + provisioner: + salt_bootstrap_options: -MPfq -y -x python2 git %s - name: opensuse-42 driver_config: image: opensuse/leap:42.3 From 0c599e717d5a34ce20a6eb0317d8d17667d5978a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 15:29:37 +0100 Subject: [PATCH 33/84] Remove unused imports --- tests/conftest.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 3fc60e5..6dadeb5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,7 +1,5 @@ -import functools import os import pytest -import subprocess import testinfra if os.environ.get('KITCHEN_USERNAME') == 'vagrant': From 6bd9a4268f943aba1ced970c7a7793b9baced3fb Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 15:54:44 +0100 Subject: [PATCH 34/84] Throttle builds --- .drone.jsonnet | 7 + .drone.yml | 347 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 353 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index de8106a..deede67 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -60,6 +60,13 @@ local Build(suite, distro) = { name: std.format('%s-%s', [suite, distro]), steps: [ + { + name: 'throttle build', + image: 'alpine', + commands: [ + "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'", + ], + }, { name: 'build', privileged: true, diff --git a/.drone.yml b/.drone.yml index 1ab7eac..6b607a3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -40,6 +45,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -59,6 +69,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -78,6 +93,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -97,6 +117,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -116,6 +141,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -135,6 +165,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -154,6 +189,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -173,6 +213,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -192,6 +237,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -211,6 +261,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -230,6 +285,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -249,6 +309,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -268,6 +333,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -287,6 +357,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -306,6 +381,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -325,6 +405,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -344,6 +429,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -363,6 +453,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -382,6 +477,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -401,6 +501,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -420,6 +525,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -439,6 +549,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -458,6 +573,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -477,6 +597,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -496,6 +621,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -515,6 +645,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -534,6 +669,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -553,6 +693,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -572,6 +717,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -591,6 +741,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -610,6 +765,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -629,6 +789,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -648,6 +813,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -667,6 +837,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -686,6 +861,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -705,6 +885,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -724,6 +909,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -743,6 +933,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -762,6 +957,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -781,6 +981,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -800,6 +1005,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -819,6 +1029,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -838,6 +1053,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -857,6 +1077,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -876,6 +1101,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -895,6 +1125,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -914,6 +1149,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -933,6 +1173,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -952,6 +1197,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -971,6 +1221,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -990,6 +1245,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1009,6 +1269,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1028,6 +1293,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1047,6 +1317,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1066,6 +1341,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1085,6 +1365,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1104,6 +1389,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1123,6 +1413,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1142,6 +1437,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1161,6 +1461,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1180,6 +1485,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1199,6 +1509,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1218,6 +1533,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1237,6 +1557,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1256,6 +1581,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1275,6 +1605,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1294,6 +1629,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1313,6 +1653,11 @@ platform: arch: amd64 steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: build image: saltstack/drone-plugin-kitchen settings: @@ -1325,6 +1670,6 @@ depends_on: --- kind: signature -hmac: d5884d09e97fe99082b4ff515d890e9423b377d1f6f22a70cfc88673cf82c711 +hmac: cbf4ad0b023bb3b5b9ac8948bbde836956289da44e5d76044cf760592abceb5c ... From 74513625f015e06870fe6f3833e5c49b784e394d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 16:19:16 +0100 Subject: [PATCH 35/84] Force a delay before accepting the key --- tests/accept_key.sls | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/accept_key.sls b/tests/accept_key.sls index 35b5397..c297d01 100644 --- a/tests/accept_key.sls +++ b/tests/accept_key.sls @@ -1,4 +1,12 @@ +delay: + module.run: + - name: test.sleep + - kargs: + length: 5 + accept_minion_key: salt.wheel: - name: key.accept - match: salt + - require: + - delay From b651fab20ebe981ff2e118f2dbbc41c577be20c5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 17:14:24 +0100 Subject: [PATCH 36/84] Fix Archlinux container image reference --- .kitchen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kitchen.yml b/.kitchen.yml index d099b21..3d7d281 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -78,7 +78,7 @@ platforms: run_command: /lib/systemd/systemd - name: arch driver_config: - image: base/archlinux + image: archlinux/base run_command: /usr/lib/systemd/systemd provision_command: - pacman -Syu --noconfirm systemd From 3fa79a7018ba80c08a1cc7d298967b50bd373d3f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 17:15:43 +0100 Subject: [PATCH 37/84] Suites in steps --- .drone.jsonnet | 22 +- .drone.yml | 1083 +++++------------------------------------------- 2 files changed, 100 insertions(+), 1005 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index deede67..69ab6e7 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -55,27 +55,21 @@ local Shellcheck() = { ], }; -local Build(suite, distro) = { +local Build(suites, distro) = { kind: 'pipeline', - name: std.format('%s-%s', [suite, distro]), + name: distro, steps: [ { - name: 'throttle build', - image: 'alpine', - commands: [ - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'", - ], - }, - { - name: 'build', + name: suite, privileged: true, image: 'saltstack/drone-plugin-kitchen', settings: { target: std.format('%s-%s', [suite, distro]), requirements: 'tests/requirements.txt', }, - }, + } + for suite in suites ], depends_on: [ 'run-shellcheck', @@ -86,11 +80,9 @@ local Build(suite, distro) = { [ Shellcheck(), ] + [ - Build(suite, distro) + Build(stable_suites, distro) for distro in stable_distros - for suite in stable_suites ] + [ - Build(suite, distro) + Build(git_suites, distro) for distro in git_distros - for suite in git_suites ] diff --git a/.drone.yml b/.drone.yml index 6b607a3..106feb0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,67 +14,28 @@ steps: --- kind: pipeline -name: py2-stable-2017-7-amazon-1 +name: amazon-1 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-amazon-1 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-amazon-1 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -86,67 +47,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-amazon-2 +name: amazon-2 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-amazon-2 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-amazon-2 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -158,67 +80,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-centos-6 +name: centos-6 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-centos-6 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-centos-6 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -230,67 +113,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-centos-7 +name: centos-7 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-centos-7 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-centos-7 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -302,67 +146,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-debian-8 +name: debian-8 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-debian-8 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-debian-8 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -374,67 +179,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-debian-9 +name: debian-9 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-debian-9 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-debian-9 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -446,67 +212,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-ubuntu-1404 +name: ubuntu-1404 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1404 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1404 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -518,67 +245,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-ubuntu-1604 +name: ubuntu-1604 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1604 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1604 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -590,67 +278,28 @@ depends_on: --- kind: pipeline -name: py2-stable-2017-7-ubuntu-1804 +name: ubuntu-1804 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1804 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1804 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -662,67 +311,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-arch +name: arch platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-arch privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-arch privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -734,67 +344,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-amazon-1 +name: amazon-1 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-amazon-1 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-amazon-1 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -806,67 +377,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-amazon-2 +name: amazon-2 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-amazon-2 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-amazon-2 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -878,67 +410,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-centos-6 +name: centos-6 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-centos-6 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-centos-6 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -950,67 +443,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-centos-7 +name: centos-7 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-centos-7 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-centos-7 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1022,67 +476,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-debian-8 +name: debian-8 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-debian-8 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-debian-8 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1094,67 +509,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-debian-9 +name: debian-9 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-debian-9 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-debian-9 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1166,67 +542,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-fedora-28 +name: fedora-28 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-fedora-28 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-fedora-28 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1238,67 +575,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-fedora-29 +name: fedora-29 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-fedora-29 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-fedora-29 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1310,67 +608,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-opensuse-15 +name: opensuse-15 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-opensuse-15 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-opensuse-15 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1382,67 +641,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-opensuse-42 +name: opensuse-42 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-opensuse-42 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-opensuse-42 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1454,67 +674,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-ubuntu-1404 +name: ubuntu-1404 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-ubuntu-1404 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-ubuntu-1404 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1526,67 +707,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-ubuntu-1604 +name: ubuntu-1604 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-ubuntu-1604 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-ubuntu-1604 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1598,67 +740,28 @@ depends_on: --- kind: pipeline -name: py2-git-2017-7-ubuntu-1804 +name: ubuntu-1804 platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-ubuntu-1804 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-ubuntu-1804 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -1670,6 +773,6 @@ depends_on: --- kind: signature -hmac: cbf4ad0b023bb3b5b9ac8948bbde836956289da44e5d76044cf760592abceb5c +hmac: ca872081b4dcfabcea903fccf1f868703c8535221d547ba30fbfa891adb1a78f ... From 0dcc8d6cd8b607b89e48f78dcabcc723b69b7550 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 17:21:30 +0100 Subject: [PATCH 38/84] Group per distro --- .drone.jsonnet | 9 +- .drone.yml | 623 ++++++++++++++----------------------------------- 2 files changed, 178 insertions(+), 454 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 69ab6e7..8245a7b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -55,7 +55,7 @@ local Shellcheck() = { ], }; -local Build(suites, distro) = { +local Build(distro) = { kind: 'pipeline', name: distro, @@ -69,7 +69,7 @@ local Build(suites, distro) = { requirements: 'tests/requirements.txt', }, } - for suite in suites + for suite in git_suites + stable_suites ], depends_on: [ 'run-shellcheck', @@ -80,9 +80,6 @@ local Build(suites, distro) = { [ Shellcheck(), ] + [ - Build(stable_suites, distro) + Build(distro) for distro in stable_distros -] + [ - Build(git_suites, distro) - for distro in git_distros ] diff --git a/.drone.yml b/.drone.yml index 106feb0..e63b2a0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,336 +16,6 @@ steps: kind: pipeline name: amazon-1 -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-1 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-1 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-1 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-2 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-2 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-2 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-6 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-6 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-6 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-7 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-7 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-7 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-8 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-8 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-8 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-9 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-9 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-9 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1404 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1404 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1404 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1604 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1604 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1604 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1804 - privileged: true - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1804 - privileged: true - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1804 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: arch - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-arch - privileged: true - -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-arch - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-arch - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: amazon-1 - platform: os: linux arch: amd64 @@ -372,6 +42,27 @@ steps: target: py2-git-2019-2-amazon-1 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-amazon-1 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-amazon-1 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-amazon-1 + privileged: true + depends_on: - run-shellcheck @@ -405,6 +96,27 @@ steps: target: py2-git-2019-2-amazon-2 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-amazon-2 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-amazon-2 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-amazon-2 + privileged: true + depends_on: - run-shellcheck @@ -438,6 +150,27 @@ steps: target: py2-git-2019-2-centos-6 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-centos-6 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-centos-6 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-centos-6 + privileged: true + depends_on: - run-shellcheck @@ -471,6 +204,27 @@ steps: target: py2-git-2019-2-centos-7 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-centos-7 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-centos-7 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-centos-7 + privileged: true + depends_on: - run-shellcheck @@ -504,6 +258,27 @@ steps: target: py2-git-2019-2-debian-8 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-debian-8 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-debian-8 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-debian-8 + privileged: true + depends_on: - run-shellcheck @@ -537,136 +312,25 @@ steps: target: py2-git-2019-2-debian-9 privileged: true -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-git-2017-7 +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2017-7-fedora-28 + target: py2-stable-2017-7-debian-9 privileged: true -- name: py2-git-2018-3 +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2018-3-fedora-28 + target: py2-stable-2018-3-debian-9 privileged: true -- name: py2-git-2019-2 +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt - target: py2-git-2019-2-fedora-28 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-fedora-29 - privileged: true - -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-fedora-29 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-fedora-29 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-opensuse-15 - privileged: true - -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-opensuse-15 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-opensuse-15 - privileged: true - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-opensuse-42 - privileged: true - -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-opensuse-42 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-opensuse-42 + target: py2-stable-2019-2-debian-9 privileged: true depends_on: @@ -702,6 +366,27 @@ steps: target: py2-git-2019-2-ubuntu-1404 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1404 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1404 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1404 + privileged: true + depends_on: - run-shellcheck @@ -735,6 +420,27 @@ steps: target: py2-git-2019-2-ubuntu-1604 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1604 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1604 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1604 + privileged: true + depends_on: - run-shellcheck @@ -768,11 +474,32 @@ steps: target: py2-git-2019-2-ubuntu-1804 privileged: true +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1804 + privileged: true + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1804 + privileged: true + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1804 + privileged: true + depends_on: - run-shellcheck --- kind: signature -hmac: ca872081b4dcfabcea903fccf1f868703c8535221d547ba30fbfa891adb1a78f +hmac: 60adccc3d06f3365e7b31d5f5b478259c7da7d3471c32bb7e559286840bfcd38 ... From a574c7fc001cfea4b2de347862b2e53842ecde03 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 17:27:11 +0100 Subject: [PATCH 39/84] Back to parallel runs --- .drone.jsonnet | 23 +- .drone.yml | 1604 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 1404 insertions(+), 223 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 8245a7b..deede67 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -55,21 +55,27 @@ local Shellcheck() = { ], }; -local Build(distro) = { +local Build(suite, distro) = { kind: 'pipeline', - name: distro, + name: std.format('%s-%s', [suite, distro]), steps: [ { - name: suite, + name: 'throttle build', + image: 'alpine', + commands: [ + "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'", + ], + }, + { + name: 'build', privileged: true, image: 'saltstack/drone-plugin-kitchen', settings: { target: std.format('%s-%s', [suite, distro]), requirements: 'tests/requirements.txt', }, - } - for suite in git_suites + stable_suites + }, ], depends_on: [ 'run-shellcheck', @@ -80,6 +86,11 @@ local Build(distro) = { [ Shellcheck(), ] + [ - Build(distro) + Build(suite, distro) for distro in stable_distros + for suite in stable_suites +] + [ + Build(suite, distro) + for distro in git_distros + for suite in git_suites ] diff --git a/.drone.yml b/.drone.yml index e63b2a0..6b607a3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,49 +14,67 @@ steps: --- kind: pipeline -name: amazon-1 +name: py2-stable-2017-7-amazon-1 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-amazon-1 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-amazon-1 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-amazon-1 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-amazon-1 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-amazon-1 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -68,49 +86,67 @@ depends_on: --- kind: pipeline -name: amazon-2 +name: py2-stable-2017-7-amazon-2 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-amazon-2 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-amazon-2 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-amazon-2 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-amazon-2 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-amazon-2 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -122,49 +158,67 @@ depends_on: --- kind: pipeline -name: centos-6 +name: py2-stable-2017-7-centos-6 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-centos-6 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-centos-6 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-centos-6 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-centos-6 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-centos-6 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -176,49 +230,67 @@ depends_on: --- kind: pipeline -name: centos-7 +name: py2-stable-2017-7-centos-7 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-centos-7 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-centos-7 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-centos-7 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-centos-7 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-centos-7 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -230,49 +302,67 @@ depends_on: --- kind: pipeline -name: debian-8 +name: py2-stable-2017-7-debian-8 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-debian-8 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-debian-8 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-debian-8 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-debian-8 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-debian-8 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -284,49 +374,67 @@ depends_on: --- kind: pipeline -name: debian-9 +name: py2-stable-2017-7-debian-9 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-debian-9 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-debian-9 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-debian-9 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-debian-9 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-debian-9 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -338,49 +446,67 @@ depends_on: --- kind: pipeline -name: ubuntu-1404 +name: py2-stable-2017-7-ubuntu-1404 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1404 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1404 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1404 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1404 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1404 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -392,49 +518,67 @@ depends_on: --- kind: pipeline -name: ubuntu-1604 +name: py2-stable-2017-7-ubuntu-1604 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1604 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1604 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1604 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1604 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1604 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -446,49 +590,67 @@ depends_on: --- kind: pipeline -name: ubuntu-1804 +name: py2-stable-2017-7-ubuntu-1804 platform: os: linux arch: amd64 steps: -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1804 - privileged: true +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1804 - privileged: true - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1804 - privileged: true - -- name: py2-stable-2017-7 +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1804 privileged: true -- name: py2-stable-2018-3 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2018-3-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1804 privileged: true -- name: py2-stable-2019-2 +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-stable-2019-2-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -498,8 +660,1016 @@ steps: depends_on: - run-shellcheck +--- +kind: pipeline +name: py2-git-2017-7-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-arch + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-arch + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-amazon-1 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-amazon-1 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-amazon-2 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-amazon-2 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-centos-6 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-centos-6 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-centos-7 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-centos-7 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-debian-8 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-debian-8 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-debian-9 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-debian-9 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-fedora-28 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-fedora-28 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-fedora-29 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-fedora-29 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-opensuse-15 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-opensuse-15 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-opensuse-42 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-opensuse-42 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-ubuntu-1404 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-ubuntu-1404 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-ubuntu-1604 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-ubuntu-1604 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2017-7-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2018-3-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + +--- +kind: pipeline +name: py2-git-2019-2-ubuntu-1804 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + +- name: build + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-ubuntu-1804 + privileged: true + +depends_on: +- run-shellcheck + --- kind: signature -hmac: 60adccc3d06f3365e7b31d5f5b478259c7da7d3471c32bb7e559286840bfcd38 +hmac: cbf4ad0b023bb3b5b9ac8948bbde836956289da44e5d76044cf760592abceb5c ... From b52d2605aa668b6802bd5fba50c6183118d9540e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 17:36:29 +0100 Subject: [PATCH 40/84] Add missing default packages required to bootstrap Arch --- .kitchen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kitchen.yml b/.kitchen.yml index 3d7d281..9ce56ef 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -81,7 +81,7 @@ platforms: image: archlinux/base run_command: /usr/lib/systemd/systemd provision_command: - - pacman -Syu --noconfirm systemd + - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd - name: opensuse-15 driver_config: From 3c2d5649c2863192338635aa9210637009afca33 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 18:13:36 +0100 Subject: [PATCH 41/84] We're not testing key acceptance --- .kitchen.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 9ce56ef..fb072f4 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -20,10 +20,11 @@ provisioner: sudo: true require_chef: false formula: tests - state_top: - base: - '*': - - tests.accept_key + run_salt_call: false + init_environment: | + echo 'auto_accept: true' > /tmp/auto-accept-keys.conf + sudo mkdir -p /etc/salt/master.d + sudo mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf platforms: - name: fedora-28 From 8e43c41fbc0a66fba3e0a4d2cc95bc1448fab121 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 18:40:04 +0100 Subject: [PATCH 42/84] Different kind of grouping --- .drone.jsonnet | 25 +- .drone.yml | 1221 +++++++++--------------------------------------- 2 files changed, 241 insertions(+), 1005 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index deede67..4170094 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -55,27 +55,24 @@ local Shellcheck() = { ], }; -local Build(suite, distro) = { +local Build(distro, kind, suites) = { kind: 'pipeline', - name: std.format('%s-%s', [suite, distro]), + name: std.format('%s-%s', [distro, kind]), steps: [ { - name: 'throttle build', - image: 'alpine', - commands: [ - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'", - ], - }, - { - name: 'build', + name: suite, privileged: true, image: 'saltstack/drone-plugin-kitchen', + depends_on: [ + 'run-shellcheck', + ], settings: { target: std.format('%s-%s', [suite, distro]), requirements: 'tests/requirements.txt', }, - }, + } + for suite in suites ], depends_on: [ 'run-shellcheck', @@ -86,11 +83,9 @@ local Build(suite, distro) = { [ Shellcheck(), ] + [ - Build(suite, distro) + Build(distro, 'stable', stable_suites) for distro in stable_distros - for suite in stable_suites ] + [ - Build(suite, distro) + Build(distro, 'git', git_suites) for distro in git_distros - for suite in git_suites ] diff --git a/.drone.yml b/.drone.yml index 6b607a3..a119b36 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,1662 +14,903 @@ steps: --- kind: pipeline -name: py2-stable-2017-7-amazon-1 +name: amazon-1-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-amazon-1 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-amazon-1 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-amazon-1 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-amazon-2 +name: amazon-2-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-amazon-2 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-amazon-2 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-amazon-2 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-centos-6 +name: centos-6-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-centos-6 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-centos-6 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-centos-6 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-centos-7 +name: centos-7-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-centos-7 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-centos-7 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-centos-7 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-debian-8 +name: debian-8-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-debian-8 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-debian-8 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-debian-8 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-debian-9 +name: debian-9-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-debian-9 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-debian-9 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-debian-9 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-ubuntu-1404 +name: ubuntu-1404-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1404 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1404 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-ubuntu-1404 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-ubuntu-1604 +name: ubuntu-1604-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1604 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1604 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-ubuntu-1604 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-stable-2017-7-ubuntu-1804 +name: ubuntu-1804-stable platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2017-7-ubuntu-1804 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2018-3-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2018-3-ubuntu-1804 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-stable-2019-2-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-stable-2019-2-ubuntu-1804 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-arch +name: arch-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-arch privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-arch privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-arch - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-arch privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-amazon-1 +name: amazon-1-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-amazon-1 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-amazon-1 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-amazon-1 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-amazon-2 +name: amazon-2-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-amazon-2 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-amazon-2 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-amazon-2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-amazon-2 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-centos-6 +name: centos-6-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-centos-6 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-centos-6 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-centos-6 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-centos-6 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-centos-7 +name: centos-7-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-centos-7 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-centos-7 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-centos-7 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-centos-7 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-debian-8 +name: debian-8-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-debian-8 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-debian-8 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-debian-8 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-debian-8 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-debian-9 +name: debian-9-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-debian-9 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-debian-9 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-debian-9 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-debian-9 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-fedora-28 +name: fedora-28-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-fedora-28 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-fedora-28 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-fedora-28 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-fedora-28 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-fedora-29 +name: fedora-29-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-fedora-29 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-fedora-29 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-fedora-29 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-fedora-29 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-opensuse-15 +name: opensuse-15-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-opensuse-15 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-opensuse-15 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-opensuse-15 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-opensuse-15 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-opensuse-42 +name: opensuse-42-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-opensuse-42 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-opensuse-42 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-opensuse-42 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-opensuse-42 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-ubuntu-1404 +name: ubuntu-1404-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-ubuntu-1404 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-ubuntu-1404 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1404 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-ubuntu-1404 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-ubuntu-1604 +name: ubuntu-1604-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-ubuntu-1604 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-ubuntu-1604 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1604 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-ubuntu-1604 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: pipeline -name: py2-git-2017-7-ubuntu-1804 +name: ubuntu-1804-git platform: os: linux arch: amd64 steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2017-7-ubuntu-1804 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2018-3-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2018-3-ubuntu-1804 privileged: true + depends_on: + - run-shellcheck -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: py2-git-2019-2-ubuntu-1804 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: build +- name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt target: py2-git-2019-2-ubuntu-1804 privileged: true + depends_on: + - run-shellcheck depends_on: - run-shellcheck --- kind: signature -hmac: cbf4ad0b023bb3b5b9ac8948bbde836956289da44e5d76044cf760592abceb5c +hmac: 2b2b96a55b8714b616544143099c7b464390a3210604e63e77caab5f52179f0f ... From ad45bce7cf14b28aebe505d1ccdeb4c65cdb0dc1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 18:43:00 +0100 Subject: [PATCH 43/84] Depend on throttle? --- .drone.jsonnet | 10 +- .drone.yml | 255 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 194 insertions(+), 71 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 4170094..5fbad44 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -60,12 +60,20 @@ local Build(distro, kind, suites) = { name: std.format('%s-%s', [distro, kind]), steps: [ + { + name: 'throttle-build', + image: 'alpine', + commands: [ + "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'", + ], + }, + ] + [ { name: suite, privileged: true, image: 'saltstack/drone-plugin-kitchen', depends_on: [ - 'run-shellcheck', + 'throttle-build', ], settings: { target: std.format('%s-%s', [suite, distro]), diff --git a/.drone.yml b/.drone.yml index a119b36..909a44e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -28,7 +33,7 @@ steps: target: py2-stable-2017-7-amazon-1 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -37,7 +42,7 @@ steps: target: py2-stable-2018-3-amazon-1 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -46,7 +51,7 @@ steps: target: py2-stable-2019-2-amazon-1 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -60,6 +65,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -67,7 +77,7 @@ steps: target: py2-stable-2017-7-amazon-2 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -76,7 +86,7 @@ steps: target: py2-stable-2018-3-amazon-2 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -85,7 +95,7 @@ steps: target: py2-stable-2019-2-amazon-2 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -99,6 +109,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -106,7 +121,7 @@ steps: target: py2-stable-2017-7-centos-6 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -115,7 +130,7 @@ steps: target: py2-stable-2018-3-centos-6 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -124,7 +139,7 @@ steps: target: py2-stable-2019-2-centos-6 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -138,6 +153,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -145,7 +165,7 @@ steps: target: py2-stable-2017-7-centos-7 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -154,7 +174,7 @@ steps: target: py2-stable-2018-3-centos-7 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -163,7 +183,7 @@ steps: target: py2-stable-2019-2-centos-7 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -177,6 +197,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -184,7 +209,7 @@ steps: target: py2-stable-2017-7-debian-8 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -193,7 +218,7 @@ steps: target: py2-stable-2018-3-debian-8 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -202,7 +227,7 @@ steps: target: py2-stable-2019-2-debian-8 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -216,6 +241,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -223,7 +253,7 @@ steps: target: py2-stable-2017-7-debian-9 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -232,7 +262,7 @@ steps: target: py2-stable-2018-3-debian-9 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -241,7 +271,7 @@ steps: target: py2-stable-2019-2-debian-9 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -255,6 +285,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -262,7 +297,7 @@ steps: target: py2-stable-2017-7-ubuntu-1404 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -271,7 +306,7 @@ steps: target: py2-stable-2018-3-ubuntu-1404 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -280,7 +315,7 @@ steps: target: py2-stable-2019-2-ubuntu-1404 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -294,6 +329,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -301,7 +341,7 @@ steps: target: py2-stable-2017-7-ubuntu-1604 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -310,7 +350,7 @@ steps: target: py2-stable-2018-3-ubuntu-1604 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -319,7 +359,7 @@ steps: target: py2-stable-2019-2-ubuntu-1604 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -333,6 +373,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-stable-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -340,7 +385,7 @@ steps: target: py2-stable-2017-7-ubuntu-1804 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2018-3 image: saltstack/drone-plugin-kitchen @@ -349,7 +394,7 @@ steps: target: py2-stable-2018-3-ubuntu-1804 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-stable-2019-2 image: saltstack/drone-plugin-kitchen @@ -358,7 +403,7 @@ steps: target: py2-stable-2019-2-ubuntu-1804 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -372,6 +417,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -379,7 +429,7 @@ steps: target: py2-git-2017-7-arch privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -388,7 +438,7 @@ steps: target: py2-git-2018-3-arch privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -397,7 +447,7 @@ steps: target: py2-git-2019-2-arch privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -411,6 +461,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -418,7 +473,7 @@ steps: target: py2-git-2017-7-amazon-1 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -427,7 +482,7 @@ steps: target: py2-git-2018-3-amazon-1 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -436,7 +491,7 @@ steps: target: py2-git-2019-2-amazon-1 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -450,6 +505,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -457,7 +517,7 @@ steps: target: py2-git-2017-7-amazon-2 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -466,7 +526,7 @@ steps: target: py2-git-2018-3-amazon-2 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -475,7 +535,7 @@ steps: target: py2-git-2019-2-amazon-2 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -489,6 +549,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -496,7 +561,7 @@ steps: target: py2-git-2017-7-centos-6 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -505,7 +570,7 @@ steps: target: py2-git-2018-3-centos-6 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -514,7 +579,7 @@ steps: target: py2-git-2019-2-centos-6 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -528,6 +593,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -535,7 +605,7 @@ steps: target: py2-git-2017-7-centos-7 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -544,7 +614,7 @@ steps: target: py2-git-2018-3-centos-7 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -553,7 +623,7 @@ steps: target: py2-git-2019-2-centos-7 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -567,6 +637,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -574,7 +649,7 @@ steps: target: py2-git-2017-7-debian-8 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -583,7 +658,7 @@ steps: target: py2-git-2018-3-debian-8 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -592,7 +667,7 @@ steps: target: py2-git-2019-2-debian-8 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -606,6 +681,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -613,7 +693,7 @@ steps: target: py2-git-2017-7-debian-9 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -622,7 +702,7 @@ steps: target: py2-git-2018-3-debian-9 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -631,7 +711,7 @@ steps: target: py2-git-2019-2-debian-9 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -645,6 +725,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -652,7 +737,7 @@ steps: target: py2-git-2017-7-fedora-28 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -661,7 +746,7 @@ steps: target: py2-git-2018-3-fedora-28 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -670,7 +755,7 @@ steps: target: py2-git-2019-2-fedora-28 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -684,6 +769,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -691,7 +781,7 @@ steps: target: py2-git-2017-7-fedora-29 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -700,7 +790,7 @@ steps: target: py2-git-2018-3-fedora-29 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -709,7 +799,7 @@ steps: target: py2-git-2019-2-fedora-29 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -723,6 +813,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -730,7 +825,7 @@ steps: target: py2-git-2017-7-opensuse-15 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -739,7 +834,7 @@ steps: target: py2-git-2018-3-opensuse-15 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -748,7 +843,7 @@ steps: target: py2-git-2019-2-opensuse-15 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -762,6 +857,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -769,7 +869,7 @@ steps: target: py2-git-2017-7-opensuse-42 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -778,7 +878,7 @@ steps: target: py2-git-2018-3-opensuse-42 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -787,7 +887,7 @@ steps: target: py2-git-2019-2-opensuse-42 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -801,6 +901,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -808,7 +913,7 @@ steps: target: py2-git-2017-7-ubuntu-1404 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -817,7 +922,7 @@ steps: target: py2-git-2018-3-ubuntu-1404 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -826,7 +931,7 @@ steps: target: py2-git-2019-2-ubuntu-1404 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -840,6 +945,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -847,7 +957,7 @@ steps: target: py2-git-2017-7-ubuntu-1604 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -856,7 +966,7 @@ steps: target: py2-git-2018-3-ubuntu-1604 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -865,7 +975,7 @@ steps: target: py2-git-2019-2-ubuntu-1604 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck @@ -879,6 +989,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen settings: @@ -886,7 +1001,7 @@ steps: target: py2-git-2017-7-ubuntu-1804 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2018-3 image: saltstack/drone-plugin-kitchen @@ -895,7 +1010,7 @@ steps: target: py2-git-2018-3-ubuntu-1804 privileged: true depends_on: - - run-shellcheck + - throttle-build - name: py2-git-2019-2 image: saltstack/drone-plugin-kitchen @@ -904,13 +1019,13 @@ steps: target: py2-git-2019-2-ubuntu-1804 privileged: true depends_on: - - run-shellcheck + - throttle-build depends_on: - run-shellcheck --- kind: signature -hmac: 2b2b96a55b8714b616544143099c7b464390a3210604e63e77caab5f52179f0f +hmac: e138fa2dfd22d5535087e0b2efd99cf7a6f0d7ce717932963dd52ba13c2b798a ... From 0ac9bbe67592d2ac793867a5eafc1978954ece29 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 19:30:23 +0100 Subject: [PATCH 44/84] Yet another grouping alternative --- .drone.jsonnet | 12 +- .drone.yml | 669 +++++++++++++++++++------------------------------ 2 files changed, 264 insertions(+), 417 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 5fbad44..12579d6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -55,9 +55,12 @@ local Shellcheck() = { ], }; -local Build(distro, kind, suites) = { + +local Build(distro) = { kind: 'pipeline', - name: std.format('%s-%s', [distro, kind]), + name: distro, + + local suites = if std.count(stable_distros, distro) > 0 then git_suites + stable_suites else git_suites, steps: [ { @@ -91,9 +94,6 @@ local Build(distro, kind, suites) = { [ Shellcheck(), ] + [ - Build(distro, 'stable', stable_suites) - for distro in stable_distros -] + [ - Build(distro, 'git', git_suites) + Build(distro) for distro in git_distros ] diff --git a/.drone.yml b/.drone.yml index 909a44e..742e9fa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,403 +14,7 @@ steps: --- kind: pipeline -name: amazon-1-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-1 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-1 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-1 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: amazon-2-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-2 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-2 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-2 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: centos-6-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-6 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-6 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-6 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: centos-7-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-7 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-7 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-7 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: debian-8-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-8 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-8 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-8 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: debian-9-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-9 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-9 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-9 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: ubuntu-1404-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1404 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1404 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1404 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: ubuntu-1604-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1604 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1604 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1604 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: ubuntu-1804-stable - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1804 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1804 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1804 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: arch-git +name: arch platform: os: linux @@ -454,7 +58,7 @@ depends_on: --- kind: pipeline -name: amazon-1-git +name: amazon-1 platform: os: linux @@ -493,12 +97,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-amazon-1 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-amazon-1 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-amazon-1 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: amazon-2-git +name: amazon-2 platform: os: linux @@ -537,12 +168,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-amazon-2 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-amazon-2 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-amazon-2 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: centos-6-git +name: centos-6 platform: os: linux @@ -581,12 +239,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-centos-6 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-centos-6 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-centos-6 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: centos-7-git +name: centos-7 platform: os: linux @@ -625,12 +310,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-centos-7 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-centos-7 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-centos-7 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: debian-8-git +name: debian-8 platform: os: linux @@ -669,12 +381,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-debian-8 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-debian-8 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-debian-8 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: debian-9-git +name: debian-9 platform: os: linux @@ -713,12 +452,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-debian-9 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-debian-9 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-debian-9 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: fedora-28-git +name: fedora-28 platform: os: linux @@ -762,7 +528,7 @@ depends_on: --- kind: pipeline -name: fedora-29-git +name: fedora-29 platform: os: linux @@ -806,7 +572,7 @@ depends_on: --- kind: pipeline -name: opensuse-15-git +name: opensuse-15 platform: os: linux @@ -850,7 +616,7 @@ depends_on: --- kind: pipeline -name: opensuse-42-git +name: opensuse-42 platform: os: linux @@ -894,7 +660,7 @@ depends_on: --- kind: pipeline -name: ubuntu-1404-git +name: ubuntu-1404 platform: os: linux @@ -933,12 +699,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1404 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1404 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1404 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: ubuntu-1604-git +name: ubuntu-1604 platform: os: linux @@ -977,12 +770,39 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1604 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1604 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1604 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: pipeline -name: ubuntu-1804-git +name: ubuntu-1804 platform: os: linux @@ -1021,11 +841,38 @@ steps: depends_on: - throttle-build +- name: py2-stable-2017-7 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-ubuntu-1804 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2018-3 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-ubuntu-1804 + privileged: true + depends_on: + - throttle-build + +- name: py2-stable-2019-2 + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-ubuntu-1804 + privileged: true + depends_on: + - throttle-build + depends_on: - run-shellcheck --- kind: signature -hmac: e138fa2dfd22d5535087e0b2efd99cf7a6f0d7ce717932963dd52ba13c2b798a +hmac: ec677bfb06e994529362dc0d6eb5c4b057329871a0d2c7c3cc8c481b6eacf08d ... From f42eec54e66c8f1356362c00159dae8109639fe8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 6 Apr 2019 20:13:44 +0100 Subject: [PATCH 45/84] Increase throttle range --- .drone.jsonnet | 6 +++--- .drone.yml | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 12579d6..3fc144b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -11,7 +11,7 @@ local stable_suites = [ 'py2-stable-2019-2', ]; -local git_distros = [ +local distros = [ 'arch', 'amazon-1', 'amazon-2', @@ -67,7 +67,7 @@ local Build(distro) = { name: 'throttle-build', image: 'alpine', commands: [ - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'", + "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'", ], }, ] + [ @@ -95,5 +95,5 @@ local Build(distro) = { Shellcheck(), ] + [ Build(distro) - for distro in git_distros + for distro in distros ] diff --git a/.drone.yml b/.drone.yml index 742e9fa..0981ab1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -68,7 +68,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -139,7 +139,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -210,7 +210,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -281,7 +281,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -352,7 +352,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -423,7 +423,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -494,7 +494,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -538,7 +538,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -582,7 +582,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -626,7 +626,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -670,7 +670,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -741,7 +741,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -812,7 +812,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 1-20 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - name: py2-git-2017-7 image: saltstack/drone-plugin-kitchen @@ -873,6 +873,6 @@ depends_on: --- kind: signature -hmac: ec677bfb06e994529362dc0d6eb5c4b057329871a0d2c7c3cc8c481b6eacf08d +hmac: ce7fc9d04548b5160a561da165fa1b3c97697d5fd882fafe64eaafac423b61f0 ... From 160a7cf52f0b93f01a2a5062117413fb30856f2c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 08:48:54 +0100 Subject: [PATCH 46/84] Fix variable scoping issue. Refs https://github.com/saltstack/salt-bootstrap/pull/1335 --- bootstrap-salt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 78d3ab4..a0255fe 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -499,6 +499,7 @@ exec 2>"$LOGPIPE" # 14 SIGALRM # 15 SIGTERM #---------------------------------------------------------------------------------------------------------------------- +APT_ERR=$(mktemp /tmp/apt_error.XXXX) __exit_cleanup() { EXIT_CODE=$? @@ -1819,7 +1820,6 @@ __function_defined() { # a boot process, such as on AWS AMIs. This func will wait until the boot # process is finished so the script doesn't exit on a locked proc. #---------------------------------------------------------------------------------------------------------------------- -APT_ERR=$(mktemp /tmp/apt_error.XXXX) __wait_for_apt(){ # Timeout set at 15 minutes WAIT_TIMEOUT=900 @@ -1839,8 +1839,8 @@ __wait_for_apt(){ echoerror "Bootstrap script cannot proceed. Aborting." return 1 else - "${@}" 2>"$APT_ERR" - APT_RETURN=$? + "${@}" 2>"$APT_ERR" + APT_RETURN=$? fi done From 27e1f2791d93e511823cccbf4ae14f494a4cfeab Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 09:58:27 +0100 Subject: [PATCH 47/84] Random delay before run_command makes a difference? --- .kitchen.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index fb072f4..f8f7663 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -30,17 +30,17 @@ platforms: - name: fedora-28 driver_config: image: fedora:28 - run_command: /usr/lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd - name: fedora-29 driver_config: image: fedora:29 - run_command: /usr/lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd - name: centos-7 driver_config: - run_command: /usr/lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd - name: centos-6 driver_config: - run_command: /sbin/init + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /sbin/init provision_command: - yum install -y upstart provisioner: @@ -49,45 +49,45 @@ platforms: driver_config: image: amazonlinux:1 platform: rhel - run_command: /sbin/init + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /sbin/init provision_command: - yum install -y upstart - name: amazon-2 driver_config: image: amazonlinux:2 platform: rhel - run_command: /usr/lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd - name: ubuntu-18.04 driver_config: - run_command: /lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd - name: ubuntu-16.04 driver_config: - run_command: /lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd - name: ubuntu-14.04 driver_config: - run_command: /sbin/init + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /sbin/init provision_command: - rm -f /sbin/initctl - dpkg-divert --local --rename --remove /sbin/initctl - name: debian-8 driver_config: - run_command: /lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd provision_command: - apt-get install -y dbus - name: debian-9 driver_config: - run_command: /lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd - name: arch driver_config: image: archlinux/base - run_command: /usr/lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd - name: opensuse-15 driver_config: image: opensuse/leap:15.0 - run_command: /usr/lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service provisioner: @@ -95,7 +95,7 @@ platforms: - name: opensuse-42 driver_config: image: opensuse/leap:42.3 - run_command: /usr/lib/systemd/systemd + run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service From e1a1a078f6a3d832c3ed33ff22c4e727f5904ce8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 10:07:44 +0100 Subject: [PATCH 48/84] Different random delay approach --- .kitchen.yml | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index f8f7663..18f22e5 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -30,74 +30,95 @@ platforms: - name: fedora-28 driver_config: image: fedora:28 - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd + run_command: /usr/lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: fedora-29 driver_config: image: fedora:29 - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd + run_command: /usr/lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: centos-7 driver_config: - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd + run_command: /usr/lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: centos-6 driver_config: - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /sbin/init + run_command: /sbin/init provision_command: - yum install -y upstart + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' provisioner: salt_bootstrap_options: -MPfq -y -x python2.7 git %s - name: amazon-1 driver_config: image: amazonlinux:1 platform: rhel - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /sbin/init + run_command: /sbin/init provision_command: - yum install -y upstart + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: amazon-2 driver_config: image: amazonlinux:2 platform: rhel - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd + run_command: /usr/lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-18.04 driver_config: - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd + run_command: /lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-16.04 driver_config: - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd + run_command: /lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-14.04 driver_config: - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /sbin/init + run_command: /sbin/init provision_command: - rm -f /sbin/initctl - dpkg-divert --local --rename --remove /sbin/initctl + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: debian-8 driver_config: - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd + run_command: /lib/systemd/systemd provision_command: - apt-get install -y dbus + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: debian-9 driver_config: - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /lib/systemd/systemd + run_command: /lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: arch driver_config: image: archlinux/base - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd + run_command: /usr/lib/systemd/systemd provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: opensuse-15 driver_config: image: opensuse/leap:15.0 - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd + run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' provisioner: salt_bootstrap_options: -MPfq -y -x python2 git %s - name: opensuse-42 driver_config: image: opensuse/leap:42.3 - run_command: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'; /usr/lib/systemd/systemd + run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' suites: - name: py2-git-2017-7 From 9b8caf1bbea3b711b4cd12c23282a685e0124695 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 10:08:11 +0100 Subject: [PATCH 49/84] Different UI names --- .drone.jsonnet | 34 ++++++++--------- .drone.yml | 99 +++++++------------------------------------------- 2 files changed, 31 insertions(+), 102 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 3fc144b..d4cea85 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -12,20 +12,20 @@ local stable_suites = [ ]; local distros = [ - 'arch', - 'amazon-1', - 'amazon-2', - 'centos-6', - 'centos-7', - 'debian-8', - 'debian-9', - 'fedora-28', - 'fedora-29', - 'opensuse-15', - 'opensuse-42', - 'ubuntu-1404', - 'ubuntu-1604', - 'ubuntu-1804', + { name: 'Arch', slug: 'arch' }, + { name: 'Amazon 1', slug: 'amazon-1' } + { name: 'Amazon 2', slug: 'amazon-2' }, + { name: 'CentOS 6', slug: 'centos-6' }, + { name: 'CentOS 7', slug: 'centos-7' }, + { name: 'Debian 8', slug: 'debian-8' }, + { name: 'Debian 9', slug: 'debian-9' }, + { name: 'Fedora 28', slug: 'fedora-28' }, + { name: 'Fedora 29', slug: 'fedora-29' }, + { name: 'Opensuse 15.0', slug: 'opensuse-15' }, + { name: 'Opensuse 42.3', slug: 'opensuse-42' }, + { name: 'Ubuntu 14.04', slug: 'ubuntu-1404' }, + { name: 'Ubuntu 16.04', slug: 'ubuntu-1604' }, + { name: 'Ubuntu 18.04', slug: 'ubuntu-1804' }, ]; local stable_distros = [ @@ -58,9 +58,9 @@ local Shellcheck() = { local Build(distro) = { kind: 'pipeline', - name: distro, + name: distro.name, - local suites = if std.count(stable_distros, distro) > 0 then git_suites + stable_suites else git_suites, + local suites = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, steps: [ { @@ -79,7 +79,7 @@ local Build(distro) = { 'throttle-build', ], settings: { - target: std.format('%s-%s', [suite, distro]), + target: std.format('%s-%s', [suite, distro.slug]), requirements: 'tests/requirements.txt', }, } diff --git a/.drone.yml b/.drone.yml index 0981ab1..1b32b48 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: --- kind: pipeline -name: arch +name: Arch platform: os: linux @@ -58,78 +58,7 @@ depends_on: --- kind: pipeline -name: amazon-1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" - -- name: py2-git-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-amazon-1 - privileged: true - depends_on: - - throttle-build - -- name: py2-git-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-amazon-1 - privileged: true - depends_on: - - throttle-build - -- name: py2-git-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-amazon-1 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2017-7 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-1 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2018-3 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-1 - privileged: true - depends_on: - - throttle-build - -- name: py2-stable-2019-2 - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-1 - privileged: true - depends_on: - - throttle-build - -depends_on: -- run-shellcheck - ---- -kind: pipeline -name: amazon-2 +name: Amazon 2 platform: os: linux @@ -200,7 +129,7 @@ depends_on: --- kind: pipeline -name: centos-6 +name: CentOS 6 platform: os: linux @@ -271,7 +200,7 @@ depends_on: --- kind: pipeline -name: centos-7 +name: CentOS 7 platform: os: linux @@ -342,7 +271,7 @@ depends_on: --- kind: pipeline -name: debian-8 +name: Debian 8 platform: os: linux @@ -413,7 +342,7 @@ depends_on: --- kind: pipeline -name: debian-9 +name: Debian 9 platform: os: linux @@ -484,7 +413,7 @@ depends_on: --- kind: pipeline -name: fedora-28 +name: Fedora 28 platform: os: linux @@ -528,7 +457,7 @@ depends_on: --- kind: pipeline -name: fedora-29 +name: Fedora 29 platform: os: linux @@ -572,7 +501,7 @@ depends_on: --- kind: pipeline -name: opensuse-15 +name: Opensuse 15.0 platform: os: linux @@ -616,7 +545,7 @@ depends_on: --- kind: pipeline -name: opensuse-42 +name: Opensuse 42.3 platform: os: linux @@ -660,7 +589,7 @@ depends_on: --- kind: pipeline -name: ubuntu-1404 +name: Ubuntu 14.04 platform: os: linux @@ -731,7 +660,7 @@ depends_on: --- kind: pipeline -name: ubuntu-1604 +name: Ubuntu 16.04 platform: os: linux @@ -802,7 +731,7 @@ depends_on: --- kind: pipeline -name: ubuntu-1804 +name: Ubuntu 18.04 platform: os: linux @@ -873,6 +802,6 @@ depends_on: --- kind: signature -hmac: ce7fc9d04548b5160a561da165fa1b3c97697d5fd882fafe64eaafac423b61f0 +hmac: abd8923f4b5902a6fb333e888cf3efaa20c0c4b5715d93c4defdc07b9650782d ... From e6114299b31518981d87bb93a2c2d0bee1db67a0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 10:47:34 +0100 Subject: [PATCH 50/84] Another random sleep to avoid storms --- .kitchen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.kitchen.yml b/.kitchen.yml index 18f22e5..c149645 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -25,6 +25,7 @@ provisioner: echo 'auto_accept: true' > /tmp/auto-accept-keys.conf sudo mkdir -p /etc/salt/master.d sudo mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf + sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t' platforms: - name: fedora-28 From 70f12f400cd0709396b230ff88a2b4a211e6d168 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 10:48:07 +0100 Subject: [PATCH 51/84] Human readable step names too --- .drone.jsonnet | 18 +++---- .drone.yml | 128 ++++++++++++++++++++++++------------------------- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d4cea85..cd49b64 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,14 +1,14 @@ local git_suites = [ - 'py2-git-2017-7', - 'py2-git-2018-3', - 'py2-git-2019-2', - // 'py2-git-develop', // Don't test against Salt's develop branch. Stability is not assured. + { name: 'Py2 2017.7(Git)', slug: 'py2-git-2017-7' }, + { name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3' }, + { name: 'Py2 2019.2(Git)', slug: 'py2-git-2019-2' }, + // {name: 'Py2 develop(Stable)', slug: 'py2-git-develop'}, // Don't test against Salt's develop branch. Stability is not assured. ]; local stable_suites = [ - 'py2-stable-2017-7', - 'py2-stable-2018-3', - 'py2-stable-2019-2', + { name: 'Py2 2017.7(Stable)', slug: 'py2-stable-2017-7' }, + { name: 'Py2 2018.3(Stable)', slug: 'py2-stable-2018-3' }, + { name: 'Py2 2019.2(Stable)', slug: 'py2-stable-2019-2' }, ]; local distros = [ @@ -72,14 +72,14 @@ local Build(distro) = { }, ] + [ { - name: suite, + name: suite.name, privileged: true, image: 'saltstack/drone-plugin-kitchen', depends_on: [ 'throttle-build', ], settings: { - target: std.format('%s-%s', [suite, distro.slug]), + target: std.format('%s-%s', [suite.slug, distro.slug]), requirements: 'tests/requirements.txt', }, } diff --git a/.drone.yml b/.drone.yml index 1b32b48..7033599 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,7 +26,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -35,7 +35,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -44,7 +44,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -70,7 +70,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -79,7 +79,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -88,7 +88,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -97,7 +97,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -106,7 +106,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -115,7 +115,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -141,7 +141,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -150,7 +150,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -159,7 +159,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -168,7 +168,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -177,7 +177,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -186,7 +186,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -212,7 +212,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -221,7 +221,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -230,7 +230,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -239,7 +239,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -248,7 +248,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -257,7 +257,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -283,7 +283,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -292,7 +292,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -301,7 +301,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -310,7 +310,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -319,7 +319,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -328,7 +328,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -354,7 +354,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -363,7 +363,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -372,7 +372,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -381,7 +381,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -390,7 +390,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -399,7 +399,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -425,7 +425,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -434,7 +434,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -443,7 +443,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -469,7 +469,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -478,7 +478,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -487,7 +487,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -513,7 +513,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -522,7 +522,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -531,7 +531,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -557,7 +557,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -566,7 +566,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -575,7 +575,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -601,7 +601,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -610,7 +610,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -619,7 +619,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -628,7 +628,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -637,7 +637,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -646,7 +646,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -672,7 +672,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -681,7 +681,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -690,7 +690,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -699,7 +699,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -708,7 +708,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -717,7 +717,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -743,7 +743,7 @@ steps: commands: - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" -- name: py2-git-2017-7 +- name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -752,7 +752,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2018-3 +- name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -761,7 +761,7 @@ steps: depends_on: - throttle-build -- name: py2-git-2019-2 +- name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -770,7 +770,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2017-7 +- name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -779,7 +779,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2018-3 +- name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -788,7 +788,7 @@ steps: depends_on: - throttle-build -- name: py2-stable-2019-2 +- name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen settings: requirements: tests/requirements.txt @@ -802,6 +802,6 @@ depends_on: --- kind: signature -hmac: abd8923f4b5902a6fb333e888cf3efaa20c0c4b5715d93c4defdc07b9650782d +hmac: 260c4d8d1b993597174bcfaf76e88d857ecff595e19d0ee6cf04a4080b0b8bb3 ... From fa2025c3385d869eb2776afc586b15ee065a43a4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 10:53:40 +0100 Subject: [PATCH 52/84] "Sort" by distro name --- .kitchen.yml | 120 +++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index c149645..0b34f80 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -28,31 +28,6 @@ provisioner: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t' platforms: - - name: fedora-28 - driver_config: - image: fedora:28 - run_command: /usr/lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - - name: fedora-29 - driver_config: - image: fedora:29 - run_command: /usr/lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - - name: centos-7 - driver_config: - run_command: /usr/lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - - name: centos-6 - driver_config: - run_command: /sbin/init - provision_command: - - yum install -y upstart - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - provisioner: - salt_bootstrap_options: -MPfq -y -x python2.7 git %s - name: amazon-1 driver_config: image: amazonlinux:1 @@ -68,6 +43,66 @@ platforms: run_command: /usr/lib/systemd/systemd provision_command: - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - name: arch + driver_config: + image: archlinux/base + run_command: /usr/lib/systemd/systemd + provision_command: + - pacman -Syu --noconfirm --needed systemd grep awk procps which + - systemctl enable sshd + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - name: centos-7 + driver_config: + run_command: /usr/lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - name: centos-6 + driver_config: + run_command: /sbin/init + provision_command: + - yum install -y upstart + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + provisioner: + salt_bootstrap_options: -MPfq -y -x python2.7 git %s + - name: debian-8 + driver_config: + run_command: /lib/systemd/systemd + provision_command: + - apt-get install -y dbus + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - name: debian-9 + driver_config: + run_command: /lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - name: fedora-28 + driver_config: + image: fedora:28 + run_command: /usr/lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - name: fedora-29 + driver_config: + image: fedora:29 + run_command: /usr/lib/systemd/systemd + provision_command: + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - name: opensuse-15 + driver_config: + image: opensuse/leap:15.0 + run_command: /usr/lib/systemd/systemd + provision_command: + - systemctl enable sshd.service + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + 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: + - systemctl enable sshd.service + - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-18.04 driver_config: run_command: /lib/systemd/systemd @@ -85,41 +120,6 @@ platforms: - rm -f /sbin/initctl - dpkg-divert --local --rename --remove /sbin/initctl - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - - name: debian-8 - driver_config: - run_command: /lib/systemd/systemd - provision_command: - - apt-get install -y dbus - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - - name: debian-9 - driver_config: - run_command: /lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - - name: arch - driver_config: - image: archlinux/base - run_command: /usr/lib/systemd/systemd - provision_command: - - pacman -Syu --noconfirm --needed systemd grep awk procps which - - systemctl enable sshd - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - - name: opensuse-15 - driver_config: - image: opensuse/leap:15.0 - run_command: /usr/lib/systemd/systemd - provision_command: - - systemctl enable sshd.service - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' - 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: - - systemctl enable sshd.service - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' suites: - name: py2-git-2017-7 From 270b6fd38da071189427f8580a4586e1528ff982 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 10:55:31 +0100 Subject: [PATCH 53/84] And a little offset --- .kitchen.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 0b34f80..920d684 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -35,14 +35,14 @@ platforms: run_command: /sbin/init provision_command: - yum install -y upstart - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t' - name: amazon-2 driver_config: image: amazonlinux:2 platform: rhel run_command: /usr/lib/systemd/systemd provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 11-61 -n 1); echo Sleeping $t seconds; sleep $t' - name: arch driver_config: image: archlinux/base @@ -50,18 +50,18 @@ platforms: provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 12-62 -n 1); echo Sleeping $t seconds; sleep $t' - name: centos-7 driver_config: run_command: /usr/lib/systemd/systemd provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 13-63 -n 1); echo Sleeping $t seconds; sleep $t' - name: centos-6 driver_config: run_command: /sbin/init provision_command: - yum install -y upstart - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 14-64 -n 1); echo Sleeping $t seconds; sleep $t' provisioner: salt_bootstrap_options: -MPfq -y -x python2.7 git %s - name: debian-8 @@ -69,31 +69,31 @@ platforms: run_command: /lib/systemd/systemd provision_command: - apt-get install -y dbus - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 15-65 -n 1); echo Sleeping $t seconds; sleep $t' - name: debian-9 driver_config: run_command: /lib/systemd/systemd provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 16-66 -n 1); echo Sleeping $t seconds; sleep $t' - name: fedora-28 driver_config: image: fedora:28 run_command: /usr/lib/systemd/systemd provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 17-67 -n 1); echo Sleeping $t seconds; sleep $t' - name: fedora-29 driver_config: image: fedora:29 run_command: /usr/lib/systemd/systemd provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 18-68 -n 1); echo Sleeping $t seconds; sleep $t' - name: opensuse-15 driver_config: image: opensuse/leap:15.0 run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 19-69 -n 1); echo Sleeping $t seconds; sleep $t' provisioner: salt_bootstrap_options: -MPfq -y -x python2 git %s - name: opensuse-42 @@ -102,24 +102,24 @@ platforms: run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 20-70 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-18.04 driver_config: run_command: /lib/systemd/systemd provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 21-71 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-16.04 driver_config: run_command: /lib/systemd/systemd provision_command: - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 22-72 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-14.04 driver_config: run_command: /sbin/init provision_command: - rm -f /sbin/initctl - dpkg-divert --local --rename --remove /sbin/initctl - - sh -c 't=$(shuf -i 5-35 -n 1); echo Sleeping $t seconds; sleep $t' + - sh -c 't=$(shuf -i 23-73 -n 1); echo Sleeping $t seconds; sleep $t' suites: - name: py2-git-2017-7 From 5143d98ae54e9c1a34f9efcdea545c5f1abac012 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 11:06:55 +0100 Subject: [PATCH 54/84] Fixed offset --- .drone.jsonnet | 30 +++++++++++++++--------------- .drone.yml | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index cd49b64..6fd9d71 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -12,20 +12,20 @@ local stable_suites = [ ]; local distros = [ - { name: 'Arch', slug: 'arch' }, - { name: 'Amazon 1', slug: 'amazon-1' } - { name: 'Amazon 2', slug: 'amazon-2' }, - { name: 'CentOS 6', slug: 'centos-6' }, - { name: 'CentOS 7', slug: 'centos-7' }, - { name: 'Debian 8', slug: 'debian-8' }, - { name: 'Debian 9', slug: 'debian-9' }, - { name: 'Fedora 28', slug: 'fedora-28' }, - { name: 'Fedora 29', slug: 'fedora-29' }, - { name: 'Opensuse 15.0', slug: 'opensuse-15' }, - { name: 'Opensuse 42.3', slug: 'opensuse-42' }, - { name: 'Ubuntu 14.04', slug: 'ubuntu-1404' }, - { name: 'Ubuntu 16.04', slug: 'ubuntu-1604' }, - { name: 'Ubuntu 18.04', slug: 'ubuntu-1804' }, + { name: 'Arch', slug: 'arch', offset: 5 }, + { name: 'Amazon 1', slug: 'amazon-1', offset: 10 } + { name: 'Amazon 2', slug: 'amazon-2', offset: 15 }, + { name: 'CentOS 6', slug: 'centos-6', offset: 20 }, + { name: 'CentOS 7', slug: 'centos-7', offset: 25 }, + { name: 'Debian 8', slug: 'debian-8', offset: 30 }, + { name: 'Debian 9', slug: 'debian-9', offset: 35 }, + { name: 'Fedora 28', slug: 'fedora-28', offset: 40 }, + { name: 'Fedora 29', slug: 'fedora-29', offset: 45 }, + { name: 'Opensuse 15.0', slug: 'opensuse-15', offset: 50 }, + { name: 'Opensuse 42.3', slug: 'opensuse-42', offset: 55 }, + { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', offset: 60 }, + { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', offset: 65 }, + { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', offset: 70 }, ]; local stable_distros = [ @@ -67,7 +67,7 @@ local Build(distro) = { name: 'throttle-build', image: 'alpine', commands: [ - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'", + std.format("sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", { offset: distro.offset }), ], }, ] + [ diff --git a/.drone.yml b/.drone.yml index 7033599..8464b73 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=5; echo Sleeping 5 seconds; sleep 5'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -68,7 +68,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=15; echo Sleeping 15 seconds; sleep 15'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -139,7 +139,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=20; echo Sleeping 20 seconds; sleep 20'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -210,7 +210,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=25; echo Sleeping 25 seconds; sleep 25'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -281,7 +281,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -352,7 +352,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=35; echo Sleeping 35 seconds; sleep 35'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -423,7 +423,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=40; echo Sleeping 40 seconds; sleep 40'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -467,7 +467,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -511,7 +511,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=50; echo Sleeping 50 seconds; sleep 50'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -555,7 +555,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=55; echo Sleeping 55 seconds; sleep 55'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -599,7 +599,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -670,7 +670,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=65; echo Sleeping 65 seconds; sleep 65'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -741,7 +741,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t'" + - "sh -c 't=70; echo Sleeping 70 seconds; sleep 70'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -802,6 +802,6 @@ depends_on: --- kind: signature -hmac: 260c4d8d1b993597174bcfaf76e88d857ecff595e19d0ee6cf04a4080b0b8bb3 +hmac: 233219929d7bfebe4d686c259928afd0a6ff6b10155095ef57076cf01c028175 ... From 0c51e23039724e7e03ded43c3246bf5a245bceeb Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 11:24:51 +0100 Subject: [PATCH 55/84] A different throttle approach --- .drone.jsonnet | 30 +++++++-------- .drone.yml | 99 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 100 insertions(+), 29 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 6fd9d71..64ea161 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -12,20 +12,20 @@ local stable_suites = [ ]; local distros = [ - { name: 'Arch', slug: 'arch', offset: 5 }, - { name: 'Amazon 1', slug: 'amazon-1', offset: 10 } - { name: 'Amazon 2', slug: 'amazon-2', offset: 15 }, - { name: 'CentOS 6', slug: 'centos-6', offset: 20 }, - { name: 'CentOS 7', slug: 'centos-7', offset: 25 }, - { name: 'Debian 8', slug: 'debian-8', offset: 30 }, - { name: 'Debian 9', slug: 'debian-9', offset: 35 }, - { name: 'Fedora 28', slug: 'fedora-28', offset: 40 }, - { name: 'Fedora 29', slug: 'fedora-29', offset: 45 }, - { name: 'Opensuse 15.0', slug: 'opensuse-15', offset: 50 }, - { name: 'Opensuse 42.3', slug: 'opensuse-42', offset: 55 }, - { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', offset: 60 }, - { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', offset: 65 }, - { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', offset: 70 }, + { name: 'Arch', slug: 'arch', multiplier: 1 }, + { name: 'Amazon 1', slug: 'amazon-1', multiplier: 2 }, + { name: 'Amazon 2', slug: 'amazon-2', multiplier: 3 }, + { name: 'CentOS 6', slug: 'centos-6', multiplier: 4 }, + { name: 'CentOS 7', slug: 'centos-7', multiplier: 5 }, + { name: 'Debian 8', slug: 'debian-8', multiplier: 6 }, + { name: 'Debian 9', slug: 'debian-9', multiplier: 7 }, + { name: 'Fedora 28', slug: 'fedora-28', multiplier: 8 }, + { name: 'Fedora 29', slug: 'fedora-29', multiplier: 9 }, + { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 9 }, + { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 10 }, + { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', multiplier: 11 }, + { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 12 }, + { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 13 }, ]; local stable_distros = [ @@ -67,7 +67,7 @@ local Build(distro) = { name: 'throttle-build', image: 'alpine', commands: [ - std.format("sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", { offset: distro.offset }), + std.format("sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", { offset: 10 * distro.multiplier }), ], }, ] + [ diff --git a/.drone.yml b/.drone.yml index 8464b73..b0bf7c8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=5; echo Sleeping 5 seconds; sleep 5'" + - "sh -c 't=10; echo Sleeping 10 seconds; sleep 10'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -56,6 +56,77 @@ steps: depends_on: - run-shellcheck +--- +kind: pipeline +name: Amazon 1 + +platform: + os: linux + arch: amd64 + +steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=20; echo Sleeping 20 seconds; sleep 20'" + +- name: Py2 2017.7(Git) + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2017-7-amazon-1 + privileged: true + depends_on: + - throttle-build + +- name: Py2 2018.3(Git) + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2018-3-amazon-1 + privileged: true + depends_on: + - throttle-build + +- name: Py2 2019.2(Git) + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-git-2019-2-amazon-1 + privileged: true + depends_on: + - throttle-build + +- name: Py2 2017.7(Stable) + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2017-7-amazon-1 + privileged: true + depends_on: + - throttle-build + +- name: Py2 2018.3(Stable) + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2018-3-amazon-1 + privileged: true + depends_on: + - throttle-build + +- name: Py2 2019.2(Stable) + image: saltstack/drone-plugin-kitchen + settings: + requirements: tests/requirements.txt + target: py2-stable-2019-2-amazon-1 + privileged: true + depends_on: + - throttle-build + +depends_on: +- run-shellcheck + --- kind: pipeline name: Amazon 2 @@ -68,7 +139,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=15; echo Sleeping 15 seconds; sleep 15'" + - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -139,7 +210,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=20; echo Sleeping 20 seconds; sleep 20'" + - "sh -c 't=40; echo Sleeping 40 seconds; sleep 40'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -210,7 +281,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=25; echo Sleeping 25 seconds; sleep 25'" + - "sh -c 't=50; echo Sleeping 50 seconds; sleep 50'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -281,7 +352,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" + - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -352,7 +423,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=35; echo Sleeping 35 seconds; sleep 35'" + - "sh -c 't=70; echo Sleeping 70 seconds; sleep 70'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -423,7 +494,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=40; echo Sleeping 40 seconds; sleep 40'" + - "sh -c 't=80; echo Sleeping 80 seconds; sleep 80'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -467,7 +538,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" + - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -511,7 +582,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=50; echo Sleeping 50 seconds; sleep 50'" + - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -555,7 +626,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=55; echo Sleeping 55 seconds; sleep 55'" + - "sh -c 't=100; echo Sleeping 100 seconds; sleep 100'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -599,7 +670,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" + - "sh -c 't=110; echo Sleeping 110 seconds; sleep 110'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -670,7 +741,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=65; echo Sleeping 65 seconds; sleep 65'" + - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -741,7 +812,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=70; echo Sleeping 70 seconds; sleep 70'" + - "sh -c 't=130; echo Sleeping 130 seconds; sleep 130'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -802,6 +873,6 @@ depends_on: --- kind: signature -hmac: 233219929d7bfebe4d686c259928afd0a6ff6b10155095ef57076cf01c028175 +hmac: fa242d0fc30d62b2bee601e29fa31ea7e3dd3746bf5949b382595be347e34e38 ... From ee58e285b1d261c65415bf9d6cc0bfdc375ee259 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 11:25:43 +0100 Subject: [PATCH 56/84] And if we don't use the internal docker network? --- .kitchen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kitchen.yml b/.kitchen.yml index 920d684..b03627d 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -8,7 +8,7 @@ driver: cap_add: - sys_admin disable_upstart: false - use_internal_docker_network: true + use_internal_docker_network: false provisioner: name: salt_solo From 0efeb85b6000afe15bda077a26924a1516d44c2e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 11:40:06 +0100 Subject: [PATCH 57/84] Don't sleep while provisioning --- .kitchen.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index b03627d..39eb167 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -35,14 +35,11 @@ platforms: run_command: /sbin/init provision_command: - yum install -y upstart - - sh -c 't=$(shuf -i 10-60 -n 1); echo Sleeping $t seconds; sleep $t' - name: amazon-2 driver_config: image: amazonlinux:2 platform: rhel run_command: /usr/lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 11-61 -n 1); echo Sleeping $t seconds; sleep $t' - name: arch driver_config: image: archlinux/base @@ -50,18 +47,14 @@ platforms: provision_command: - pacman -Syu --noconfirm --needed systemd grep awk procps which - systemctl enable sshd - - sh -c 't=$(shuf -i 12-62 -n 1); echo Sleeping $t seconds; sleep $t' - name: centos-7 driver_config: run_command: /usr/lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 13-63 -n 1); echo Sleeping $t seconds; sleep $t' - name: centos-6 driver_config: run_command: /sbin/init provision_command: - yum install -y upstart - - sh -c 't=$(shuf -i 14-64 -n 1); echo Sleeping $t seconds; sleep $t' provisioner: salt_bootstrap_options: -MPfq -y -x python2.7 git %s - name: debian-8 @@ -69,31 +62,23 @@ platforms: run_command: /lib/systemd/systemd provision_command: - apt-get install -y dbus - - sh -c 't=$(shuf -i 15-65 -n 1); echo Sleeping $t seconds; sleep $t' - name: debian-9 driver_config: run_command: /lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 16-66 -n 1); echo Sleeping $t seconds; sleep $t' - name: fedora-28 driver_config: image: fedora:28 run_command: /usr/lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 17-67 -n 1); echo Sleeping $t seconds; sleep $t' - name: fedora-29 driver_config: image: fedora:29 run_command: /usr/lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 18-68 -n 1); echo Sleeping $t seconds; sleep $t' - name: opensuse-15 driver_config: image: opensuse/leap:15.0 run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service - - sh -c 't=$(shuf -i 19-69 -n 1); echo Sleeping $t seconds; sleep $t' provisioner: salt_bootstrap_options: -MPfq -y -x python2 git %s - name: opensuse-42 @@ -102,24 +87,18 @@ platforms: run_command: /usr/lib/systemd/systemd provision_command: - systemctl enable sshd.service - - sh -c 't=$(shuf -i 20-70 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-18.04 driver_config: run_command: /lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 21-71 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-16.04 driver_config: run_command: /lib/systemd/systemd - provision_command: - - sh -c 't=$(shuf -i 22-72 -n 1); echo Sleeping $t seconds; sleep $t' - name: ubuntu-14.04 driver_config: run_command: /sbin/init provision_command: - rm -f /sbin/initctl - dpkg-divert --local --rename --remove /sbin/initctl - - sh -c 't=$(shuf -i 23-73 -n 1); echo Sleeping $t seconds; sleep $t' suites: - name: py2-git-2017-7 From 0bfad1ce448c418462e1fe38fe9e7f4c15d5fab6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 11:41:21 +0100 Subject: [PATCH 58/84] Bigger offset --- .drone.jsonnet | 2 +- .drone.yml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 64ea161..a82997a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -67,7 +67,7 @@ local Build(distro) = { name: 'throttle-build', image: 'alpine', commands: [ - std.format("sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", { offset: 10 * distro.multiplier }), + std.format("sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", { offset: 15 * distro.multiplier }), ], }, ] + [ diff --git a/.drone.yml b/.drone.yml index b0bf7c8..c83e2e1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=10; echo Sleeping 10 seconds; sleep 10'" + - "sh -c 't=15; echo Sleeping 15 seconds; sleep 15'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -68,7 +68,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=20; echo Sleeping 20 seconds; sleep 20'" + - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -139,7 +139,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" + - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -210,7 +210,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=40; echo Sleeping 40 seconds; sleep 40'" + - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -281,7 +281,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=50; echo Sleeping 50 seconds; sleep 50'" + - "sh -c 't=75; echo Sleeping 75 seconds; sleep 75'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -352,7 +352,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" + - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -423,7 +423,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=70; echo Sleeping 70 seconds; sleep 70'" + - "sh -c 't=105; echo Sleeping 105 seconds; sleep 105'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -494,7 +494,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=80; echo Sleeping 80 seconds; sleep 80'" + - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -538,7 +538,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" + - "sh -c 't=135; echo Sleeping 135 seconds; sleep 135'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -582,7 +582,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" + - "sh -c 't=135; echo Sleeping 135 seconds; sleep 135'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -626,7 +626,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=100; echo Sleeping 100 seconds; sleep 100'" + - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -670,7 +670,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=110; echo Sleeping 110 seconds; sleep 110'" + - "sh -c 't=165; echo Sleeping 165 seconds; sleep 165'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -741,7 +741,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" + - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -812,7 +812,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=130; echo Sleeping 130 seconds; sleep 130'" + - "sh -c 't=195; echo Sleeping 195 seconds; sleep 195'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -873,6 +873,6 @@ depends_on: --- kind: signature -hmac: fa242d0fc30d62b2bee601e29fa31ea7e3dd3746bf5949b382595be347e34e38 +hmac: 2d015eee8ce2c6446e23f4a9f0d39ceca3765433f2fb3d5f757e522cb3aa28ac ... From 53b045236ad8f86c8fdfa45b9a659ba95439a1e1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 12:55:21 +0100 Subject: [PATCH 59/84] The number of suites counts towards the offset value --- .drone.jsonnet | 23 +++++++++++++---------- .drone.yml | 24 ++++++++++++------------ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index a82997a..7d7e40c 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -12,15 +12,15 @@ local stable_suites = [ ]; local distros = [ - { name: 'Arch', slug: 'arch', multiplier: 1 }, - { name: 'Amazon 1', slug: 'amazon-1', multiplier: 2 }, - { name: 'Amazon 2', slug: 'amazon-2', multiplier: 3 }, - { name: 'CentOS 6', slug: 'centos-6', multiplier: 4 }, - { name: 'CentOS 7', slug: 'centos-7', multiplier: 5 }, - { name: 'Debian 8', slug: 'debian-8', multiplier: 6 }, - { name: 'Debian 9', slug: 'debian-9', multiplier: 7 }, - { name: 'Fedora 28', slug: 'fedora-28', multiplier: 8 }, - { name: 'Fedora 29', slug: 'fedora-29', multiplier: 9 }, + { name: 'Arch', slug: 'arch', multiplier: 0 }, + { name: 'Amazon 1', slug: 'amazon-1', multiplier: 1 }, + { name: 'Amazon 2', slug: 'amazon-2', multiplier: 2 }, + { name: 'CentOS 6', slug: 'centos-6', multiplier: 3 }, + { name: 'CentOS 7', slug: 'centos-7', multiplier: 4 }, + { name: 'Debian 8', slug: 'debian-8', multiplier: 5 }, + { name: 'Debian 9', slug: 'debian-9', multiplier: 6 }, + { name: 'Fedora 28', slug: 'fedora-28', multiplier: 7 }, + { name: 'Fedora 29', slug: 'fedora-29', multiplier: 8 }, { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 9 }, { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 10 }, { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', multiplier: 11 }, @@ -67,7 +67,10 @@ local Build(distro) = { name: 'throttle-build', image: 'alpine', commands: [ - std.format("sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", { offset: 15 * distro.multiplier }), + std.format( + "sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", + { offset: 5 * std.length(suites) * distro.multiplier } + ), ], }, ] + [ diff --git a/.drone.yml b/.drone.yml index c83e2e1..ec91570 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=15; echo Sleeping 15 seconds; sleep 15'" + - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -139,7 +139,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: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -210,7 +210,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" + - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -281,7 +281,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=75; echo Sleeping 75 seconds; sleep 75'" + - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -352,7 +352,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" + - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -423,7 +423,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=105; echo Sleeping 105 seconds; sleep 105'" + - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -494,7 +494,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" + - "sh -c 't=105; echo Sleeping 105 seconds; sleep 105'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -538,7 +538,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=135; echo Sleeping 135 seconds; sleep 135'" + - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -670,7 +670,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=165; echo Sleeping 165 seconds; sleep 165'" + - "sh -c 't=330; echo Sleeping 330 seconds; sleep 330'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -741,7 +741,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" + - "sh -c 't=360; echo Sleeping 360 seconds; sleep 360'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -812,7 +812,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=195; echo Sleeping 195 seconds; sleep 195'" + - "sh -c 't=390; echo Sleeping 390 seconds; sleep 390'" - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen @@ -873,6 +873,6 @@ depends_on: --- kind: signature -hmac: 2d015eee8ce2c6446e23f4a9f0d39ceca3765433f2fb3d5f757e522cb3aa28ac +hmac: cb3c28587008787bf331f2f71287c4c95ee495ed42755d6f1cca7ba6e8596292 ... From a9edc0450b30d0736a65013d04e13ce9f50a2d2e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 13:33:46 +0100 Subject: [PATCH 60/84] Why don't we run as root? --- .kitchen.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 39eb167..cadf70f 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -4,7 +4,7 @@ driver: use_sudo: false hostname: salt privileged: true - username: kitchen + username: root cap_add: - sys_admin disable_upstart: false @@ -17,14 +17,14 @@ provisioner: salt_bootstrap_options: -MPfq git %s install_after_init_environment: true log_level: info - sudo: true + sudo: false require_chef: false formula: tests run_salt_call: false init_environment: | echo 'auto_accept: true' > /tmp/auto-accept-keys.conf - sudo mkdir -p /etc/salt/master.d - sudo mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf + mkdir -p /etc/salt/master.d + mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t' platforms: From 89256ef5968e354545fb24ee37d873c9eef22bd1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 7 Apr 2019 13:39:11 +0100 Subject: [PATCH 61/84] Update the Gemfile --- Gemfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 85aa1dc..68639b7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source "https://rubygems.org" -gem 'kitchen-salt', '~>0.2' -gem 'kitchen-docker', :git => 'https://github.com/test-kitchen/kitchen-docker.git' +gem 'test-kitchen', '>= 2.0.1' +gem 'kitchen-salt', '>= 0.5' +gem 'kitchen-docker', '>= 2.9.0' From d2afe1fa482b86dd4e748530589bcf44c22ee8da Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 12:26:39 +0100 Subject: [PATCH 62/84] DBus needs to be installed --- .kitchen.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.kitchen.yml b/.kitchen.yml index cadf70f..8e31e10 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -78,6 +78,7 @@ platforms: image: opensuse/leap:15.0 run_command: /usr/lib/systemd/systemd provision_command: + - zypper --non-interactive install --auto-agree-with-licenses dbus-1 - systemctl enable sshd.service provisioner: salt_bootstrap_options: -MPfq -y -x python2 git %s @@ -86,6 +87,7 @@ platforms: 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: From 6b35c082e8b0b6fad409901bfa2142fffa1dbc5e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 12:27:36 +0100 Subject: [PATCH 63/84] Rename pipeline and step --- .drone.jsonnet | 4 ++-- .drone.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 7d7e40c..839fcf7 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -42,11 +42,11 @@ local stable_distros = [ local Shellcheck() = { kind: 'pipeline', - name: 'run-shellcheck', + name: 'Lint', steps: [ { - name: 'build', + name: 'shellcheck', image: 'koalaman/shellcheck-alpine', commands: [ 'shellcheck -s sh -f checkstyle bootstrap-salt.sh', diff --git a/.drone.yml b/.drone.yml index ec91570..f6c8ade 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,13 +1,13 @@ --- kind: pipeline -name: run-shellcheck +name: Lint platform: os: linux arch: amd64 steps: -- name: build +- name: shellcheck image: koalaman/shellcheck-alpine commands: - shellcheck -s sh -f checkstyle bootstrap-salt.sh @@ -873,6 +873,6 @@ depends_on: --- kind: signature -hmac: cb3c28587008787bf331f2f71287c4c95ee495ed42755d6f1cca7ba6e8596292 +hmac: 3aaad2a88f620d28f8a70aa3e5e700e7fbe560ba285901143c6fc459fdbf9f20 ... From 48cb4ce703fdf0bde64ea190e9a25dbfb9ec95e9 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 12:29:42 +0100 Subject: [PATCH 64/84] Target a bigger node --- .drone.jsonnet | 3 +++ .drone.yml | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 839fcf7..d3188e7 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -59,6 +59,9 @@ local Shellcheck() = { local Build(distro) = { kind: 'pipeline', name: distro.name, + node: { + project: 'open', + }, local suites = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, diff --git a/.drone.yml b/.drone.yml index f6c8ade..a8c0277 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,6 +53,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -124,6 +127,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -195,6 +201,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -266,6 +275,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -337,6 +349,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -408,6 +423,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -479,6 +497,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -523,6 +544,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -567,6 +591,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -611,6 +638,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -655,6 +685,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -726,6 +759,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -797,6 +833,9 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck @@ -868,11 +907,14 @@ steps: depends_on: - throttle-build +node: + project: open + depends_on: - run-shellcheck --- kind: signature -hmac: 3aaad2a88f620d28f8a70aa3e5e700e7fbe560ba285901143c6fc459fdbf9f20 +hmac: b03e19c133948366846efec5b00644668a071c3d5d4a170110567384870b2a35 ... From 82b008206ae08aa5efb9441ca8ba2cb18b4b23cf Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 12:31:15 +0100 Subject: [PATCH 65/84] Fix depends --- .drone.jsonnet | 2 +- .drone.yml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d3188e7..eab442e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -92,7 +92,7 @@ local Build(distro) = { for suite in suites ], depends_on: [ - 'run-shellcheck', + 'Lint', ], }; diff --git a/.drone.yml b/.drone.yml index a8c0277..19ef71b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,7 +57,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -131,7 +131,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -205,7 +205,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -279,7 +279,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -353,7 +353,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -427,7 +427,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -501,7 +501,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -548,7 +548,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -595,7 +595,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -642,7 +642,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -689,7 +689,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -763,7 +763,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -837,7 +837,7 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: pipeline @@ -911,10 +911,10 @@ node: project: open depends_on: -- run-shellcheck +- Lint --- kind: signature -hmac: b03e19c133948366846efec5b00644668a071c3d5d4a170110567384870b2a35 +hmac: e56c45a253af58232e583c28533a5524b094cb241a483507d12e2021e5b83f47 ... From 08f62e66146f85e319a9e8be9d84dd7349f08452 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 13:41:26 +0100 Subject: [PATCH 66/84] Limit concurrency --- .drone.jsonnet | 14 +++++++------- .drone.yml | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index eab442e..e83d1fa 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,14 +1,14 @@ local git_suites = [ - { name: 'Py2 2017.7(Git)', slug: 'py2-git-2017-7' }, - { name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3' }, - { name: 'Py2 2019.2(Git)', slug: 'py2-git-2019-2' }, + { name: 'Py2 2017.7(Git)', slug: 'py2-git-2017-7', depends: [] }, + { name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3', depends: [] }, + { name: 'Py2 2019.2(Git)', slug: 'py2-git-2019-2', depends: [] }, // {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' }, - { name: 'Py2 2018.3(Stable)', slug: 'py2-stable-2018-3' }, - { name: 'Py2 2019.2(Stable)', slug: 'py2-stable-2019-2' }, + { 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)'] }, ]; local distros = [ @@ -83,7 +83,7 @@ local Build(distro) = { image: 'saltstack/drone-plugin-kitchen', depends_on: [ 'throttle-build', - ], + ] + suite.depends, settings: { target: std.format('%s-%s', [suite.slug, distro.slug]), requirements: 'tests/requirements.txt', diff --git a/.drone.yml b/.drone.yml index 19ef71b..4dde6a3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -108,6 +108,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -117,6 +118,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -126,6 +128,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -182,6 +185,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -191,6 +195,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -200,6 +205,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -256,6 +262,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -265,6 +272,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -274,6 +282,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -330,6 +339,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -339,6 +349,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -348,6 +359,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -404,6 +416,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -413,6 +426,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -422,6 +436,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -478,6 +493,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -487,6 +503,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -496,6 +513,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -740,6 +758,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -749,6 +768,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -758,6 +778,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -814,6 +835,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -823,6 +845,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -832,6 +855,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -888,6 +912,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: saltstack/drone-plugin-kitchen @@ -897,6 +922,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: saltstack/drone-plugin-kitchen @@ -906,6 +932,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2019.2(Git) node: project: open @@ -915,6 +942,6 @@ depends_on: --- kind: signature -hmac: e56c45a253af58232e583c28533a5524b094cb241a483507d12e2021e5b83f47 +hmac: a3eccc661788d04ac52809af158b0257942e73aeb0e265031b192767d9b256aa ... From 7ad2b6bfadfaccaf934d3c31cb2a2948c17c00be Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 14:00:58 +0100 Subject: [PATCH 67/84] Even less concurrency --- .drone.jsonnet | 4 ++-- .drone.yml | 30 +++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index e83d1fa..c0472fa 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,7 +1,7 @@ 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: [] }, - { name: 'Py2 2019.2(Git)', slug: 'py2-git-2019-2', depends: [] }, + { name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3', depends: ['Py2 2017.7(Git)'] }, + { 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. ]; diff --git a/.drone.yml b/.drone.yml index 4dde6a3..cf0a6b0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,6 +43,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -52,6 +53,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) node: project: open @@ -90,6 +92,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -99,6 +102,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -167,6 +171,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -176,6 +181,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -244,6 +250,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -253,6 +260,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -321,6 +329,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -330,6 +339,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -398,6 +408,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -407,6 +418,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -475,6 +487,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -484,6 +497,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -552,6 +566,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -561,6 +576,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) node: project: open @@ -599,6 +615,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -608,6 +625,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) node: project: open @@ -646,6 +664,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -655,6 +674,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) node: project: open @@ -693,6 +713,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -702,6 +723,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) node: project: open @@ -740,6 +762,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -749,6 +772,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -817,6 +841,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -826,6 +851,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -894,6 +920,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: saltstack/drone-plugin-kitchen @@ -903,6 +930,7 @@ steps: privileged: true depends_on: - throttle-build + - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: saltstack/drone-plugin-kitchen @@ -942,6 +970,6 @@ depends_on: --- kind: signature -hmac: a3eccc661788d04ac52809af158b0257942e73aeb0e265031b192767d9b256aa +hmac: 4c93d5517a3c7f900b8a7fb0a4c61feeb4f2b521f5dfb2c214c472b8c0c61ea4 ... From 321fdef983d7b290c37612a24631aee0e7a379cc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 14:13:35 +0100 Subject: [PATCH 68/84] Even stricter concurrency --- .drone.jsonnet | 43 ++++------ .drone.yml | 217 ++++++++++++++++++------------------------------- 2 files changed, 93 insertions(+), 167 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index c0472fa..9954dbb 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -12,20 +12,20 @@ local stable_suites = [ ]; local distros = [ - { name: 'Arch', slug: 'arch', multiplier: 0 }, - { name: 'Amazon 1', slug: 'amazon-1', multiplier: 1 }, - { name: 'Amazon 2', slug: 'amazon-2', multiplier: 2 }, - { name: 'CentOS 6', slug: 'centos-6', multiplier: 3 }, - { name: 'CentOS 7', slug: 'centos-7', multiplier: 4 }, - { name: 'Debian 8', slug: 'debian-8', multiplier: 5 }, - { name: 'Debian 9', slug: 'debian-9', multiplier: 6 }, - { name: 'Fedora 28', slug: 'fedora-28', multiplier: 7 }, - { name: 'Fedora 29', slug: 'fedora-29', multiplier: 8 }, - { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 9 }, - { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 10 }, - { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', multiplier: 11 }, - { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 12 }, - { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 13 }, + { name: 'Arch', slug: 'arch', multiplier: 0, depends: [] }, + { name: 'Amazon 1', slug: 'amazon-1', multiplier: 1, depends: [] }, + { name: 'Amazon 2', slug: 'amazon-2', multiplier: 2, depends: [] }, + { name: 'CentOS 6', slug: 'centos-6', multiplier: 3, depends: [] }, + { name: 'CentOS 7', slug: 'centos-7', multiplier: 4, depends: [] }, + { name: 'Debian 8', slug: 'debian-8', multiplier: 5, depends: [] }, + { name: 'Debian 9', slug: 'debian-9', multiplier: 6, depends: [] }, + { name: 'Fedora 28', slug: 'fedora-28', multiplier: 7, depends: ['Debian 9'] }, + { name: 'Fedora 29', slug: 'fedora-29', multiplier: 8, depends: ['Debian 8'] }, + { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 9, depends: ['CentOS 7'] }, + { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 10, depends: ['CentOS 6'] }, + { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', multiplier: 11, depends: ['Amazon 2'] }, + { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 12, depends: ['Amazon 1'] }, + { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 13, depends: ['Arch'] }, ]; local stable_distros = [ @@ -66,23 +66,12 @@ local Build(distro) = { local suites = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, steps: [ - { - name: 'throttle-build', - image: 'alpine', - commands: [ - std.format( - "sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", - { offset: 5 * std.length(suites) * distro.multiplier } - ), - ], - }, - ] + [ { name: suite.name, privileged: true, image: 'saltstack/drone-plugin-kitchen', depends_on: [ - 'throttle-build', + 'clone', ] + suite.depends, settings: { target: std.format('%s-%s', [suite.slug, distro.slug]), @@ -93,7 +82,7 @@ local Build(distro) = { ], depends_on: [ 'Lint', - ], + ] + distro.depends, }; diff --git a/.drone.yml b/.drone.yml index cf0a6b0..b92dca3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,11 +21,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -33,7 +28,7 @@ steps: target: py2-git-2017-7-arch privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -42,7 +37,7 @@ steps: target: py2-git-2018-3-arch privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -52,7 +47,7 @@ steps: target: py2-git-2019-2-arch privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) node: @@ -70,11 +65,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -82,7 +72,7 @@ steps: target: py2-git-2017-7-amazon-1 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -91,7 +81,7 @@ steps: target: py2-git-2018-3-amazon-1 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -101,7 +91,7 @@ steps: target: py2-git-2019-2-amazon-1 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -111,7 +101,7 @@ steps: target: py2-stable-2017-7-amazon-1 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -121,7 +111,7 @@ steps: target: py2-stable-2018-3-amazon-1 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -131,7 +121,7 @@ steps: target: py2-stable-2019-2-amazon-1 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -149,11 +139,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -161,7 +146,7 @@ steps: target: py2-git-2017-7-amazon-2 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -170,7 +155,7 @@ steps: target: py2-git-2018-3-amazon-2 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -180,7 +165,7 @@ steps: target: py2-git-2019-2-amazon-2 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -190,7 +175,7 @@ steps: target: py2-stable-2017-7-amazon-2 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -200,7 +185,7 @@ steps: target: py2-stable-2018-3-amazon-2 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -210,7 +195,7 @@ steps: target: py2-stable-2019-2-amazon-2 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -228,11 +213,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -240,7 +220,7 @@ steps: target: py2-git-2017-7-centos-6 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -249,7 +229,7 @@ steps: target: py2-git-2018-3-centos-6 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -259,7 +239,7 @@ steps: target: py2-git-2019-2-centos-6 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -269,7 +249,7 @@ steps: target: py2-stable-2017-7-centos-6 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -279,7 +259,7 @@ steps: target: py2-stable-2018-3-centos-6 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -289,7 +269,7 @@ steps: target: py2-stable-2019-2-centos-6 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -307,11 +287,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -319,7 +294,7 @@ steps: target: py2-git-2017-7-centos-7 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -328,7 +303,7 @@ steps: target: py2-git-2018-3-centos-7 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -338,7 +313,7 @@ steps: target: py2-git-2019-2-centos-7 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -348,7 +323,7 @@ steps: target: py2-stable-2017-7-centos-7 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -358,7 +333,7 @@ steps: target: py2-stable-2018-3-centos-7 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -368,7 +343,7 @@ steps: target: py2-stable-2019-2-centos-7 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -386,11 +361,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -398,7 +368,7 @@ steps: target: py2-git-2017-7-debian-8 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -407,7 +377,7 @@ steps: target: py2-git-2018-3-debian-8 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -417,7 +387,7 @@ steps: target: py2-git-2019-2-debian-8 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -427,7 +397,7 @@ steps: target: py2-stable-2017-7-debian-8 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -437,7 +407,7 @@ steps: target: py2-stable-2018-3-debian-8 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -447,7 +417,7 @@ steps: target: py2-stable-2019-2-debian-8 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -465,11 +435,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -477,7 +442,7 @@ steps: target: py2-git-2017-7-debian-9 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -486,7 +451,7 @@ steps: target: py2-git-2018-3-debian-9 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -496,7 +461,7 @@ steps: target: py2-git-2019-2-debian-9 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -506,7 +471,7 @@ steps: target: py2-stable-2017-7-debian-9 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -516,7 +481,7 @@ steps: target: py2-stable-2018-3-debian-9 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -526,7 +491,7 @@ steps: target: py2-stable-2019-2-debian-9 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -544,11 +509,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=105; echo Sleeping 105 seconds; sleep 105'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -556,7 +516,7 @@ steps: target: py2-git-2017-7-fedora-28 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -565,7 +525,7 @@ steps: target: py2-git-2018-3-fedora-28 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -575,7 +535,7 @@ steps: target: py2-git-2019-2-fedora-28 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) node: @@ -583,6 +543,7 @@ node: depends_on: - Lint +- Debian 9 --- kind: pipeline @@ -593,11 +554,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -605,7 +561,7 @@ steps: target: py2-git-2017-7-fedora-29 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -614,7 +570,7 @@ steps: target: py2-git-2018-3-fedora-29 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -624,7 +580,7 @@ steps: target: py2-git-2019-2-fedora-29 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) node: @@ -632,6 +588,7 @@ node: depends_on: - Lint +- Debian 8 --- kind: pipeline @@ -642,11 +599,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=135; echo Sleeping 135 seconds; sleep 135'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -654,7 +606,7 @@ steps: target: py2-git-2017-7-opensuse-15 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -663,7 +615,7 @@ steps: target: py2-git-2018-3-opensuse-15 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -673,7 +625,7 @@ steps: target: py2-git-2019-2-opensuse-15 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) node: @@ -681,6 +633,7 @@ node: depends_on: - Lint +- CentOS 7 --- kind: pipeline @@ -691,11 +644,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -703,7 +651,7 @@ steps: target: py2-git-2017-7-opensuse-42 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -712,7 +660,7 @@ steps: target: py2-git-2018-3-opensuse-42 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -722,7 +670,7 @@ steps: target: py2-git-2019-2-opensuse-42 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) node: @@ -730,6 +678,7 @@ node: depends_on: - Lint +- CentOS 6 --- kind: pipeline @@ -740,11 +689,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=330; echo Sleeping 330 seconds; sleep 330'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -752,7 +696,7 @@ steps: target: py2-git-2017-7-ubuntu-1404 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -761,7 +705,7 @@ steps: target: py2-git-2018-3-ubuntu-1404 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -771,7 +715,7 @@ steps: target: py2-git-2019-2-ubuntu-1404 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -781,7 +725,7 @@ steps: target: py2-stable-2017-7-ubuntu-1404 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -791,7 +735,7 @@ steps: target: py2-stable-2018-3-ubuntu-1404 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -801,7 +745,7 @@ steps: target: py2-stable-2019-2-ubuntu-1404 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -809,6 +753,7 @@ node: depends_on: - Lint +- Amazon 2 --- kind: pipeline @@ -819,11 +764,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=360; echo Sleeping 360 seconds; sleep 360'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -831,7 +771,7 @@ steps: target: py2-git-2017-7-ubuntu-1604 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -840,7 +780,7 @@ steps: target: py2-git-2018-3-ubuntu-1604 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -850,7 +790,7 @@ steps: target: py2-git-2019-2-ubuntu-1604 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -860,7 +800,7 @@ steps: target: py2-stable-2017-7-ubuntu-1604 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -870,7 +810,7 @@ steps: target: py2-stable-2018-3-ubuntu-1604 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -880,7 +820,7 @@ steps: target: py2-stable-2019-2-ubuntu-1604 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -888,6 +828,7 @@ node: depends_on: - Lint +- Amazon 1 --- kind: pipeline @@ -898,11 +839,6 @@ platform: arch: amd64 steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=390; echo Sleeping 390 seconds; sleep 390'" - - name: Py2 2017.7(Git) image: saltstack/drone-plugin-kitchen settings: @@ -910,7 +846,7 @@ steps: target: py2-git-2017-7-ubuntu-1804 privileged: true depends_on: - - throttle-build + - clone - name: Py2 2018.3(Git) image: saltstack/drone-plugin-kitchen @@ -919,7 +855,7 @@ steps: target: py2-git-2018-3-ubuntu-1804 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -929,7 +865,7 @@ steps: target: py2-git-2019-2-ubuntu-1804 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -939,7 +875,7 @@ steps: target: py2-stable-2017-7-ubuntu-1804 privileged: true depends_on: - - throttle-build + - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -949,7 +885,7 @@ steps: target: py2-stable-2018-3-ubuntu-1804 privileged: true depends_on: - - throttle-build + - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -959,7 +895,7 @@ steps: target: py2-stable-2019-2-ubuntu-1804 privileged: true depends_on: - - throttle-build + - clone - Py2 2019.2(Git) node: @@ -967,9 +903,10 @@ node: depends_on: - Lint +- Arch --- kind: signature -hmac: 4c93d5517a3c7f900b8a7fb0a4c61feeb4f2b521f5dfb2c214c472b8c0c61ea4 +hmac: 31c3ffeadce2453e88dd9c8e2af3dc659835c53e339a25f3ad3ef08d4d846383 ... From ca0503dcfd57c8c289eb02ae6c2793d94b49d1f2 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 15:18:41 +0100 Subject: [PATCH 69/84] Run docker as a service --- .drone.jsonnet | 32 +- .drone.yml | 1342 +++++++++++++++++++++++++++++++++++------------- 2 files changed, 1022 insertions(+), 352 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 9954dbb..d5da9ed 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -68,18 +68,38 @@ local Build(distro) = { steps: [ { name: suite.name, - privileged: true, - image: 'saltstack/drone-plugin-kitchen', + image: 'docker:edge-dind', + environment: { + DOCKER_HOST: 'tcp://docker:2375', + }, depends_on: [ 'clone', ] + suite.depends, - settings: { - target: std.format('%s-%s', [suite.slug, distro.slug]), - requirements: 'tests/requirements.txt', - }, + commands: [ + 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', + 'gem install bundler', + 'pip install -U pip', + 'pip install -r tests/requirements.txt', + 'bundle install --with docker --without opennebula ec2 windows vagrant', + "echo 'Waiting for docker to start'", + 'sleep 15', // sleep 5 # give docker enough time to start + 'docker ps -a', + std.format('bundle exec kitchen test %s-%s', [suite.slug, distro.slug]), + ], } for suite in suites ], + services: [ + { + name: 'docker', + image: 'docker:edge-dind', + privileged: true, + environment: {}, + command: [ + '--storage-driver=overlay2', + ], + }, + ], depends_on: [ 'Lint', ] + distro.depends, diff --git a/.drone.yml b/.drone.yml index b92dca3..04aa9e9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,34 +22,65 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-arch - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-arch + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-arch - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-arch + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-arch - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-arch + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -66,64 +97,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-amazon-1 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-amazon-1 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-amazon-1 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-amazon-1 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-amazon-1 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-amazon-1 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-1 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-amazon-1 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-1 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-amazon-1 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-1 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-amazon-1 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -140,64 +226,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-amazon-2 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-amazon-2 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-amazon-2 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-amazon-2 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-amazon-2 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-amazon-2 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -214,64 +355,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-centos-6 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-centos-6 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-centos-6 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-6 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-6 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-6 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -288,64 +484,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-centos-7 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-centos-7 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-centos-7 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-centos-7 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-centos-7 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-centos-7 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -362,64 +613,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-debian-8 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-debian-8 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-debian-8 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-8 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-8 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-8 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -436,64 +742,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-debian-9 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-debian-9 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-debian-9 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-debian-9 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-debian-9 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-debian-9 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -510,34 +871,65 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-fedora-28 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-fedora-28 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-fedora-28 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-fedora-28 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-fedora-28 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-fedora-28 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -555,34 +947,65 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-fedora-29 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-fedora-29 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-fedora-29 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-fedora-29 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-fedora-29 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-fedora-29 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -600,34 +1023,65 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-opensuse-15 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-opensuse-15 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-opensuse-15 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-opensuse-15 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-opensuse-15 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-opensuse-15 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -645,34 +1099,65 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-opensuse-42 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-opensuse-42 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-opensuse-42 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-opensuse-42 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-opensuse-42 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-opensuse-42 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -690,64 +1175,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1404 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-ubuntu-1404 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1404 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-ubuntu-1404 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1404 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-ubuntu-1404 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1404 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-ubuntu-1404 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1404 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-ubuntu-1404 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1404 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-ubuntu-1404 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -765,64 +1305,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1604 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1604 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1604 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1604 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1604 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1604 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -840,64 +1435,119 @@ platform: steps: - name: Py2 2017.7(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2017-7-ubuntu-1804 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2017-7-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - name: Py2 2018.3(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2018-3-ubuntu-1804 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2018-3-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2019.2(Git) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-git-2019-2-ubuntu-1804 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-git-2019-2-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2017.7(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2017-7-ubuntu-1804 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2017-7-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2017.7(Git) - name: Py2 2018.3(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2018-3-ubuntu-1804 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2018-3-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2018.3(Git) - name: Py2 2019.2(Stable) - image: saltstack/drone-plugin-kitchen - settings: - requirements: tests/requirements.txt - target: py2-stable-2019-2-ubuntu-1804 - privileged: true + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 15 + - docker ps -a + - bundle exec kitchen test py2-stable-2019-2-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 depends_on: - clone - Py2 2019.2(Git) +services: +- name: docker + image: docker:edge-dind + command: + - --storage-driver=overlay2 + privileged: true + node: project: open @@ -907,6 +1557,6 @@ depends_on: --- kind: signature -hmac: 31c3ffeadce2453e88dd9c8e2af3dc659835c53e339a25f3ad3ef08d4d846383 +hmac: cafe61d4887d61379d88ed9b0fab457a9558e1630a2f50a77e5d3af1c0f6e3ce ... From c701c65436459b48726cc6463b7d0ef65c1236ab Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 17:16:01 +0100 Subject: [PATCH 70/84] Bring back throtle step --- .drone.jsonnet | 15 ++- .drone.yml | 348 +++++++++++++++++++++++++++++-------------------- 2 files changed, 222 insertions(+), 141 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d5da9ed..dd0f32d 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -66,6 +66,17 @@ local Build(distro) = { local suites = if std.count(stable_distros, distro.slug) > 0 then git_suites + stable_suites else git_suites, steps: [ + { + name: 'throttle-build', + image: 'alpine', + commands: [ + std.format( + "sh -c 't=%(offset)s; echo Sleeping %(offset)s seconds; sleep %(offset)s'", + { offset: 5 * std.length(suites) * distro.multiplier } + ), + ], + }, + ] + [ { name: suite.name, image: 'docker:edge-dind', @@ -73,7 +84,7 @@ local Build(distro) = { DOCKER_HOST: 'tcp://docker:2375', }, depends_on: [ - 'clone', + 'throttle-build', ] + suite.depends, commands: [ 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', @@ -82,7 +93,7 @@ local Build(distro) = { 'pip install -r tests/requirements.txt', 'bundle install --with docker --without opennebula ec2 windows vagrant', "echo 'Waiting for docker to start'", - 'sleep 15', // sleep 5 # give docker enough time to start + 'sleep 10', // give docker enough time to start 'docker ps -a', std.format('bundle exec kitchen test %s-%s', [suite.slug, distro.slug]), ], diff --git a/.drone.yml b/.drone.yml index 04aa9e9..2e22271 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -30,13 +35,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -47,13 +52,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -65,13 +70,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) services: @@ -96,6 +101,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -105,13 +115,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-amazon-1 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -122,13 +132,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-amazon-1 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -140,13 +150,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-amazon-1 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -158,13 +168,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-amazon-1 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -176,13 +186,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-amazon-1 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -194,13 +204,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-amazon-1 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -225,6 +235,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -234,13 +249,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-amazon-2 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -251,13 +266,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-amazon-2 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -269,13 +284,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-amazon-2 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -287,13 +302,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-amazon-2 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -305,13 +320,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-amazon-2 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -323,13 +338,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-amazon-2 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -354,6 +369,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -363,13 +383,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -380,13 +400,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -398,13 +418,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -416,13 +436,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -434,13 +454,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -452,13 +472,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -483,6 +503,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -492,13 +517,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -509,13 +534,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -527,13 +552,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -545,13 +570,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -563,13 +588,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -581,13 +606,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -612,6 +637,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -621,13 +651,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -638,13 +668,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -656,13 +686,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -674,13 +704,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -692,13 +722,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -710,13 +740,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -741,6 +771,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -750,13 +785,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -767,13 +802,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -785,13 +820,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -803,13 +838,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -821,13 +856,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -839,13 +874,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -870,6 +905,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=105; echo Sleeping 105 seconds; sleep 105'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -879,13 +919,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -896,13 +936,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -914,13 +954,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) services: @@ -946,6 +986,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -955,13 +1000,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -972,13 +1017,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -990,13 +1035,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) services: @@ -1022,6 +1067,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=135; echo Sleeping 135 seconds; sleep 135'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -1031,13 +1081,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1048,13 +1098,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -1066,13 +1116,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) services: @@ -1098,6 +1148,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -1107,13 +1162,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1124,13 +1179,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -1142,13 +1197,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) services: @@ -1174,6 +1229,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=330; echo Sleeping 330 seconds; sleep 330'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -1183,13 +1243,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-ubuntu-1404 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1200,13 +1260,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-ubuntu-1404 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -1218,13 +1278,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-ubuntu-1404 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -1236,13 +1296,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-ubuntu-1404 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -1254,13 +1314,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-ubuntu-1404 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -1272,13 +1332,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-ubuntu-1404 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -1304,6 +1364,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=360; echo Sleeping 360 seconds; sleep 360'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -1313,13 +1378,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1330,13 +1395,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -1348,13 +1413,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -1366,13 +1431,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -1384,13 +1449,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -1402,13 +1467,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -1434,6 +1499,11 @@ platform: arch: amd64 steps: +- name: throttle-build + image: alpine + commands: + - "sh -c 't=390; echo Sleeping 390 seconds; sleep 390'" + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -1443,13 +1513,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2017-7-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1460,13 +1530,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2018-3-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2019.2(Git) @@ -1478,13 +1548,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-git-2019-2-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2017.7(Stable) @@ -1496,13 +1566,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2017-7-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2017.7(Git) - name: Py2 2018.3(Stable) @@ -1514,13 +1584,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2018-3-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2018.3(Git) - name: Py2 2019.2(Stable) @@ -1532,13 +1602,13 @@ steps: - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - - sleep 15 + - sleep 10 - docker ps -a - bundle exec kitchen test py2-stable-2019-2-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - - clone + - throttle-build - Py2 2019.2(Git) services: @@ -1557,6 +1627,6 @@ depends_on: --- kind: signature -hmac: cafe61d4887d61379d88ed9b0fab457a9558e1630a2f50a77e5d3af1c0f6e3ce +hmac: 0814fe03cbaad49e7e9f1aef5d50b1713503e4d745b80372d2c55b32dfffd5e5 ... From d64bce31e00ef035769fc2893c18b9fbdf308bc6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 14 Apr 2019 18:58:51 +0100 Subject: [PATCH 71/84] Remove amazon bootstraps for now --- .drone.jsonnet | 18 +-- .drone.yml | 291 ++----------------------------------------------- 2 files changed, 17 insertions(+), 292 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index dd0f32d..b9c1007 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -13,19 +13,19 @@ local stable_suites = [ local distros = [ { name: 'Arch', slug: 'arch', multiplier: 0, depends: [] }, - { name: 'Amazon 1', slug: 'amazon-1', multiplier: 1, depends: [] }, - { name: 'Amazon 2', slug: 'amazon-2', multiplier: 2, depends: [] }, + // { name: 'Amazon 1', slug: 'amazon-1', multiplier: 1, depends: [] }, + // { name: 'Amazon 2', slug: 'amazon-2', multiplier: 2, depends: [] }, { name: 'CentOS 6', slug: 'centos-6', multiplier: 3, depends: [] }, { name: 'CentOS 7', slug: 'centos-7', multiplier: 4, depends: [] }, { name: 'Debian 8', slug: 'debian-8', multiplier: 5, depends: [] }, { name: 'Debian 9', slug: 'debian-9', multiplier: 6, depends: [] }, - { name: 'Fedora 28', slug: 'fedora-28', multiplier: 7, depends: ['Debian 9'] }, - { name: 'Fedora 29', slug: 'fedora-29', multiplier: 8, depends: ['Debian 8'] }, - { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 9, depends: ['CentOS 7'] }, - { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 10, depends: ['CentOS 6'] }, - { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', multiplier: 11, depends: ['Amazon 2'] }, - { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 12, depends: ['Amazon 1'] }, - { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 13, depends: ['Arch'] }, + { name: 'Fedora 28', slug: 'fedora-28', multiplier: 6, depends: [] }, + { name: 'Fedora 29', slug: 'fedora-29', multiplier: 5, depends: [] }, + { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 4, depends: [] }, + { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 3, depends: [] }, + { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', multiplier: 2, depends: [] }, + { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] }, + { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] }, ]; local stable_distros = [ diff --git a/.drone.yml b/.drone.yml index 2e22271..a68e822 100644 --- a/.drone.yml +++ b/.drone.yml @@ -92,274 +92,6 @@ node: depends_on: - Lint ---- -kind: pipeline -name: Amazon 1 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" - -- name: Py2 2017.7(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2017-7-amazon-1 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2018-3-amazon-1 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2017.7(Git) - -- name: Py2 2019.2(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2019-2-amazon-1 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2018.3(Git) - -- name: Py2 2017.7(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2017-7-amazon-1 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2017.7(Git) - -- name: Py2 2018.3(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2018-3-amazon-1 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2018.3(Git) - -- name: Py2 2019.2(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2019-2-amazon-1 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2019.2(Git) - -services: -- name: docker - image: docker:edge-dind - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - ---- -kind: pipeline -name: Amazon 2 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - -- name: Py2 2017.7(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2017-7-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2018-3-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2017.7(Git) - -- name: Py2 2019.2(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2019-2-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2018.3(Git) - -- name: Py2 2017.7(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2017-7-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2017.7(Git) - -- name: Py2 2018.3(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2018-3-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2018.3(Git) - -- name: Py2 2019.2(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2019-2-amazon-2 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2019.2(Git) - -services: -- name: docker - image: docker:edge-dind - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - --- kind: pipeline name: CentOS 6 @@ -908,7 +640,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=105; echo Sleeping 105 seconds; sleep 105'" + - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - name: Py2 2017.7(Git) image: docker:edge-dind @@ -975,7 +707,6 @@ node: depends_on: - Lint -- Debian 9 --- kind: pipeline @@ -989,7 +720,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" + - "sh -c 't=75; echo Sleeping 75 seconds; sleep 75'" - name: Py2 2017.7(Git) image: docker:edge-dind @@ -1056,7 +787,6 @@ node: depends_on: - Lint -- Debian 8 --- kind: pipeline @@ -1070,7 +800,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=135; echo Sleeping 135 seconds; sleep 135'" + - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - name: Py2 2017.7(Git) image: docker:edge-dind @@ -1137,7 +867,6 @@ node: depends_on: - Lint -- CentOS 7 --- kind: pipeline @@ -1151,7 +880,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" + - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" - name: Py2 2017.7(Git) image: docker:edge-dind @@ -1218,7 +947,6 @@ node: depends_on: - Lint -- CentOS 6 --- kind: pipeline @@ -1232,7 +960,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=330; echo Sleeping 330 seconds; sleep 330'" + - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - name: Py2 2017.7(Git) image: docker:edge-dind @@ -1353,7 +1081,6 @@ node: depends_on: - Lint -- Amazon 2 --- kind: pipeline @@ -1367,7 +1094,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=360; echo Sleeping 360 seconds; sleep 360'" + - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" - name: Py2 2017.7(Git) image: docker:edge-dind @@ -1488,7 +1215,6 @@ node: depends_on: - Lint -- Amazon 1 --- kind: pipeline @@ -1502,7 +1228,7 @@ steps: - name: throttle-build image: alpine commands: - - "sh -c 't=390; echo Sleeping 390 seconds; sleep 390'" + - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" - name: Py2 2017.7(Git) image: docker:edge-dind @@ -1623,10 +1349,9 @@ node: depends_on: - Lint -- Arch --- kind: signature -hmac: 0814fe03cbaad49e7e9f1aef5d50b1713503e4d745b80372d2c55b32dfffd5e5 +hmac: 5f368b5d2667f2550e77b81876bc5b1fb9f703944b08b845a6736b6e0a161e95 ... From e302e463bcf73e2f49daed98cead90e34daf1060 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 14:16:07 +0100 Subject: [PATCH 72/84] Stop building Ubuntu 14.04 --- .drone.jsonnet | 2 - .drone.yml | 136 +------------------------------------------------ .kitchen.yml | 9 ---- 3 files changed, 1 insertion(+), 146 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index b9c1007..d43cb1a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -23,7 +23,6 @@ local distros = [ { name: 'Fedora 29', slug: 'fedora-29', multiplier: 5, depends: [] }, { name: 'Opensuse 15.0', slug: 'opensuse-15', multiplier: 4, depends: [] }, { name: 'Opensuse 42.3', slug: 'opensuse-42', multiplier: 3, depends: [] }, - { name: 'Ubuntu 14.04', slug: 'ubuntu-1404', multiplier: 2, depends: [] }, { name: 'Ubuntu 16.04', slug: 'ubuntu-1604', multiplier: 1, depends: [] }, { name: 'Ubuntu 18.04', slug: 'ubuntu-1804', multiplier: 0, depends: [] }, ]; @@ -35,7 +34,6 @@ local stable_distros = [ 'centos-7', 'debian-8', 'debian-9', - 'ubuntu-1404', 'ubuntu-1604', 'ubuntu-1804', ]; diff --git a/.drone.yml b/.drone.yml index a68e822..1c865e1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -948,140 +948,6 @@ node: depends_on: - Lint ---- -kind: pipeline -name: Ubuntu 14.04 - -platform: - os: linux - arch: amd64 - -steps: -- name: throttle-build - image: alpine - commands: - - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - -- name: Py2 2017.7(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2017-7-ubuntu-1404 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - -- name: Py2 2018.3(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2018-3-ubuntu-1404 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2017.7(Git) - -- name: Py2 2019.2(Git) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-git-2019-2-ubuntu-1404 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2018.3(Git) - -- name: Py2 2017.7(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2017-7-ubuntu-1404 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2017.7(Git) - -- name: Py2 2018.3(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2018-3-ubuntu-1404 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2018.3(Git) - -- name: Py2 2019.2(Stable) - image: docker:edge-dind - commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - - pip install -U pip - - pip install -r tests/requirements.txt - - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - - bundle exec kitchen test py2-stable-2019-2-ubuntu-1404 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - Py2 2019.2(Git) - -services: -- name: docker - image: docker:edge-dind - command: - - --storage-driver=overlay2 - privileged: true - -node: - project: open - -depends_on: -- Lint - --- kind: pipeline name: Ubuntu 16.04 @@ -1352,6 +1218,6 @@ depends_on: --- kind: signature -hmac: 5f368b5d2667f2550e77b81876bc5b1fb9f703944b08b845a6736b6e0a161e95 +hmac: b342a68e9394efa7475353f4d27a51021bb203b6ac54f82c7f7285d18a47a2a0 ... diff --git a/.kitchen.yml b/.kitchen.yml index 8e31e10..d8c5217 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -95,12 +95,6 @@ platforms: - name: ubuntu-16.04 driver_config: run_command: /lib/systemd/systemd - - name: ubuntu-14.04 - driver_config: - run_command: /sbin/init - provision_command: - - rm -f /sbin/initctl - - dpkg-divert --local --rename --remove /sbin/initctl suites: - name: py2-git-2017-7 @@ -122,7 +116,6 @@ suites: - fedora-29 - opensuse-15 - opensuse-42 - - ubuntu-1404 - name: py2-stable-2018-3 provisioner: salt_version: 2018.3 @@ -133,7 +126,6 @@ suites: - fedora-29 - opensuse-15 - opensuse-42 - - ubuntu-1404 - name: py2-stable-2019-2 provisioner: salt_version: 2019.2 @@ -144,7 +136,6 @@ suites: - fedora-29 - opensuse-15 - opensuse-42 - - ubuntu-1404 verifier: name: shell From 611a2cf3a2476b72046a05b2a5849562ad3b2592 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 14:40:10 +0100 Subject: [PATCH 73/84] Drop suite depends --- .drone.jsonnet | 2 +- .drone.yml | 42 +----------------------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d43cb1a..86c701e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -83,7 +83,7 @@ local Build(distro) = { }, depends_on: [ 'throttle-build', - ] + suite.depends, + ], commands: [ 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', 'gem install bundler', diff --git a/.drone.yml b/.drone.yml index 1c865e1..201d281 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,7 +59,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -77,7 +76,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) services: - name: docker @@ -139,7 +137,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -157,7 +154,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -175,7 +171,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -193,7 +188,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -211,7 +205,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2019.2(Git) services: - name: docker @@ -273,7 +266,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -291,7 +283,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -309,7 +300,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -327,7 +317,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -345,7 +334,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2019.2(Git) services: - name: docker @@ -407,7 +395,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -425,7 +412,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -443,7 +429,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -461,7 +446,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -479,7 +463,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2019.2(Git) services: - name: docker @@ -541,7 +524,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -559,7 +541,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -577,7 +558,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -595,7 +575,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -613,7 +592,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2019.2(Git) services: - name: docker @@ -675,7 +653,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -693,7 +670,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) services: - name: docker @@ -755,7 +731,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -773,7 +748,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) services: - name: docker @@ -835,7 +809,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -853,7 +826,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) services: - name: docker @@ -915,7 +887,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -933,7 +904,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) services: - name: docker @@ -995,7 +965,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -1013,7 +982,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -1031,7 +999,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -1049,7 +1016,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -1067,7 +1033,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2019.2(Git) services: - name: docker @@ -1129,7 +1094,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2019.2(Git) image: docker:edge-dind @@ -1147,7 +1111,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -1165,7 +1128,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2017.7(Git) - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -1183,7 +1145,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2018.3(Git) - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -1201,7 +1162,6 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Py2 2019.2(Git) services: - name: docker @@ -1218,6 +1178,6 @@ depends_on: --- kind: signature -hmac: b342a68e9394efa7475353f4d27a51021bb203b6ac54f82c7f7285d18a47a2a0 +hmac: 7ecfc845f0ee48492a8c3c42d38e9cc51f2e3ed5507de90f408c09a3a124c8c5 ... From c4d5dc364bf6330129f2b343563ce823e25308f8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 15:00:30 +0100 Subject: [PATCH 74/84] Converge as a step before building --- .drone.jsonnet | 25 +++- .drone.yml | 371 +++++++++++++++++++++++++++++-------------------- 2 files changed, 238 insertions(+), 158 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 86c701e..259b2d5 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -74,9 +74,8 @@ local Build(distro) = { ), ], }, - ] + [ { - name: suite.name, + name: std.format('Converge %s', [distro.name]), image: 'docker:edge-dind', environment: { DOCKER_HOST: 'tcp://docker:2375', @@ -87,12 +86,30 @@ local Build(distro) = { commands: [ 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', 'gem install bundler', - 'pip install -U pip', - 'pip install -r tests/requirements.txt', 'bundle install --with docker --without opennebula ec2 windows vagrant', "echo 'Waiting for docker to start'", 'sleep 10', // give docker enough time to start 'docker ps -a', + std.format('bundle exec kitchen converge -c %s %s', [std.length(suites), distro.slug]), + ], + }, + ] + [ + { + name: suite.name, + image: 'docker:edge-dind', + environment: { + DOCKER_HOST: 'tcp://docker:2375', + }, + depends_on: [ + 'throttle-build', + std.format('Converge %s', [distro.name]), + ], + commands: [ + 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', + 'gem install bundler', + 'pip install -U pip', + 'pip install -r tests/requirements.txt', + 'bundle install --with docker --without opennebula ec2 windows vagrant', std.format('bundle exec kitchen test %s-%s', [suite.slug, distro.slug]), ], } diff --git a/.drone.yml b/.drone.yml index 201d281..1142e68 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,6 +26,21 @@ steps: commands: - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" +- name: Converge Arch + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 3 arch + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -34,14 +49,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Arch - name: Py2 2018.3(Git) image: docker:edge-dind @@ -51,14 +64,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Arch - name: Py2 2019.2(Git) image: docker:edge-dind @@ -68,14 +79,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Arch services: - name: docker @@ -104,6 +113,21 @@ steps: commands: - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" +- name: Converge CentOS 6 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 6 centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -112,14 +136,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 6 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -129,14 +151,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 6 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -146,14 +166,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 6 - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -163,14 +181,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2017-7-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 6 - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -180,14 +196,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2018-3-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 6 - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -197,14 +211,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2019-2-centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 6 services: - name: docker @@ -233,6 +245,21 @@ steps: commands: - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" +- name: Converge CentOS 7 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 6 centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -241,14 +268,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 7 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -258,14 +283,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 7 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -275,14 +298,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 7 - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -292,14 +313,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2017-7-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 7 - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -309,14 +328,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2018-3-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 7 - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -326,14 +343,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2019-2-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge CentOS 7 services: - name: docker @@ -362,6 +377,21 @@ steps: commands: - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" +- name: Converge Debian 8 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 6 debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -370,14 +400,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 8 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -387,14 +415,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 8 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -404,14 +430,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 8 - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -421,14 +445,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2017-7-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 8 - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -438,14 +460,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2018-3-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 8 - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -455,14 +475,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2019-2-debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 8 services: - name: docker @@ -491,6 +509,21 @@ steps: commands: - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" +- name: Converge Debian 9 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 6 debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -499,14 +532,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 9 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -516,14 +547,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 9 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -533,14 +562,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 9 - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -550,14 +577,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2017-7-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 9 - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -567,14 +592,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2018-3-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 9 - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -584,14 +607,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2019-2-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Debian 9 services: - name: docker @@ -620,6 +641,21 @@ steps: commands: - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" +- name: Converge Fedora 28 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 3 fedora-28 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -628,14 +664,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Fedora 28 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -645,14 +679,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Fedora 28 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -662,14 +694,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Fedora 28 services: - name: docker @@ -698,6 +728,21 @@ steps: commands: - "sh -c 't=75; echo Sleeping 75 seconds; sleep 75'" +- name: Converge Fedora 29 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 3 fedora-29 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -706,14 +751,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Fedora 29 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -723,14 +766,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Fedora 29 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -740,14 +781,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Fedora 29 services: - name: docker @@ -776,6 +815,21 @@ steps: commands: - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" +- name: Converge Opensuse 15.0 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 3 opensuse-15 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -784,14 +838,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Opensuse 15.0 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -801,14 +853,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Opensuse 15.0 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -818,14 +868,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Opensuse 15.0 services: - name: docker @@ -854,6 +902,21 @@ steps: commands: - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" +- name: Converge Opensuse 42.3 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 3 opensuse-42 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -862,14 +925,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Opensuse 42.3 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -879,14 +940,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Opensuse 42.3 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -896,14 +955,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Opensuse 42.3 services: - name: docker @@ -932,6 +989,21 @@ steps: commands: - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" +- name: Converge Ubuntu 16.04 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 6 ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -940,14 +1012,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 16.04 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -957,14 +1027,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 16.04 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -974,14 +1042,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 16.04 - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -991,14 +1057,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2017-7-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 16.04 - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -1008,14 +1072,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2018-3-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 16.04 - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -1025,14 +1087,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2019-2-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 16.04 services: - name: docker @@ -1061,6 +1121,21 @@ steps: commands: - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" +- name: Converge Ubuntu 18.04 + image: docker:edge-dind + commands: + - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev + - gem install bundler + - bundle install --with docker --without opennebula ec2 windows vagrant + - "echo 'Waiting for docker to start'" + - sleep 10 + - docker ps -a + - bundle exec kitchen converge -c 6 ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - name: Py2 2017.7(Git) image: docker:edge-dind commands: @@ -1069,14 +1144,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2017-7-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 18.04 - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1086,14 +1159,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2018-3-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 18.04 - name: Py2 2019.2(Git) image: docker:edge-dind @@ -1103,14 +1174,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-git-2019-2-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 18.04 - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -1120,14 +1189,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2017-7-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 18.04 - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -1137,14 +1204,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2018-3-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 18.04 - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -1154,14 +1219,12 @@ steps: - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant - - "echo 'Waiting for docker to start'" - - sleep 10 - - docker ps -a - bundle exec kitchen test py2-stable-2019-2-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build + - Converge Ubuntu 18.04 services: - name: docker @@ -1178,6 +1241,6 @@ depends_on: --- kind: signature -hmac: 7ecfc845f0ee48492a8c3c42d38e9cc51f2e3ed5507de90f408c09a3a124c8c5 +hmac: 38fde6eb518c687ec652dcb1b93d56105d00ff87a7fa705658dfc3d1ada513d7 ... From 4bf52b7604a8767a752e4bbd73387737d9233150 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 15:01:21 +0100 Subject: [PATCH 75/84] No concurrent converges --- .drone.jsonnet | 2 +- .drone.yml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 259b2d5..0977c4b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -90,7 +90,7 @@ local Build(distro) = { "echo 'Waiting for docker to start'", 'sleep 10', // give docker enough time to start 'docker ps -a', - std.format('bundle exec kitchen converge -c %s %s', [std.length(suites), distro.slug]), + std.format('bundle exec kitchen converge %s', [distro.slug]), ], }, ] + [ diff --git a/.drone.yml b/.drone.yml index 1142e68..039a42f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,7 +35,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 3 arch + - bundle exec kitchen converge arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -122,7 +122,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 6 centos-6 + - bundle exec kitchen converge centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -254,7 +254,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 6 centos-7 + - bundle exec kitchen converge centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -386,7 +386,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 6 debian-8 + - bundle exec kitchen converge debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -518,7 +518,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 6 debian-9 + - bundle exec kitchen converge debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -650,7 +650,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 3 fedora-28 + - bundle exec kitchen converge fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -737,7 +737,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 3 fedora-29 + - bundle exec kitchen converge fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -824,7 +824,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 3 opensuse-15 + - bundle exec kitchen converge opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -911,7 +911,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 3 opensuse-42 + - bundle exec kitchen converge opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -998,7 +998,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 6 ubuntu-1604 + - bundle exec kitchen converge ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1130,7 +1130,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge -c 6 ubuntu-1804 + - bundle exec kitchen converge ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1241,6 +1241,6 @@ depends_on: --- kind: signature -hmac: 38fde6eb518c687ec652dcb1b93d56105d00ff87a7fa705658dfc3d1ada513d7 +hmac: cf6f4f59490e8b3adf0f1f0976939d1381b62ec2a4a94009fd6cd4681a7ca61a ... From 8959d1b385b678da8b9d7baa43a4235c834f7193 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 15:15:10 +0100 Subject: [PATCH 76/84] Create instead of converge --- .drone.jsonnet | 6 +- .drone.yml | 148 ++++++++++++++++++++++++------------------------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0977c4b..baf54d8 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -75,7 +75,7 @@ local Build(distro) = { ], }, { - name: std.format('Converge %s', [distro.name]), + name: 'create', image: 'docker:edge-dind', environment: { DOCKER_HOST: 'tcp://docker:2375', @@ -90,7 +90,7 @@ local Build(distro) = { "echo 'Waiting for docker to start'", 'sleep 10', // give docker enough time to start 'docker ps -a', - std.format('bundle exec kitchen converge %s', [distro.slug]), + std.format('bundle exec kitchen create %s', [distro.slug]), ], }, ] + [ @@ -102,7 +102,7 @@ local Build(distro) = { }, depends_on: [ 'throttle-build', - std.format('Converge %s', [distro.name]), + 'create', ], commands: [ 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', diff --git a/.drone.yml b/.drone.yml index 039a42f..0a544d4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,7 +26,7 @@ steps: commands: - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" -- name: Converge Arch +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -35,7 +35,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge arch + - bundle exec kitchen create arch environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -54,7 +54,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Arch + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -69,7 +69,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Arch + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -84,7 +84,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Arch + - create services: - name: docker @@ -113,7 +113,7 @@ steps: commands: - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" -- name: Converge CentOS 6 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -122,7 +122,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge centos-6 + - bundle exec kitchen create centos-6 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -141,7 +141,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 6 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -156,7 +156,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 6 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -171,7 +171,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 6 + - create - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -186,7 +186,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 6 + - create - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -201,7 +201,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 6 + - create - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -216,7 +216,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 6 + - create services: - name: docker @@ -245,7 +245,7 @@ steps: commands: - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" -- name: Converge CentOS 7 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -254,7 +254,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge centos-7 + - bundle exec kitchen create centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -273,7 +273,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 7 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -288,7 +288,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 7 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -303,7 +303,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 7 + - create - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -318,7 +318,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 7 + - create - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -333,7 +333,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 7 + - create - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -348,7 +348,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge CentOS 7 + - create services: - name: docker @@ -377,7 +377,7 @@ steps: commands: - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" -- name: Converge Debian 8 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -386,7 +386,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge debian-8 + - bundle exec kitchen create debian-8 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -405,7 +405,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 8 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -420,7 +420,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 8 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -435,7 +435,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 8 + - create - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -450,7 +450,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 8 + - create - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -465,7 +465,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 8 + - create - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -480,7 +480,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 8 + - create services: - name: docker @@ -509,7 +509,7 @@ steps: commands: - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" -- name: Converge Debian 9 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -518,7 +518,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge debian-9 + - bundle exec kitchen create debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -537,7 +537,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 9 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -552,7 +552,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 9 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -567,7 +567,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 9 + - create - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -582,7 +582,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 9 + - create - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -597,7 +597,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 9 + - create - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -612,7 +612,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Debian 9 + - create services: - name: docker @@ -641,7 +641,7 @@ steps: commands: - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" -- name: Converge Fedora 28 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -650,7 +650,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge fedora-28 + - bundle exec kitchen create fedora-28 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -669,7 +669,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Fedora 28 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -684,7 +684,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Fedora 28 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -699,7 +699,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Fedora 28 + - create services: - name: docker @@ -728,7 +728,7 @@ steps: commands: - "sh -c 't=75; echo Sleeping 75 seconds; sleep 75'" -- name: Converge Fedora 29 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -737,7 +737,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge fedora-29 + - bundle exec kitchen create fedora-29 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -756,7 +756,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Fedora 29 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -771,7 +771,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Fedora 29 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -786,7 +786,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Fedora 29 + - create services: - name: docker @@ -815,7 +815,7 @@ steps: commands: - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" -- name: Converge Opensuse 15.0 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -824,7 +824,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge opensuse-15 + - bundle exec kitchen create opensuse-15 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -843,7 +843,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Opensuse 15.0 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -858,7 +858,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Opensuse 15.0 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -873,7 +873,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Opensuse 15.0 + - create services: - name: docker @@ -902,7 +902,7 @@ steps: commands: - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" -- name: Converge Opensuse 42.3 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -911,7 +911,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge opensuse-42 + - bundle exec kitchen create opensuse-42 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -930,7 +930,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Opensuse 42.3 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -945,7 +945,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Opensuse 42.3 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -960,7 +960,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Opensuse 42.3 + - create services: - name: docker @@ -989,7 +989,7 @@ steps: commands: - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" -- name: Converge Ubuntu 16.04 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -998,7 +998,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge ubuntu-1604 + - bundle exec kitchen create ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1017,7 +1017,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 16.04 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1032,7 +1032,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 16.04 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -1047,7 +1047,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 16.04 + - create - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -1062,7 +1062,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 16.04 + - create - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -1077,7 +1077,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 16.04 + - create - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -1092,7 +1092,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 16.04 + - create services: - name: docker @@ -1121,7 +1121,7 @@ steps: commands: - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" -- name: Converge Ubuntu 18.04 +- name: create image: docker:edge-dind commands: - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev @@ -1130,7 +1130,7 @@ steps: - "echo 'Waiting for docker to start'" - sleep 10 - docker ps -a - - bundle exec kitchen converge ubuntu-1804 + - bundle exec kitchen create ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1149,7 +1149,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 18.04 + - create - name: Py2 2018.3(Git) image: docker:edge-dind @@ -1164,7 +1164,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 18.04 + - create - name: Py2 2019.2(Git) image: docker:edge-dind @@ -1179,7 +1179,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 18.04 + - create - name: Py2 2017.7(Stable) image: docker:edge-dind @@ -1194,7 +1194,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 18.04 + - create - name: Py2 2018.3(Stable) image: docker:edge-dind @@ -1209,7 +1209,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 18.04 + - create - name: Py2 2019.2(Stable) image: docker:edge-dind @@ -1224,7 +1224,7 @@ steps: DOCKER_HOST: tcp://docker:2375 depends_on: - throttle-build - - Converge Ubuntu 18.04 + - create services: - name: docker @@ -1241,6 +1241,6 @@ depends_on: --- kind: signature -hmac: cf6f4f59490e8b3adf0f1f0976939d1381b62ec2a4a94009fd6cd4681a7ca61a +hmac: f0ec6791f3166a8e1ddd866184713eeb670d93caefc3d1837235fe8abcb48049 ... From 93ef02dcbda730f1b4658e34a2936c42928ecd68 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 14:21:23 +0100 Subject: [PATCH 77/84] Consistent spacing --- bootstrap-salt.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a0255fe..317ea1e 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1830,18 +1830,18 @@ __wait_for_apt(){ # Make sure we're not waiting on a lock while [ $APT_RETURN -ne 0 ] && grep -q '^E: Could not get lock' "$APT_ERR"; do - echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..." - sleep 1 - WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1)) + echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..." + sleep 1 + WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1)) - if [ "$WAIT_TIMEOUT" -eq 0 ]; then - echoerror "Apt, apt-get, aptitude, or dpkg process is taking too long." - echoerror "Bootstrap script cannot proceed. Aborting." - return 1 - else - "${@}" 2>"$APT_ERR" - APT_RETURN=$? - fi + if [ "$WAIT_TIMEOUT" -eq 0 ]; then + echoerror "Apt, apt-get, aptitude, or dpkg process is taking too long." + echoerror "Bootstrap script cannot proceed. Aborting." + return 1 + else + "${@}" 2>"$APT_ERR" + APT_RETURN=$? + fi done return $APT_RETURN @@ -7136,3 +7136,5 @@ else fi exit 0 + +# vim: set sts=4 ts=4 et From a8c640a6c3c7b6bb14b91fb7d641d6961eb15283 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 14:29:12 +0100 Subject: [PATCH 78/84] Do not install m2crypto 0.33.0, it fails to install --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 317ea1e..8b8b8bc 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3835,7 +3835,7 @@ install_centos_git_deps() { if [ "${_PY_EXE}" != "" ] && [ "$_PIP_ALLOWED" -eq "$BS_TRUE" ]; then # If "-x" is defined, install dependencies with pip based on the Python version given. - _PIP_PACKAGES="m2crypto jinja2 msgpack-python pycrypto PyYAML tornado<5.0 zmq futures>=2.0" + _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 From ca974fba21212c2aa6cc2983a319a5d068065b98 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 16:10:06 +0100 Subject: [PATCH 79/84] No global variables --- tests/conftest.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 6dadeb5..07c2ab9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,16 +2,15 @@ import os import pytest import testinfra -if os.environ.get('KITCHEN_USERNAME') == 'vagrant': - if 'windows' in os.environ.get('KITCHEN_INSTANCE'): - test_host = testinfra.get_host('winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}'.format(**os.environ), no_ssl=True) - else: - test_host = testinfra.get_host('paramiko://{KITCHEN_USERNAME}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}'.format(**os.environ), - ssh_identity_file=os.environ.get('KITCHEN_SSH_KEY')) -else: - test_host = testinfra.get_host('docker://{KITCHEN_USERNAME}@{KITCHEN_CONTAINER_ID}'.format(**os.environ)) - -@pytest.fixture +@pytest.fixture(scope='session') def host(): - return test_host + if os.environ.get('KITCHEN_USERNAME') == 'vagrant': + if 'windows' in os.environ.get('KITCHEN_INSTANCE'): + return testinfra.get_host( + 'winrm://{KITCHEN_USERNAME}:{KITCHEN_PASSWORD}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}'.format(**os.environ), + no_ssl=True) + return testinfra.get_host( + 'paramiko://{KITCHEN_USERNAME}@{KITCHEN_HOSTNAME}:{KITCHEN_PORT}'.format(**os.environ), + ssh_identity_file=os.environ.get('KITCHEN_SSH_KEY')) + return testinfra.get_host('docker://{KITCHEN_USERNAME}@{KITCHEN_CONTAINER_ID}'.format(**os.environ)) From b1901c5b013a2f2c7c99e5d3312297d31fce3e6b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 16:10:52 +0100 Subject: [PATCH 80/84] More relaxed timeouts --- tests/integration/test_connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/test_connection.py b/tests/integration/test_connection.py index bcf986a..c32f88f 100644 --- a/tests/integration/test_connection.py +++ b/tests/integration/test_connection.py @@ -4,4 +4,4 @@ import pytest def test_ping(host): with host.sudo(): - assert host.salt('test.ping') + assert host.salt('test.ping', '--timeout=120') From 902334d3f2f0e1f166d4841704a3e1ade452a869 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 16:15:59 +0100 Subject: [PATCH 81/84] Only install pywinrm on windows --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 3a85dc5..cabcdee 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ testinfra paramiko -pywinrm +pywinrm; sys.platform == 'win32' six>=1.10.0 From a00bddefbd7d72f5da53ca10ae3513b1fbb7889a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 May 2019 16:41:38 +0100 Subject: [PATCH 82/84] Use our own docker container image to speed up the process --- .drone.jsonnet | 10 +- .drone.yml | 272 +++++++++++----------------------------- Dockerfile.drone-builds | 19 +++ 3 files changed, 96 insertions(+), 205 deletions(-) create mode 100644 Dockerfile.drone-builds diff --git a/.drone.jsonnet b/.drone.jsonnet index baf54d8..1e5c1ae 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -76,7 +76,7 @@ local Build(distro) = { }, { name: 'create', - image: 'docker:edge-dind', + image: 'saltstack/drone-salt-bootstrap-testing', environment: { DOCKER_HOST: 'tcp://docker:2375', }, @@ -84,8 +84,6 @@ local Build(distro) = { 'throttle-build', ], commands: [ - 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', - 'gem install bundler', 'bundle install --with docker --without opennebula ec2 windows vagrant', "echo 'Waiting for docker to start'", 'sleep 10', // give docker enough time to start @@ -96,7 +94,7 @@ local Build(distro) = { ] + [ { name: suite.name, - image: 'docker:edge-dind', + image: 'saltstack/drone-salt-bootstrap-testing', environment: { DOCKER_HOST: 'tcp://docker:2375', }, @@ -105,8 +103,6 @@ local Build(distro) = { 'create', ], commands: [ - 'apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev', - 'gem install bundler', 'pip install -U pip', 'pip install -r tests/requirements.txt', 'bundle install --with docker --without opennebula ec2 windows vagrant', @@ -118,7 +114,7 @@ local Build(distro) = { services: [ { name: 'docker', - image: 'docker:edge-dind', + image: 'saltstack/drone-salt-bootstrap-testing', privileged: true, environment: {}, command: [ diff --git a/.drone.yml b/.drone.yml index 0a544d4..521bd89 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,10 +27,8 @@ steps: - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -42,10 +40,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -57,10 +53,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -72,10 +66,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -88,7 +80,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -114,10 +106,8 @@ steps: - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -129,10 +119,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -144,10 +132,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -159,10 +145,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -174,10 +158,8 @@ steps: - create - name: Py2 2017.7(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -189,10 +171,8 @@ steps: - create - name: Py2 2018.3(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -204,10 +184,8 @@ steps: - create - name: Py2 2019.2(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -220,7 +198,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -246,10 +224,8 @@ steps: - "sh -c 't=120; echo Sleeping 120 seconds; sleep 120'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -261,10 +237,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -276,10 +250,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -291,10 +263,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -306,10 +276,8 @@ steps: - create - name: Py2 2017.7(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -321,10 +289,8 @@ steps: - create - name: Py2 2018.3(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -336,10 +302,8 @@ steps: - create - name: Py2 2019.2(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -352,7 +316,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -378,10 +342,8 @@ steps: - "sh -c 't=150; echo Sleeping 150 seconds; sleep 150'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -393,10 +355,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -408,10 +368,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -423,10 +381,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -438,10 +394,8 @@ steps: - create - name: Py2 2017.7(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -453,10 +407,8 @@ steps: - create - name: Py2 2018.3(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -468,10 +420,8 @@ steps: - create - name: Py2 2019.2(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -484,7 +434,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -510,10 +460,8 @@ steps: - "sh -c 't=180; echo Sleeping 180 seconds; sleep 180'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -525,10 +473,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -540,10 +486,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -555,10 +499,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -570,10 +512,8 @@ steps: - create - name: Py2 2017.7(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -585,10 +525,8 @@ steps: - create - name: Py2 2018.3(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -600,10 +538,8 @@ steps: - create - name: Py2 2019.2(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -616,7 +552,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -642,10 +578,8 @@ steps: - "sh -c 't=90; echo Sleeping 90 seconds; sleep 90'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -657,10 +591,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -672,10 +604,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -687,10 +617,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -703,7 +631,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -729,10 +657,8 @@ steps: - "sh -c 't=75; echo Sleeping 75 seconds; sleep 75'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -744,10 +670,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -759,10 +683,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -774,10 +696,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -790,7 +710,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -816,10 +736,8 @@ steps: - "sh -c 't=60; echo Sleeping 60 seconds; sleep 60'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -831,10 +749,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -846,10 +762,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -861,10 +775,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -877,7 +789,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -903,10 +815,8 @@ steps: - "sh -c 't=45; echo Sleeping 45 seconds; sleep 45'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -918,10 +828,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -933,10 +841,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -948,10 +854,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -964,7 +868,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -990,10 +894,8 @@ steps: - "sh -c 't=30; echo Sleeping 30 seconds; sleep 30'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -1005,10 +907,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1020,10 +920,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1035,10 +933,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1050,10 +946,8 @@ steps: - create - name: Py2 2017.7(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1065,10 +959,8 @@ steps: - create - name: Py2 2018.3(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1080,10 +972,8 @@ steps: - create - name: Py2 2019.2(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1096,7 +986,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -1122,10 +1012,8 @@ steps: - "sh -c 't=0; echo Sleeping 0 seconds; sleep 0'" - name: create - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - bundle install --with docker --without opennebula ec2 windows vagrant - "echo 'Waiting for docker to start'" - sleep 10 @@ -1137,10 +1025,8 @@ steps: - throttle-build - name: Py2 2017.7(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1152,10 +1038,8 @@ steps: - create - name: Py2 2018.3(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1167,10 +1051,8 @@ steps: - create - name: Py2 2019.2(Git) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1182,10 +1064,8 @@ steps: - create - name: Py2 2017.7(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1197,10 +1077,8 @@ steps: - create - name: Py2 2018.3(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1212,10 +1090,8 @@ steps: - create - name: Py2 2019.2(Stable) - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing commands: - - apk --update add wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc ruby-dev make libc-dev openssl-dev libffi-dev - - gem install bundler - pip install -U pip - pip install -r tests/requirements.txt - bundle install --with docker --without opennebula ec2 windows vagrant @@ -1228,7 +1104,7 @@ steps: services: - name: docker - image: docker:edge-dind + image: saltstack/drone-salt-bootstrap-testing command: - --storage-driver=overlay2 privileged: true @@ -1241,6 +1117,6 @@ depends_on: --- kind: signature -hmac: f0ec6791f3166a8e1ddd866184713eeb670d93caefc3d1837235fe8abcb48049 +hmac: b7e8b81af5c37f4432730a739032d9bbfb32d125b7e55ca8e94d0c08f8e40e59 ... diff --git a/Dockerfile.drone-builds b/Dockerfile.drone-builds new file mode 100644 index 0000000..f83c675 --- /dev/null +++ b/Dockerfile.drone-builds @@ -0,0 +1,19 @@ +# docker build --rm -t saltstack/drone-salt-bootstrap-testing -f Dockerfile.drone-builds . +FROM docker:edge-dind + +COPY Gemfile /Gemfile +COPY tests/requirements.txt /requirements.txt + +RUN apk --update add \ + wget python python-dev py-pip git ruby-bundler ruby-rdoc ruby-dev gcc make libc-dev openssl-dev libffi-dev && \ + gem install bundler && \ + bundle install --gemfile=/Gemfile --with docker --without opennebula ec2 windows vagrant && \ + pip install -U pip && \ + pip install -r /requirements.txt && \ + rm -rf /requirements.txt /Gemfile /root/.cache + +VOLUME /var/lib/docker +EXPOSE 2375 + +ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"] +CMD [] From 749327f65e23a7c797f40ea3d83f03e6e796ebda Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 20 May 2019 11:01:07 +0100 Subject: [PATCH 83/84] Update changes log and authors for stable release --- AUTHORS.rst | 4 ++++ ChangeLog | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 93e65f0..75efda4 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -115,6 +115,7 @@ Mike Place cachedout mp@saltstack.com N noelmcloughlin noel.maclochlainn@gmail.com nasenbaer13 nasenbaer13 nevins-b nevins-b +Nicholas Henry nshenry03 nshenry03@gmail.com Nicole Thomas rallytime nicole@saltstack.com Niels Abspoel aboe76 aboe76@gmail.com Nitin Madhok nmadhok nmadhok@clemson.edu @@ -129,6 +130,7 @@ Petr Michalec epcim pjcreath pjcreath Prayag Verma pra85 prayag.verma@gmail.com ptonelli ptonelli +Pulu Anau puluanau pulu.anau@dominodatalab.com Randy Thompson beardedeagle randy@heroictek.com Raymond Barbiero visualphoenix Rob Eden hedinfaok @@ -139,6 +141,7 @@ Roman Mohr rmohr rmohr@redhat.com Ronald van Zantvoort The-Loeki ronald@pcextreme.nl RuriRyan RuriRyan ryan@btsoft.eu Ryan Walder ryanwalder ryanwalder@ucds.email +Sam sticky-note sammy.smati@skazy.nc Sebastian Wendel sourceindex Sergey Paramonov serge-p serg.paramonov@s-vp.com Shane Lee twangboy slee@saltstack.com @@ -159,5 +162,6 @@ Whit Morriss whitmo whit@nocoast.us Wolodja Wentland babilen w@babilen5.org Wout wfhg Yann Masson ymasson +Yoan Blanc greut yoan@dosimple.ch Yushi Nakai nyushi ========================== ===================== ============================ diff --git a/ChangeLog b/ChangeLog index eb2b383..afd94dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ Version TBD (In Progress on the Develop Branch): +Version 2019.05.20: + * Allow stable version selection for amazon linux (puluanau) #1328 + * FreeBSD 12 support (sticky-note) #1329 + * Apt wait for lock modification (ripesensor) #1335 + * Opensuse 15 Git installation fixes (s0undt3ch) #1340 #1341 + * Amazon Linux Image fixes (nshenry03) #1343 + * apt_key_fetch fixes (greut) #1344 + * CentOS Git and PIP installation m2crypto fixes (s0undt3ch) #1347 + * CI process enhancements/fixes (s0undt3ch) #1347 + Version 2019.02.27: * Add support for bunsenlabs devian derivative (kevinquinnyo) #1300 * Add support for TurnKey devian derivative (dafyddj) #1313 From 9a25940dc629cd4182fcbfcb9bbacc242409bbae Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 20 May 2019 16:27:53 +0100 Subject: [PATCH 84/84] Bump version for release --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 937f810..edc2e92 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -23,7 +23,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2019.02.27" +__ScriptVersion="2019.05.20" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0"