*/build/teardown: create venv for running teardown_vagrant_tests()

to address the regression introduced by
e302eaabb977f3e93b1a7005c879f4b2eba581fc, which failed to create venv
after removing the global `$(mktemp -td venv.XXXXXXXXXX)` call.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-ansible-nightly/build/teardown b/ceph-ansible-nightly/build/teardown
index 02a05ccf6ed4d84722af83881bffd32d3a5b902f..2090dfc77bec5327b3d56601dc365dd255dda64f 100644 (file)
--- a/ceph-ansible-nightly/build/teardown
+++ b/ceph-ansible-nightly/build/teardown
@@ -2,5 +2,7 @@
 
 cd $WORKSPACE/tests
 
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 # the method exists in scripts/build_utils.sh
 teardown_vagrant_tests $VENV

diff --git a/ceph-ansible-prs/build/teardown b/ceph-ansible-prs/build/teardown
index 6e250f61cc7fd1cb713e6be6e2a5edf3a2782f7a..31a30f11080919487eb022464aa999de92987941 100644 (file)
--- a/ceph-ansible-prs/build/teardown
+++ b/ceph-ansible-prs/build/teardown
@@ -2,6 +2,8 @@
 
 cd $WORKSPACE/tests
 
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 # the method exists in scripts/build_utils.sh
 teardown_vagrant_tests $VENV
 

diff --git a/ceph-ansible-scenario/build/teardown b/ceph-ansible-scenario/build/teardown
index 6e250f61cc7fd1cb713e6be6e2a5edf3a2782f7a..31a30f11080919487eb022464aa999de92987941 100644 (file)
--- a/ceph-ansible-scenario/build/teardown
+++ b/ceph-ansible-scenario/build/teardown
@@ -2,6 +2,8 @@
 
 cd $WORKSPACE/tests
 
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 # the method exists in scripts/build_utils.sh
 teardown_vagrant_tests $VENV
 

diff --git a/ceph-volume-nightly/build/teardown b/ceph-volume-nightly/build/teardown
index ad7de0428fadf3064be55311f6eb100ec19047ec..a1546e43e09225c42936ef6cf51841e2f898ad6d 100644 (file)
--- a/ceph-volume-nightly/build/teardown
+++ b/ceph-volume-nightly/build/teardown
@@ -7,5 +7,7 @@ cd $WORKSPACE/src/ceph-volume/ceph_volume/tests/functional
 
 scenarios=$(find . | grep vagrant_ssh_config | xargs -r dirname)
 
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 # the method exists in scripts/build_utils.sh
 teardown_vagrant_tests $VENV

diff --git a/ceph-volume-scenario/build/teardown b/ceph-volume-scenario/build/teardown
index f03694a55d5e5239d730983bd4eaf839c68a1662..793b3aab34dcdf33e7660d7b27b56f8ee74f919d 100644 (file)
--- a/ceph-volume-scenario/build/teardown
+++ b/ceph-volume-scenario/build/teardown
@@ -2,5 +2,7 @@
 
 cd $WORKSPACE/src/ceph-volume/ceph_volume/tests/functional
 
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 # the method exists in scripts/build_utils.sh
 teardown_vagrant_tests $VENV

diff --git a/cephadm-ansible-prs/build/teardown b/cephadm-ansible-prs/build/teardown
index c4f2c3f8927ad5b8093ab6dc43f2aee7c14ac02e..71b0983eda5de9717689ddd9011d68338bd233ab 100644 (file)
--- a/cephadm-ansible-prs/build/teardown
+++ b/cephadm-ansible-prs/build/teardown
@@ -2,6 +2,8 @@
 
 cd "${WORKSPACE}"/tests
 
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 # the method exists in scripts/build_utils.sh
 teardown_vagrant_tests $VENV