From b8c241ed702ce00ad1195ea37502fcb8b65d39c0 Mon Sep 17 00:00:00 2001 From: afenner Date: Thu, 13 Aug 2020 10:46:02 +0100 Subject: [PATCH] add install of dependencies for cleanup-heat because cleanup is run on a timed bases I think the build server was fresh so virtualenv was missing see failed build https://jenkins.nordix.org/view/all/job/cloud-infra-cleanup-stack-city/1/console Change-Id: I53917fc8186119695188db9d6436e8ade9aaa4cb Signed-off-by: afenner --- .../scripts/cleanup-heat-stacks.sh | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh b/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh index d9e49b9c3..13523be84 100644 --- a/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh +++ b/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh @@ -22,6 +22,27 @@ set -o nounset set -o errexit set -o pipefail +#------------------------------------------------------------------------------- +# In some cases, it is useful to see all the output generated by commands so +# this function makes it possible for users to achieve that by not redirecting +# output to /dev/null when verbosity is enabled +#------------------------------------------------------------------------------- +redirect_cmd() { + + if [[ "$VERBOSITY" == "false" ]]; then + "$@" > /dev/null 2>&1 + else + "$@" + fi + +} + +VERBOSITY=${VERBOSITY:-false} +# ensure dependencies are present +echo "Info : Install python3.7-minimal python3-distutils virtualenv using apt" +redirect_cmd sudo apt update +redirect_cmd sudo apt install -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y python3.7-minimal python3-distutils virtualenv + # prepare venv for openstack cli /bin/rm -rf $WORKSPACE/.venv virtualenv --python python3 --never-download $WORKSPACE/.venv -- 2.25.1