From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 28 Oct 2015 20:10:46 +0000 (-0500)
Subject: fix logic when defining the chacra_ref
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=714660f0e5251310c7858a81bdb1c2fc42eb30d9;p=ceph-build.git

fix logic when defining the chacra_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 12f902933..d273a8bdf 100644
--- a/ceph-build-next/build/build_deb
+++ b/ceph-build-next/build/build_deb
@@ -28,7 +28,7 @@ get_bptag() {
 
 BPTAG=`get_bptag $DIST`
 
-[ "$TEST" = true ] && chacra_ref="$vers" || chacra_ref="test"
+[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$vers"
 vers=`cat ./dist/version`
 distro=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
 chacra_endpoint="ceph/${chacra_ref}/${distro}/{$dist}/${ARCH}"
diff --git a/ceph-build-next/build/build_rpm b/ceph-build-next/build/build_rpm
index 25cae8cd3..41f9b996f 100644
--- a/ceph-build-next/build/build_rpm
+++ b/ceph-build-next/build/build_rpm
@@ -55,7 +55,7 @@ dist=`get_rpm_dist`
 echo dist $dist
 
 vers=`cat ./dist/version`
-[ "$TEST" = true ] && chacra_ref="$vers" || chacra_ref="test"
+[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$vers"
 chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}"
 
 ./venv/bin/chacractl exists binaries/${chacra_baseurl}/${ARCH}; exists=$? || true