From 6537f65c8a005af2b2ff4be416b36e63927dd5fe Mon Sep 17 00:00:00 2001 From: afenner Date: Fri, 14 Aug 2020 13:26:18 +0100 Subject: [PATCH 1/1] Fixing cleanup job Added in wait for apt fixed activate command Change-Id: I49f956797c6175f95d05b9b9132c938f73a66378 Signed-off-by: afenner --- jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml | 1 + jjb/cloud-infra/scripts/cleanup-heat-stacks.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml b/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml index 91d5e6ec8..0516b56ef 100644 --- a/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml +++ b/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml @@ -70,4 +70,5 @@ single-use: True builders: + - 'wait-pkg-mgr-macro' - 'cloud-infra-cleanup-stack-macro' diff --git a/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh b/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh index 13523be84..817499bf5 100644 --- a/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh +++ b/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh @@ -47,7 +47,7 @@ redirect_cmd sudo apt install -o Dpkg::Options::=--force-confdef -o Dpkg::Option /bin/rm -rf $WORKSPACE/.venv virtualenv --python python3 --never-download $WORKSPACE/.venv set +u -source $WORKSPACE/.venv +source $WORKSPACE/.venv/bin/activate set -u pip install --quiet --upgrade pip pip install --quiet python-cinderclient==6.0.0 -- 2.25.1