Fixing cleanup job

Added in wait for apt
fixed activate command

Change-Id: I49f956797c6175f95d05b9b9132c938f73a66378
Signed-off-by: afenner <andrew.fenner@est.tech>

diff --git a/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml b/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml
index 91d5e6ec8dd39cc63f76cf72b8676a14b8405474..0516b56efe26bc2edf61fb4b2a86b0146bc26975 100644 (file)
--- 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 13523be8412d6eb869c880cc23900fecd0bf3626..817499bf50282bd104fb91de29b24b06dc45da2f 100644 (file)
--- 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