]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
fix logic when defining the chacra_ref
authorAndrew Schoen <aschoen@redhat.com>
Wed, 28 Oct 2015 20:10:46 +0000 (15:10 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Wed, 28 Oct 2015 20:10:46 +0000 (15:10 -0500)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
ceph-build-next/build/build_deb
ceph-build-next/build/build_rpm

index 12f902933b7c47c2d3e05c54050c8289924eaebe..d273a8bdfb7479543fc768dc975b49b87c103fd2 100644 (file)
@@ -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}"
index 25cae8cd3e51588ad4efd63f235e922da9737860..41f9b996f55b1eafb113eab52c0b52c9e2b58b73 100644 (file)
@@ -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