qa: respect $TEMPDIR

ceph-disk and ceph-detect-init are build in $TEMPDIR if it's defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0c47aa82177bb37f1579e777a7a7806eee601142)

diff --git a/qa/run-standalone.sh b/qa/run-standalone.sh
index 9321cba6515016696afaf22a4d60583ff09ab459..2c7ceaa3414e1c605d7c7fa225908517d3d58fa3 100755 (executable)
--- a/qa/run-standalone.sh
+++ b/qa/run-standalone.sh
@@ -6,7 +6,8 @@ if [ ! -e Makefile -o ! -d bin ]; then
     exit 1
 fi
 
-if [ ! -d /tmp/ceph-disk-virtualenv -o ! -d /tmp/ceph-detect-init-virtualenv ]; then
+TEMP_DIR=${TMPDIR:-/tmp}
+if [ ! -d $TEMP_DIR/ceph-disk-virtualenv -o ! -d $TEMP_DIR/ceph-detect-init-virtualenv ]; then
     echo '/tmp/*-virtualenv directories not built. Please run "make check" first.'
     exit 1
 fi

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index f12f0698a7624255d027d840d0e3662aec15d4f0..dc1843bdbeb8942ef558822ddf381b137c8a83f4 100755 (executable)
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -19,7 +19,7 @@
 #
 TIMEOUT=300
 PG_NUM=4
-: ${CEPH_BUILD_VIRTUALENV:=/tmp}
+CEPH_BUILD_VIRTUALENV=${TMPDIR:-/tmp}
 
 if type xmlstarlet > /dev/null 2>&1; then
     XMLSTARLET=xmlstarlet