always use the value of VENV set in build_utils.sh

We need to do this because that is not created in a temp directory.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index 3363dd0d1587cfd1c73188007bad617565509b3e..d8a1993dfdff159341d106a9f8503b7c500c0b9a 100644 (file)
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -6,8 +6,6 @@ if test -f /etc/redhat-release ; then
     exit 0
 fi
 
-VENV="$WORKSPACE/venv/bin"
-
 get_bptag() {
     dist=$1
 

diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm
index 45ca899935945f9ff8523797523410bc5a73ca8b..605bcdf8c942054c30eb30c1e0ac3d9e1239daef 100644 (file)
--- a/ceph-build/build/build_rpm
+++ b/ceph-build/build/build_rpm
@@ -5,8 +5,6 @@ if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then
     exit 0
 fi
 
-VENV="$WORKSPACE/venv/bin"
-
 get_rpm_dist() {
     LSB_RELEASE=/usr/bin/lsb_release
     [ ! -x $LSB_RELEASE ] && echo unknown && exit

diff --git a/ceph-deploy-build/build/build b/ceph-deploy-build/build/build
index b8c1c4ef3ffbeaeb57dfd70ee2bffd1078c0a626..c072e530950ea6258812371385e8570ea131427e 100644 (file)
--- a/ceph-deploy-build/build/build
+++ b/ceph-deploy-build/build/build
@@ -20,8 +20,6 @@ echo "  SHA1=$GIT_COMMIT"
 rpm_dists="rhel centos6 centos7 centos"
 deb_dists="precise wheezy squeeze trusty jessie"
 
-VENV="$WORKSPACE/venv/bin"
-
 # A helper to match an item in a list of items, like python's `if item in list`
 listcontains() {
   for word in $2; do

diff --git a/ceph-dev-build/build/build_deb b/ceph-dev-build/build/build_deb
index d9764aa69e86f97f079a6e869550ef08fe984e66..c9dde1cb8956b7124e96c9991277b0a9e36b28cf 100644 (file)
--- a/ceph-dev-build/build/build_deb
+++ b/ceph-dev-build/build/build_deb
@@ -6,8 +6,6 @@ if test -f /etc/redhat-release ; then
     exit 0
 fi
 
-VENV="$WORKSPACE/venv/bin"
-
 get_bptag() {
     dist=$1
 

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 679c1bcdc1f193133f4c258d0c420664cd402040..e6961b822267b6ace899c76751181e7a757f5799 100644 (file)
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -5,8 +5,6 @@ if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then
     exit 0
 fi
 
-VENV="$WORKSPACE/venv/bin"
-
 get_rpm_dist() {
     LSB_RELEASE=/usr/bin/lsb_release
     [ ! -x $LSB_RELEASE ] && echo unknown && exit