From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 3 Nov 2015 15:04:07 +0000 (-0600)
Subject: ceph-release-rpm: fix the chacra TEST flag
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F194%2Fhead;p=ceph-build.git

ceph-release-rpm: fix the chacra TEST flag

actually post to the 'test' ref now

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

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index 34c5c2a8..c09fa116 100644
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -36,23 +36,23 @@ EOF
 
 # What are we building ?
 
+[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="${RELEASE}"
+
 target=$DIST
 if [ "$target" = "centos6" ] ; then
     target=el6
-    chacra_baseurl="ceph/${RELEASE}/centos/6"
+    chacra_baseurl="ceph/${chacra_ref}/centos/6"
 fi
 if [ "$target" = "centos7" ] ; then
     target=el7
-    chacra_baseurl="ceph/${RELEASE}/centos/7"
+    chacra_baseurl="ceph/${chacra_ref}/centos/7"
 fi
 if [ "$target" = "sles11sp2" ] ; then
     target=sles11
-    chacra_baseurl="ceph/${RELEASE}/sles/11"
+    chacra_baseurl="ceph/${chacra_ref}/sles/11"
 fi
 echo "Target directory is: $target"
 
-[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
-
 chacractl exists binaries/${chacra_baseurl}/${ARCH}; exists=$? || true
 
 # if the binary already exists in chacra, do not rebuild