From 9efd76c007a8285da9e1288cacba79236cd6596f Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 18 Nov 2015 17:05:38 -0500 Subject: [PATCH] use the new RC option to modify the chacra ref Signed-off-by: Alfredo Deza --- ceph-build/build/build_deb | 4 +++- ceph-build/build/build_rpm | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb index e541b012..cf12fe1c 100644 --- a/ceph-build/build/build_deb +++ b/ceph-build/build/build_deb @@ -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}" diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm index b0956587..76b59119 100644 --- a/ceph-build/build/build_rpm +++ b/ceph-build/build/build_rpm @@ -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 -- 2.39.5