create the chacractl virtualenv at $WORKSPACE/venv

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

diff --git a/ceph-build-next/build/build_deb b/ceph-build-next/build/build_deb
index 6c179786ca5dedd2c8ed5e571ea22e0159770087..662df0b2a1855b9edc5bf08134897ff7c757f3ad 100644 (file)
--- a/ceph-build-next/build/build_deb
+++ b/ceph-build-next/build/build_deb
@@ -33,7 +33,7 @@ vers=`cat ./dist/version`
 distro=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
 chacra_endpoint="ceph/${chacra_ref}/${distro}/{$dist}/${ARCH}"
 
-./venv/bin/chacractl exists binaries/${chacra_endpoint}; exists=$? || true
+$WORKSPACE/venv/bin/chacractl exists binaries/${chacra_endpoint}; exists=$? || true
 
 # if the binary already exists in chacra, do not rebuild
 if [ $exists -e 0 ] && [ "$FORCE" = false ] ; then
@@ -173,7 +173,7 @@ echo "Start Time = $start_time"
 echo "  End Time = $(date)"
 
 # push binaries to chacra
-find release/$vers/ | grep 'changes\|deb\|dsc\|gz' | ./venv/bin/chacractl binary create ${chacra_endpoint}
+find release/$vers/ | grep 'changes\|deb\|dsc\|gz' | $WORKSPACE/venv/bin/chacractl binary create ${chacra_endpoint}
 
 
 echo "End Date: $(date)"

diff --git a/ceph-build-next/build/build_rpm b/ceph-build-next/build/build_rpm
index 6e85393d6aaf8b5c426e3558871e458d2cbb0133..b1773e34b3a238d886260e15e2ff9139a6395172 100644 (file)
--- a/ceph-build-next/build/build_rpm
+++ b/ceph-build-next/build/build_rpm
@@ -59,7 +59,7 @@ vers=`cat ./dist/version`
 [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
 chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}"
 
-./venv/bin/chacractl exists binaries/${chacra_baseurl}/${ARCH}; exists=$? || true
+$WORKSPACE/venv/bin/chacractl exists binaries/${chacra_baseurl}/${ARCH}; exists=$? || true
 
 # if the binary already exists in chacra, do not rebuild
 if [ $exists -e 0 ] && [ "$FORCE" = false ]; then
@@ -115,7 +115,7 @@ cd "$WORKSPACE"
 
 
 # push binaries to chacra
-find release/${vers}/rpm/*/SRPMS | grep rpm | ./venv/bin/chacractl binary create ${chacra_baseurl}/source
-find release/${vers}/rpm/*/RPMS/* | grep rpm | ./venv/bin/chacractl binary create ${chacra_baseurl}/${ARCH}
+find release/${vers}/rpm/*/SRPMS | grep rpm | $WORKSPACE/venv/bin/chacractl binary create ${chacra_baseurl}/source
+find release/${vers}/rpm/*/RPMS/* | grep rpm | $WORKSPACE/venv/bin/chacractl binary create ${chacra_baseurl}/${ARCH}
 
 echo "End Date: $(date)"

diff --git a/ceph-build-next/build/setup b/ceph-build-next/build/setup
index 6f95d8c16b142c3b065e5d6432cd85ffb31d47f7..78b751ee29330e0e5177196f8c0dd9b20c621fd6 100644 (file)
--- a/ceph-build-next/build/setup
+++ b/ceph-build-next/build/setup
@@ -67,8 +67,8 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
 esac
 
 # Create the virtualenv
-virtualenv venv
-. venv/bin/activate
+virtualenv $WORKSPACE/venv
+$WORKSPACE/venv/bin/activate
 
 # Define and ensure the PIP cache
 PIP_SDIST_INDEX="$HOME/.cache/pip"