*: use create_venv_dir() helper

* define create_venv_dir() helper to
  1. create a temp dir
  2. set a trap to clean it up upon exit
* use create_venv_dir() in all scripts where
  TEMPVENV and/or VENV variables are used.

this change can help us to avoid creating a tempdir in /tmp,
and keep the tempdir forever.

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

diff --git a/calamari-clients-build/build/setup b/calamari-clients-build/build/setup
index 8856866ba1eaa3cfe9b61224e3fa2c3336bbaa69..9b7a0f0f65a501e5648b2998a3c73a397c9e15fb 100644 (file)
--- a/calamari-clients-build/build/setup
+++ b/calamari-clients-build/build/setup
@@ -54,6 +54,8 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
 esac
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/calamari/build/setup b/calamari/build/setup
index 981ec8544fee757da33661c2a8ef5206e06d7af7..d9011a1d50b9e4ea60b5a703e16c031fbc2704f3 100644 (file)
--- a/calamari/build/setup
+++ b/calamari/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-ansible-docs-prs/build/build b/ceph-ansible-docs-prs/build/build
index ee4ec65163065efab640c9c9379150358902146d..83255535fbe00d7878d2f9b4c86f9c9c16c04343 100644 (file)
--- a/ceph-ansible-docs-prs/build/build
+++ b/ceph-ansible-docs-prs/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 cd $WORKSPACE/docs/

diff --git a/ceph-ansible-docs/build/build b/ceph-ansible-docs/build/build
index b060335bb22e8e39fa598e55be6573aaa535fff1..55858d0586e6946dea73e1c2f3d210dbf39e679e 100644 (file)
--- a/ceph-ansible-docs/build/build
+++ b/ceph-ansible-docs/build/build
@@ -4,6 +4,8 @@ set -ex
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # trims leading slashes

diff --git a/ceph-ansible-nightly/build/build b/ceph-ansible-nightly/build/build
index 6a96d997e62144dffafff780ba12f6e29b493dc1..174626fee6754528f165ab1e0a28c701e532c9c3 100644 (file)
--- a/ceph-ansible-nightly/build/build
+++ b/ceph-ansible-nightly/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # XXX this might not be needed

diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build
index a929dcdb2c54db185e4f2f90cec420248d5af4f5..9a70a950fda4e2904738806d48560da2612c76ed 100644 (file)
--- a/ceph-ansible-prs/build/build
+++ b/ceph-ansible-prs/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # XXX this might not be needed

diff --git a/ceph-ansible-rpm/build/build b/ceph-ansible-rpm/build/build
index 1a5ed0da0f48e0378049d176557e9b6a05225529..46be3f835c68bc2dd87cd96346f7684441d3563a 100644 (file)
--- a/ceph-ansible-rpm/build/build
+++ b/ceph-ansible-rpm/build/build
@@ -18,6 +18,8 @@ make rpm || ( tail -n +1 {root,build}.log && exit 1 )
 # Chacra time
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-ansible-scenario/build/build b/ceph-ansible-scenario/build/build
index aa99bd18586f75ec785db9556d38f51ee1290c0d..c2d51462dfc6b5121f08e9f996d275ae812dd30f 100644 (file)
--- a/ceph-ansible-scenario/build/build
+++ b/ceph-ansible-scenario/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # XXX this might not be needed

