]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
use the new RC option to modify the chacra ref 234/head
authorAlfredo Deza <adeza@redhat.com>
Wed, 18 Nov 2015 22:05:38 +0000 (17:05 -0500)
committerAlfredo Deza <adeza@redhat.com>
Wed, 18 Nov 2015 22:05:38 +0000 (17:05 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph-build/build/build_deb
ceph-build/build/build_rpm

index e541b012015641086b327ed48f93747db09b47ba..cf12fe1c54afe3ab78bdce7b7b251c7e23ea69fe 100644 (file)
@@ -30,7 +30,9 @@ get_bptag() {
 
 BPTAG=`get_bptag $DIST`
 
-[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
+# slap -rc to the ref if we are doing a release-candidate build
+[ "$RC" = true ] && chacra_ref="$BRANCH-rc" || chacra_ref="$BRANCH"
+[ "$TEST" = true ] && chacra_ref="test"
 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 b0956587a73c53fe5748aed2b6f786e9588327d1..76b59119c8f622df7e933089547601f618d562ab 100644 (file)
@@ -58,7 +58,9 @@ dist=$DIST
 echo dist $dist
 
 vers=`cat ./dist/version`
-[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
+# slap -rc to the ref if we are doing a release-candidate build
+[ "$RC" = true ] && chacra_ref="$BRANCH-rc" || chacra_ref="$BRANCH"
+[ "$TEST" = true ] && chacra_ref="test"
 chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}"
 
 # this exists in scripts/build_utils.sh