| commit | fe25077dc847f36795636dd7556e8614cc34b203 | [log] [tgz] |
|---|---|---|
| author | Andrew Fenner <Andrew.Fenner@est.tech> | Fri Aug 21 12:07:47 2020 +0000 |
| committer | Nordix Gerrit <gerrit@nordix.org> | Fri Aug 21 12:07:47 2020 +0000 |
| tree | 10f893c76dc417647a3c632c3f68c61a191d954e | |
| parent | 3cb345348b3d5406acbe78ae783b02816a4c3d2b [diff] | |
| parent | 6537f65c8a005af2b2ff4be416b36e63927dd5fe [diff] |
Merge "Fixing cleanup job"
diff --git a/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml b/jjb/cloud-infra/common/cloud-infra-cleanup-stacks.yaml index 91d5e6e..0516b56 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 13523be..817499b 100644 --- a/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh +++ b/jjb/cloud-infra/scripts/cleanup-heat-stacks.sh
@@ -47,7 +47,7 @@ /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