diff --git a/ceph-build-pull-requests/build/build b/ceph-build-pull-requests/build/build
index fb6a7159afd517e0df075070aeec534cb7805e62..204c0a5adfadf666cef5939063fd61c3dce6d66a 100644 (file)
--- a/ceph-build-pull-requests/build/build
+++ b/ceph-build-pull-requests/build/build
@@ -6,6 +6,8 @@ set -e
 # must pin urllib3 to 1.22 because 1.23 is incompatible with requests, which
 # is used by jenkins-job-builder
 pkgs=( "ansible" "jenkins-job-builder>=3.5.0" "urllib3==1.22" "pyopenssl" "ndg-httpsclient" "pyasn1" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 

diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb
index 6ed8e12ebb59e744b5f04d73fc4f8041173f0894..7671de16838b48009c4e8748f610dddf25dd7c65 100644 (file)
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -59,6 +59,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 chacra_url=https://chacra.ceph.com/

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index f6b63fe1a61a52fa3287c2cdc304c3ee682a3334..6bcbbf95326aa9d8cc047bfaf9cea386b95e1735 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -49,6 +49,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # create the .chacractl config file using global variables

diff --git a/ceph-container-nighlity/build/build b/ceph-container-nighlity/build/build
index df9a612828c0f9073ece04b2f6e55c56a8374349..027c276af7a8e4c397282879f3792477bff10cde 100644 (file)
--- a/ceph-container-nighlity/build/build
+++ b/ceph-container-nighlity/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # XXX this might not be needed

diff --git a/ceph-container-prs/build/build b/ceph-container-prs/build/build
index df9a612828c0f9073ece04b2f6e55c56a8374349..027c276af7a8e4c397282879f3792477bff10cde 100644 (file)
--- a/ceph-container-prs/build/build
+++ b/ceph-container-prs/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # XXX this might not be needed

diff --git a/ceph-deploy-build/build/setup b/ceph-deploy-build/build/setup
index 1f71004f5a29e37372c8404206d7b4b23ead2ba2..0d1a8bc0561010a9e1e4d457e91c1e85e60edc70 100644 (file)
--- a/ceph-deploy-build/build/setup
+++ b/ceph-deploy-build/build/setup
@@ -22,6 +22,8 @@ if test -f /etc/redhat-release ; then
 fi
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-deploy-docs/build/build b/ceph-deploy-docs/build/build
index 1f80aafb49d26929710b147e14166f027ebdca44..9b4c18a7764f6a47ffb7ef7a2b489844ce29e0f2 100644 (file)
--- a/ceph-deploy-docs/build/build
+++ b/ceph-deploy-docs/build/build
@@ -4,6 +4,8 @@ set -ex
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # create the docs build with tox

diff --git a/ceph-deploy-pull-requests/build/setup b/ceph-deploy-pull-requests/build/setup
index ced5ae484ed245f289819eb85aa8559b0c240c0b..a2f37ff2d358df94aba0f9f37eba5dfaf1f838de 100644 (file)
--- a/ceph-deploy-pull-requests/build/setup
+++ b/ceph-deploy-pull-requests/build/setup
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "ansible" "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 

diff --git a/ceph-deploy-tag/build/build b/ceph-deploy-tag/build/build
index 1ea302bf39054184f6951680233abce479f676ee..bd040cd2e099514fb5facf48aaee250871efd476 100644 (file)
--- a/ceph-deploy-tag/build/build
+++ b/ceph-deploy-tag/build/build
@@ -9,6 +9,8 @@ fi
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "ansible" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # run ansible to do all the tagging and release specifying

diff --git a/ceph-dev-build/build/setup_deb b/ceph-dev-build/build/setup_deb
index 9720f518a98b53a08d3f0a1c896f6f770782af77..4a92a1b7da469ef2e76e5d9ebab1a7c5d1b4a917 100644 (file)
--- a/ceph-dev-build/build/setup_deb
+++ b/ceph-dev-build/build/setup_deb
@@ -59,6 +59,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-dev-build/build/setup_osc b/ceph-dev-build/build/setup_osc
index 591d4034774e30a32faca22520df7f4da2a24349..1e350ed757e9fd1994eec1137c2a793edc92b73f 100644 (file)
--- a/ceph-dev-build/build/setup_osc
+++ b/ceph-dev-build/build/setup_osc
@@ -78,6 +78,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index 639d7b625e1d79c344bfdb62487bc4443c38fdbd..be71f14202c61cfb50050ef08ad55ef2143c5594 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -51,6 +51,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-dev-new-build/build/setup_deb b/ceph-dev-new-build/build/setup_deb
index 9720f518a98b53a08d3f0a1c896f6f770782af77..4a92a1b7da469ef2e76e5d9ebab1a7c5d1b4a917 100644 (file)
--- a/ceph-dev-new-build/build/setup_deb
+++ b/ceph-dev-new-build/build/setup_deb
@@ -59,6 +59,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-dev-new-build/build/setup_mingw b/ceph-dev-new-build/build/setup_mingw
index 08ba136fdae37bec802b6239110bd2633ed855a3..27507c6aa74d4c9a36f7a13e4f5e1c99717648c1 100644 (file)
--- a/ceph-dev-new-build/build/setup_mingw
+++ b/ceph-dev-new-build/build/setup_mingw
@@ -45,6 +45,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index aad8c5d7428b78ab8435d06b039c431ea8adf7b9..49338cffbb5640ba9c711773ea6f55425fabb46f 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -49,6 +49,8 @@ NORMAL_ARCH=$ARCH
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-iscsi-cli-flake8/build/build b/ceph-iscsi-cli-flake8/build/build
index 70779665c31507e6f479ec664194d3afa8f7de49..fa2327dc41a5aea25676f7a52d83f30ab754b485 100644 (file)
--- a/ceph-iscsi-cli-flake8/build/build
+++ b/ceph-iscsi-cli-flake8/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 cd "$WORKSPACE/ceph-iscsi-cli"

diff --git a/ceph-iscsi-cli/build/setup b/ceph-iscsi-cli/build/setup
index c36cffd2ddeb17e69894ed4c1167cb4ed73a77c9..993b3896a09325cccc8fb09ff4edb41b0a9ba10a 100644 (file)
--- a/ceph-iscsi-cli/build/setup
+++ b/ceph-iscsi-cli/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-iscsi-config-flake8/build/build b/ceph-iscsi-config-flake8/build/build
index 2aa39eaa1f18d37a081b97a016cb23d00144725a..0f6a05f2749d096bb4cca00c914000fea99ac725 100644 (file)
--- a/ceph-iscsi-config-flake8/build/build
+++ b/ceph-iscsi-config-flake8/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 cd "$WORKSPACE/ceph-iscsi-config"

diff --git a/ceph-iscsi-config/build/setup b/ceph-iscsi-config/build/setup
index c36cffd2ddeb17e69894ed4c1167cb4ed73a77c9..993b3896a09325cccc8fb09ff4edb41b0a9ba10a 100644 (file)
--- a/ceph-iscsi-config/build/setup
+++ b/ceph-iscsi-config/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-iscsi-stable/build/setup b/ceph-iscsi-stable/build/setup
index 746f0f1d47e4108b8ab5128d3378615c3d33f2fc..bc3de22dd035ea6bd3a7e0fe97ae129ba21776d9 100644 (file)
--- a/ceph-iscsi-stable/build/setup
+++ b/ceph-iscsi-stable/build/setup
@@ -45,6 +45,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 chacra_url="https://chacra.ceph.com/"

diff --git a/ceph-iscsi-tools/build/setup b/ceph-iscsi-tools/build/setup
index c36cffd2ddeb17e69894ed4c1167cb4ed73a77c9..993b3896a09325cccc8fb09ff4edb41b0a9ba10a 100644 (file)
--- a/ceph-iscsi-tools/build/setup
+++ b/ceph-iscsi-tools/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-iscsi-tox/build/build b/ceph-iscsi-tox/build/build
index e5b00a245a20f7e0c798bb7dfce7ee1123577698..1a0e9dc916dbb1b2c80706958e3a608b5d37669f 100644 (file)
--- a/ceph-iscsi-tox/build/build
+++ b/ceph-iscsi-tox/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 cd "$WORKSPACE/ceph-iscsi"

diff --git a/ceph-iscsi/build/setup b/ceph-iscsi/build/setup
index c36cffd2ddeb17e69894ed4c1167cb4ed73a77c9..993b3896a09325cccc8fb09ff4edb41b0a9ba10a 100644 (file)
--- a/ceph-iscsi/build/setup
+++ b/ceph-iscsi/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-medic-docs/build/build b/ceph-medic-docs/build/build
index 003ddbbc7dc9b07512e96e8e2a91f951dc72a71d..3de81e4135aabd39ddfa239cc06639d6849f68b4 100644 (file)
--- a/ceph-medic-docs/build/build
+++ b/ceph-medic-docs/build/build
@@ -4,6 +4,8 @@ set -ex
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # trims leading slashes

diff --git a/ceph-medic-pull-requests/build/build b/ceph-medic-pull-requests/build/build
index c5385f196b415a1df7e38915c79db254458cc0b5..c08420b74aea8c2a238d0562569fd9f7ca6e5515 100644 (file)
--- a/ceph-medic-pull-requests/build/build
+++ b/ceph-medic-pull-requests/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 sudo yum install -y epel-release

diff --git a/ceph-medic-release/build/build_rpm b/ceph-medic-release/build/build_rpm
index cef722bcb6c677d251bb74943d9a332e9dfba6d5..fa3f8e24f8a736aa9200e0f5020c62a9dc0a50ca 100644 (file)
--- a/ceph-medic-release/build/build_rpm
+++ b/ceph-medic-release/build/build_rpm
@@ -16,6 +16,8 @@ make rpm || ( tail -n +1 {root,build}.log && exit 1 )
 # Chacra time
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 make_chacractl_config

diff --git a/ceph-medic-rpm/build/build b/ceph-medic-rpm/build/build
index 1a5ed0da0f48e0378049d176557e9b6a05225529..46be3f835c68bc2dd87cd96346f7684441d3563a 100644 (file)
--- a/ceph-medic-rpm/build/build
+++ b/ceph-medic-rpm/build/build
@@ -18,6 +18,8 @@ make rpm || ( tail -n +1 {root,build}.log && exit 1 )
 # Chacra time
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/ceph-medic-tests/build/build b/ceph-medic-tests/build/build
index 3a7453708596d8bab2e6a5e396cb29e7c7dad80f..e4c36d5f9837c05186756db734a175884a3440bb 100644 (file)
--- a/ceph-medic-tests/build/build
+++ b/ceph-medic-tests/build/build
@@ -1,5 +1,7 @@
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 WORKDIR=$(mktemp -td tox.XXXXXXXXXX)

diff --git a/ceph-pr-commits/build/build b/ceph-pr-commits/build/build
index 0f4ac0bdc31e641e6571b0a33900c15f9439a65d..c1d2d776104ba31cfc72c5932d6a4608fcc8c61d 100644 (file)
--- a/ceph-pr-commits/build/build
+++ b/ceph-pr-commits/build/build
@@ -17,6 +17,8 @@ fi
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "pytest" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 cd "$WORKSPACE"

diff --git a/ceph-qa-suite-pull-requests/build/build b/ceph-qa-suite-pull-requests/build/build
index 08b39bbdf08b753ce3ceab1a398596aafde29dfa..ff03e5325c8e5dec3a08a69e305b5a265a32fb79 100644 (file)
--- a/ceph-qa-suite-pull-requests/build/build
+++ b/ceph-qa-suite-pull-requests/build/build
@@ -4,6 +4,8 @@ set -ex
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index aed3cd23d66f4a877aeb6fa9e12e9ca5da30ebaa..6a9d117b85609ef063ff551010cb8532d0009006 100644 (file)
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -13,6 +13,8 @@ rm -rf dist
 rm -rf RPMBUILD
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # create the .chacractl config file using global variables

diff --git a/ceph-tag/build/build b/ceph-tag/build/build
index d97a3e705b310ab6125bc1054557a417a6641373..32b7aa6e4f6860b737e7c84ccf6836d38a21cae9 100644 (file)
--- a/ceph-tag/build/build
+++ b/ceph-tag/build/build
@@ -9,6 +9,8 @@ fi
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "ansible" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # run ansible to do all the tagging and release specifying

diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build
index 17c9ffa28a8cf1d69c5c57be02d0e48d5e9f028e..7a61adc4fb05c00df1ae69718a32714549117d07 100644 (file)
--- a/ceph-volume-ansible-prs/build/build
+++ b/ceph-volume-ansible-prs/build/build
@@ -10,6 +10,8 @@ github_status_setup
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" "github-status>0.0.3" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 GITHUB_STATUS_STATE="pending" $VENV/github-status create

diff --git a/ceph-volume-ansible-prs/build/teardown b/ceph-volume-ansible-prs/build/teardown
index 6b92cb3ee51bca7aa9e57178eb04532a46d04968..11e3bbcf1eda32b02edf154020ad985598f03db6 100644 (file)
--- a/ceph-volume-ansible-prs/build/teardown
+++ b/ceph-volume-ansible-prs/build/teardown
@@ -4,6 +4,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" "github-status>0.0.3" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 GITHUB_STATUS_STATE="failure" $VENV/github-status create

diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build
index 8f1a68f9ba28d02889441a74ad40664e988ca832..b912c5ca0e4f3265f0f24cc45745fa8f9fb160dd 100644 (file)
--- a/ceph-volume-nightly/build/build
+++ b/ceph-volume-nightly/build/build
@@ -4,6 +4,8 @@ WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 prune_stale_vagrant_vms $WORKSPACE/../**/tests

diff --git a/ceph-volume-pr/build/build b/ceph-volume-pr/build/build
index 8ee52a8e7a4deb2995afa705139c6b2641a1207b..d46f56606b21b00de364fc248b6ec7bebbe2cde5 100644 (file)
--- a/ceph-volume-pr/build/build
+++ b/ceph-volume-pr/build/build
@@ -8,6 +8,8 @@ github_status_setup
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" "github-status>0.0.3")
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 cd src/ceph-volume

diff --git a/ceph-volume-pr/build/teardown b/ceph-volume-pr/build/teardown
index ab07894a58220dd5dbe621bfa6c4d92b2835b9a0..32379faaf4085f05014282746459e5637b4db63d 100644 (file)
--- a/ceph-volume-pr/build/teardown
+++ b/ceph-volume-pr/build/teardown
@@ -4,6 +4,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "github-status>0.0.3" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 GITHUB_STATUS_STATE="failure" $VENV/github-status create

diff --git a/ceph-volume-scenario/build/build b/ceph-volume-scenario/build/build
index 2023af31375d5b4b45bd42e8981964afffd7ece6..2b7ea35520fb2154c55a6e852263ac6ee9e0b74f 100644 (file)
--- a/ceph-volume-scenario/build/build
+++ b/ceph-volume-scenario/build/build
@@ -4,6 +4,8 @@ WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 

diff --git a/cephadm-ansible-prs/build/build b/cephadm-ansible-prs/build/build
index bd5afe3d4f5e5b33e892a058fc6bb48cac18b98a..d3be0c345c94ed1caf981d7d82cb76da226db833 100644 (file)
--- a/cephadm-ansible-prs/build/build
+++ b/cephadm-ansible-prs/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # XXX this might not be needed

diff --git a/cephmetrics-pull-requests/setup/setup b/cephmetrics-pull-requests/setup/setup
index 420fbefc02e9323bd31523c8df14807bc6a1624e..2a16da3a29f3d1ce460951dde1e73ecac0988ccf 100644 (file)
--- a/cephmetrics-pull-requests/setup/setup
+++ b/cephmetrics-pull-requests/setup/setup
@@ -13,4 +13,6 @@ elif test -f /etc/debian_version ; then
 fi
 
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"

diff --git a/cephmetrics-release/build/setup b/cephmetrics-release/build/setup
index 576e7fb949b0c2e77a9c89abe2f683098abab7c5..d829d48644d672c20e7a712cb6cdf51d05f04f20 100644 (file)
--- a/cephmetrics-release/build/setup
+++ b/cephmetrics-release/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # create the .chacractl config file using global variables

diff --git a/cephmetrics/build/setup b/cephmetrics/build/setup
index 14fec3fc7570b83b67f6d535caf695cd20f9b883..ccaf34c77587779b2fe3c6a285d45dfdbc596993 100644 (file)
--- a/cephmetrics/build/setup
+++ b/cephmetrics/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/chacra-pull-requests/build/build b/chacra-pull-requests/build/build
index 44fae5c15928e4de103debf09a01914f2dfea4d3..38033107f82803522e48116979d98a0b84c983d4 100644 (file)
--- a/chacra-pull-requests/build/build
+++ b/chacra-pull-requests/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "ansible" "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # run ansible to get this current host to meet our requirements, specifying

diff --git a/configshell-fb/build/setup b/configshell-fb/build/setup
index c36cffd2ddeb17e69894ed4c1167cb4ed73a77c9..993b3896a09325cccc8fb09ff4edb41b0a9ba10a 100644 (file)
--- a/configshell-fb/build/setup
+++ b/configshell-fb/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/diamond-build/build/setup b/diamond-build/build/setup
index 8856866ba1eaa3cfe9b61224e3fa2c3336bbaa69..9b7a0f0f65a501e5648b2998a3c73a397c9e15fb 100644 (file)
--- a/diamond-build/build/setup
+++ b/diamond-build/build/setup
@@ -54,6 +54,8 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
 esac
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/jenkins-job-builder/build/build b/jenkins-job-builder/build/build
index bbc44b7ec66a6ddd5d863029052ca390ef5eb275..3f293b9406d401f7a9ba1829c75acff1e4395b6f 100644 (file)
--- a/jenkins-job-builder/build/build
+++ b/jenkins-job-builder/build/build
@@ -10,6 +10,8 @@ set -euxo pipefail
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "jenkins-job-builder>=3.5.0" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]" latest
 
 # Wipe out JJB's cache if $FORCE is set.

