From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 28 Oct 2015 20:00:18 +0000 (-0500)
Subject: use the chacractl that's installed in the virtualenv
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f8e14f16ffe04f9551ff1725dbbd74daa679100c;p=ceph-build.git

use the chacractl that's installed in the virtualenv

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 021d369e..12f90293 100644
--- 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}"
 
-chacractl exists binaries/${chacra_endpoint}; exists=$? || true
+./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' | chacractl binary create ${chacra_endpoint}
+find release/$vers/ | grep 'changes\|deb\|dsc\|gz' | ./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 e6c55a68..25cae8cd 100644
--- a/ceph-build-next/build/build_rpm
+++ b/ceph-build-next/build/build_rpm
@@ -58,7 +58,7 @@ vers=`cat ./dist/version`
 [ "$TEST" = true ] && chacra_ref="$vers" || chacra_ref="test"
 chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}"
 
-chacractl exists binaries/${chacra_baseurl}/${ARCH}; exists=$? || true
+./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
@@ -114,7 +114,7 @@ cd "$WORKSPACE"
 
 
 # push binaries to chacra
-find release/${vers}/rpm/*/SRPMS | grep rpm | chacractl binary create ${chacra_baseurl}/source
-find release/${vers}/rpm/*/RPMS/* | grep rpm | chacractl binary create ${chacra_baseurl}/${ARCH}
+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}
 
 echo "End Date: $(date)"