From ef70d89d6e014c97db0c34b20b4ac2e4283f1d59 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 3 Jun 2021 17:23:59 +0800 Subject: [PATCH] */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 --- ceph-ansible-nightly/build/teardown | 2 ++ ceph-ansible-prs/build/teardown | 2 ++ ceph-ansible-scenario/build/teardown | 2 ++ ceph-volume-nightly/build/teardown | 2 ++ ceph-volume-scenario/build/teardown | 2 ++ cephadm-ansible-prs/build/teardown | 2 ++ 6 files changed, 12 insertions(+) diff --git a/ceph-ansible-nightly/build/teardown b/ceph-ansible-nightly/build/teardown index 02a05ccf..2090dfc7 100644 --- 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 6e250f61..31a30f11 100644 --- 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 6e250f61..31a30f11 100644 --- 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 ad7de042..a1546e43 100644 --- 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 f03694a5..793b3aab 100644 --- 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 c4f2c3f8..71b0983e 100644 --- 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 -- 2.39.5