if TEST_BUILD is checked, push binaries to chacra under the 'test' ref

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 d4b9cf3f27ac48fee8b0e6ef0861bba49d20f525..3c00433f6717e4e0729e3aad2093aab66baf8eca 100644 (file)
--- a/ceph-build-next/build/build_deb
+++ b/ceph-build-next/build/build_deb
@@ -160,9 +160,10 @@ echo lintian --allow-root $releasedir/$cephver/*$bpvers*.deb
 echo "Start Time = $start_time"
 echo "  End Time = $(date)"
 
+[ "$TEST_BUILD" = true ] && chacra_ref="$vers" || chacra_ref="test"
 
 # push binaries to chacra
-find release/$vers/ | grep 'changes\|deb\|dsc\|gz' | chacractl binary create ceph/${vers}/${distro}/{$dist}/${ARCH}
+find release/$vers/ | grep 'changes\|deb\|dsc\|gz' | chacractl binary create ceph/${chacra_ref}/${distro}/{$dist}/${ARCH}
 
 
 echo "End Date: $(date)"

diff --git a/ceph-build-next/build/build_rpm b/ceph-build-next/build/build_rpm
index 92f692aae7977085d8ed26eee065682624723aa6..447fa1804d3ada82bb0278ae3a15e23800500bed 100644 (file)
--- a/ceph-build-next/build/build_rpm
+++ b/ceph-build-next/build/build_rpm
@@ -105,8 +105,10 @@ echo done
 # Make sure we execute at the top level directory
 cd "$WORKSPACE"
 
+[ "$TEST_BUILD" = true ] && chacra_ref="$vers" || chacra_ref="test"
+
 # push binaries to chacra
-find release/${vers}/rpm/*/SRPMS | grep rpm | chacractl binary create ceph/${vers}/${DISTRO}/${RELEASE}/source
-find release/${vers}/rpm/*/RPMS/* | grep rpm | chacractl binary create ceph/${vers}/${DISTRO}/{$RELEASE}/${ARCH}
+find release/${vers}/rpm/*/SRPMS | grep rpm | chacractl binary create ceph/${chacra_ref}/${DISTRO}/${RELEASE}/source
+find release/${vers}/rpm/*/RPMS/* | grep rpm | chacractl binary create ceph/${chacra_ref}/${DISTRO}/{$RELEASE}/${ARCH}
 
 echo "End Date: $(date)"