From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 5 Aug 2016 14:25:53 +0000 (-0500)
Subject: always use the value of VENV set in build_utils.sh
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59d74fa84b0ae22bec25c2aaf1d2b18856186907;p=ceph-build.git

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 3363dd0d..d8a1993d 100644
--- 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 45ca8999..605bcdf8 100644
--- 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 b8c1c4ef..c072e530 100644
--- 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 d9764aa6..c9dde1cb 100644
--- 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 679c1bcd..e6961b82 100644
--- 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