diff --git a/kernel/build/setup b/kernel/build/setup
index b95471e384c160e9272d3a943ed18ed27e658eec..b3fe421a98284675796c91614031342f8025cd16 100644 (file)
--- a/kernel/build/setup
+++ b/kernel/build/setup
@@ -68,6 +68,8 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
 esac
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/merfi-pull-requests/build/build b/merfi-pull-requests/build/build
index 4d2603ceb3408dc2457a5ec0bcc4a5f84250962e..65186c52340ae2eee787af722deac2115197ed64 100644 (file)
--- a/merfi-pull-requests/build/build
+++ b/merfi-pull-requests/build/build
@@ -4,6 +4,8 @@ set -ex
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # run tox by recreating the environment and in verbose mode

diff --git a/mita-deploy/build/build b/mita-deploy/build/build
index 83b0ee1767cbea1fa102944a248e7e7a2273fdfa..d91de291912c53f7361a3a58a06d3c42a89be7fd 100644 (file)
--- a/mita-deploy/build/build
+++ b/mita-deploy/build/build
@@ -4,6 +4,8 @@ set -ex
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "ansible" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 cd "$WORKSPACE/deploy/playbooks/"

diff --git a/nfs-ganesha-stable/build/setup b/nfs-ganesha-stable/build/setup
index 58c6f0853e40017564ea7afe22951fd8d24c3104..d7de8f0b2a19d3aa372283be4177eff980fc595e 100644 (file)
--- a/nfs-ganesha-stable/build/setup
+++ b/nfs-ganesha-stable/build/setup
@@ -45,6 +45,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 NFS_GANESHA_BRANCH=`branch_slash_filter $NFS_GANESHA_BRANCH`

