ceph-build: only push to chacra when $THROWAWAY is false

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

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index f558f2d2a0b7713f2b3fd3d8c95e2f1a2453dab9..c026fcdcb9ae2bb35c18a7f9ff17291862b863ac 100644 (file)
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -37,8 +37,10 @@ vers=`cat ./dist/version`
 distro=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
 chacra_endpoint="ceph/${chacra_ref}/${distro}/${DIST}/${ARCH}"
 
-# this exists in scripts/build_utils.sh
-check_binary_existence $chacra_endpoint
+if [ "$THROWAWAY" = false ] ; then
+    # this exists in scripts/build_utils.sh
+    check_binary_existence $chacra_endpoint
+fi
 
 HOST=$(hostname --short)
 echo "Building on $(hostname)"
@@ -168,5 +170,7 @@ echo lintian --allow-root $releasedir/$cephver/*$bpvers*.deb
 
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 
-# push binaries to chacra
-find release/$vers/ | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}
+if [ "$THROWAWAY" = false ] ; then
+    # push binaries to chacra
+    find release/$vers/ | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}
+fi

diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm
index 928ed0511a79ec9ceaff04a1b1aa2bdd2210b203..4054b5ae329af162ab290f91fc2dd34cee3fa45d 100644 (file)
--- a/ceph-build/build/build_rpm
+++ b/ceph-build/build/build_rpm
@@ -63,8 +63,10 @@ vers=`cat ./dist/version`
 [ "$TEST" = true ] && chacra_ref="test"
 chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}"
 
-# this exists in scripts/build_utils.sh
-check_binary_existence $chacra_baseurl/$ARCH
+if [ "$THROWAWAY" = false ] ; then
+    # this exists in scripts/build_utils.sh
+    check_binary_existence $chacra_baseurl/$ARCH
+fi
 
 HOST=$(hostname --short)
 echo "Building on $(hostname)"
@@ -114,6 +116,8 @@ cd "$WORKSPACE"
 
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 
-# push binaries to chacra
-find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_baseurl}/source
-find release/${vers}/rpm/*/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_baseurl}/${ARCH}
+if [ "$THROWAWAY" = false ] ; then
+    # push binaries to chacra
+    find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_baseurl}/source
+    find release/${vers}/rpm/*/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_baseurl}/${ARCH}
+fi