From e302eaabb977f3e93b1a7005c879f4b2eba581fc Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 19 May 2021 21:59:34 +0800 Subject: [PATCH] *: 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 --- calamari-clients-build/build/setup | 2 ++ calamari/build/setup | 2 ++ ceph-ansible-docs-prs/build/build | 2 ++ ceph-ansible-docs/build/build | 2 ++ ceph-ansible-nightly/build/build | 2 ++ ceph-ansible-prs/build/build | 2 ++ ceph-ansible-rpm/build/build | 2 ++ ceph-ansible-scenario/build/build | 2 ++ ceph-build-pull-requests/build/build | 2 ++ ceph-build/build/setup_deb | 2 ++ ceph-build/build/setup_rpm | 2 ++ ceph-container-nighlity/build/build | 2 ++ ceph-container-prs/build/build | 2 ++ ceph-deploy-build/build/setup | 2 ++ ceph-deploy-docs/build/build | 2 ++ ceph-deploy-pull-requests/build/setup | 2 ++ ceph-deploy-tag/build/build | 2 ++ ceph-dev-build/build/setup_deb | 2 ++ ceph-dev-build/build/setup_osc | 2 ++ ceph-dev-build/build/setup_rpm | 2 ++ ceph-dev-new-build/build/setup_deb | 2 ++ ceph-dev-new-build/build/setup_mingw | 2 ++ ceph-dev-new-build/build/setup_rpm | 2 ++ ceph-iscsi-cli-flake8/build/build | 2 ++ ceph-iscsi-cli/build/setup | 2 ++ ceph-iscsi-config-flake8/build/build | 2 ++ ceph-iscsi-config/build/setup | 2 ++ ceph-iscsi-stable/build/setup | 2 ++ ceph-iscsi-tools/build/setup | 2 ++ ceph-iscsi-tox/build/build | 2 ++ ceph-iscsi/build/setup | 2 ++ ceph-medic-docs/build/build | 2 ++ ceph-medic-pull-requests/build/build | 2 ++ ceph-medic-release/build/build_rpm | 2 ++ ceph-medic-rpm/build/build | 2 ++ ceph-medic-tests/build/build | 2 ++ ceph-pr-commits/build/build | 2 ++ ceph-qa-suite-pull-requests/build/build | 2 ++ ceph-release-rpm/build/build | 2 ++ ceph-tag/build/build | 2 ++ ceph-volume-ansible-prs/build/build | 2 ++ ceph-volume-ansible-prs/build/teardown | 2 ++ ceph-volume-nightly/build/build | 2 ++ ceph-volume-pr/build/build | 2 ++ ceph-volume-pr/build/teardown | 2 ++ ceph-volume-scenario/build/build | 2 ++ cephadm-ansible-prs/build/build | 2 ++ cephmetrics-pull-requests/setup/setup | 2 ++ cephmetrics-release/build/setup | 2 ++ cephmetrics/build/setup | 2 ++ chacra-pull-requests/build/build | 2 ++ configshell-fb/build/setup | 2 ++ diamond-build/build/setup | 2 ++ jenkins-job-builder/build/build | 2 ++ kernel/build/setup | 2 ++ merfi-pull-requests/build/build | 2 ++ mita-deploy/build/build | 2 ++ nfs-ganesha-stable/build/setup | 2 ++ nfs-ganesha/build/setup | 2 ++ paddles-pull-requests/build/build | 2 ++ radosgw-agent-pull-requests/build/build | 2 ++ radosgw-agent/build/build | 2 ++ rtslib-fb/build/setup | 2 ++ samba/build/setup | 2 ++ scripts/build_utils.sh | 8 ++++++-- tcmu-runner/build/setup | 2 ++ teuthology-docs/build/build | 2 ++ 67 files changed, 138 insertions(+), 2 deletions(-) diff --git a/calamari-clients-build/build/setup b/calamari-clients-build/build/setup index 8856866b..9b7a0f0f 100644 --- 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 981ec854..d9011a1d 100644 --- 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 ee4ec651..83255535 100644 --- 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 b060335b..55858d05 100644 --- 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 6a96d997..174626fe 100644 --- 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 a929dcdb..9a70a950 100644 --- 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 1a5ed0da..46be3f83 100644 --- 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 aa99bd18..c2d51462 100644 --- 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 fb6a7159..204c0a5a 100644 --- 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 6ed8e12e..7671de16 100644 --- 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 f6b63fe1..6bcbbf95 100644 --- 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 df9a6128..027c276a 100644 --- 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 df9a6128..027c276a 100644 --- 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 1f71004f..0d1a8bc0 100644 --- 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 1f80aafb..9b4c18a7 100644 --- 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 ced5ae48..a2f37ff2 100644 --- 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 1ea302bf..bd040cd2 100644 --- 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 9720f518..4a92a1b7 100644 --- 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 591d4034..1e350ed7 100644 --- 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 639d7b62..be71f142 100644 --- 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 9720f518..4a92a1b7 100644 --- 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 08ba136f..27507c6a 100644 --- 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 aad8c5d7..49338cff 100644 --- 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 70779665..fa2327dc 100644 --- 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 c36cffd2..993b3896 100644 --- 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 2aa39eaa..0f6a05f2 100644 --- 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 c36cffd2..993b3896 100644 --- 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 746f0f1d..bc3de22d 100644 --- 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 c36cffd2..993b3896 100644 --- 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 e5b00a24..1a0e9dc9 100644 --- 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 c36cffd2..993b3896 100644 --- 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 003ddbbc..3de81e41 100644 --- 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 c5385f19..c08420b7 100644 --- 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 cef722bc..fa3f8e24 100644 --- 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 1a5ed0da..46be3f83 100644 --- 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 3a745370..e4c36d5f 100644 --- 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 0f4ac0bd..c1d2d776 100644 --- 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 08b39bbd..ff03e532 100644 --- 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 aed3cd23..6a9d117b 100644 --- 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 d97a3e70..32b7aa6e 100644 --- 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 17c9ffa2..7a61adc4 100644 --- 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 6b92cb3e..11e3bbcf 100644 --- 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 8f1a68f9..b912c5ca 100644 --- 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 8ee52a8e..d46f5660 100644 --- 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 ab07894a..32379faa 100644 --- 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 2023af31..2b7ea355 100644 --- 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 bd5afe3d..d3be0c34 100644 --- 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 420fbefc..2a16da3a 100644 --- 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 576e7fb9..d829d486 100644 --- 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 14fec3fc..ccaf34c7 100644 --- 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 44fae5c1..38033107 100644 --- 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 c36cffd2..993b3896 100644 --- 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 8856866b..9b7a0f0f 100644 --- 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 bbc44b7e..3f293b94 100644 --- 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 b95471e3..b3fe421a 100644 --- 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 4d2603ce..65186c52 100644 --- 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 83b0ee17..d91de291 100644 --- 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 58c6f085..d7de8f0b 100644 --- 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 57c1408c..c3d99b96 100644 --- 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 9f0922e6..89787aeb 100644 --- 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 7ff22019..3500acd2 100644 --- 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 9be36763..f3b026e7 100644 --- 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 c36cffd2..993b3896 100644 --- 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 d7956618..de710946 100644 --- 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 4757f9ce..7d5dfe57 100644 --- 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 c36cffd2..993b3896 100644 --- 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 77628b1a..fe1cbaee 100644 --- 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 -- 2.39.5