diff --git a/nfs-ganesha/build/setup b/nfs-ganesha/build/setup
index 57c1408cb4f80643d35f42cf44da8930ae259d7f..c3d99b965f8bfa62288366f406becd39b9c8ce9a 100644 (file)
--- a/nfs-ganesha/build/setup
+++ b/nfs-ganesha/build/setup
@@ -42,6 +42,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 NFS_GANESHA_BRANCH=`branch_slash_filter $NFS_GANESHA_BRANCH`

diff --git a/paddles-pull-requests/build/build b/paddles-pull-requests/build/build
index 9f0922e6332d12749389cc85b09d69c00b5d22e7..89787aeb553c6e8b1ffa1b34ea728a6592ee0e65 100644 (file)
--- a/paddles-pull-requests/build/build
+++ b/paddles-pull-requests/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 sudo yum install -y epel-release

diff --git a/radosgw-agent-pull-requests/build/build b/radosgw-agent-pull-requests/build/build
index 7ff22019b42f64ac36463b67c0b21e0b04e66e5e..3500acd2164e737fb37ccbaf928b608c5ac511a7 100644 (file)
--- a/radosgw-agent-pull-requests/build/build
+++ b/radosgw-agent-pull-requests/build/build
@@ -2,6 +2,8 @@
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "ansible" "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 

diff --git a/radosgw-agent/build/build b/radosgw-agent/build/build
index 9be367634fa643fe6ff5f3489a0fbea084303cc3..f3b026e75abf949c4d627699afb6feb158189f54 100644 (file)
--- a/radosgw-agent/build/build
+++ b/radosgw-agent/build/build
@@ -15,6 +15,8 @@ ls -l
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # create the .chacractl config file using global variables

diff --git a/rtslib-fb/build/setup b/rtslib-fb/build/setup
index c36cffd2ddeb17e69894ed4c1167cb4ed73a77c9..993b3896a09325cccc8fb09ff4edb41b0a9ba10a 100644 (file)
--- a/rtslib-fb/build/setup
+++ b/rtslib-fb/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/samba/build/setup b/samba/build/setup
index d7956618f816da925b48155525e826ae835f0170..de7109463868d88e909bc2f222dc9e5b00dd57c2 100644 (file)
--- a/samba/build/setup
+++ b/samba/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 SAMBA_BRANCH=$(branch_slash_filter $SAMBA_BRANCH)

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 4757f9ce4b101097e1c42c0905aaff8d5b998907..7d5dfe576ad5e5f026212ece7cb55c63f5761459 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -2,8 +2,12 @@
 
 set -ex
 
-TEMPVENV=$(mktemp -td venv.XXXXXXXXXX)
-VENV="$TEMPVENV/bin"
+function create_venv_dir() {
+    local venv_dir
+    venv_dir=$(mktemp -td venv.XXXXXXXXXX)
+    trap "rm -rf ${venv_dir}" EXIT
+    echo "${venv_dir}"
+}
 
 function release_from_version() {
     local ver=$1

diff --git a/tcmu-runner/build/setup b/tcmu-runner/build/setup
index c36cffd2ddeb17e69894ed4c1167cb4ed73a77c9..993b3896a09325cccc8fb09ff4edb41b0a9ba10a 100644 (file)
--- a/tcmu-runner/build/setup
+++ b/tcmu-runner/build/setup
@@ -36,6 +36,8 @@ echo "*****"
 export LC_ALL=C # the following is vulnerable to i18n
 
 pkgs=( "chacractl>=0.0.21" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # ask shaman which chacra instance to use

diff --git a/teuthology-docs/build/build b/teuthology-docs/build/build
index 77628b1ace0dff08ad8dd052af9cefe2a3efd821..fe1cbaee08a012f86349c4d774bd1efb14617f97 100644 (file)
--- a/teuthology-docs/build/build
+++ b/teuthology-docs/build/build
@@ -4,6 +4,8 @@ set -ex
 
 # the following two methods exist in scripts/build_utils.sh
 pkgs=( "tox" )
+TEMPVENV=$(create_venv_dir)
+VENV=${TEMPVENV}/bin
 install_python_packages $TEMPVENV "pkgs[@]"
 
 # create the docs build with tox