From 9904f441531cda0f54326f7d716600fae556ed25 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 28 Oct 2015 15:44:37 -0500 Subject: [PATCH] use $BRANCH as the chacra_ref Signed-off-by: Andrew Schoen --- ceph-build-next/build/build_deb | 2 +- ceph-build-next/build/build_rpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-build-next/build/build_deb b/ceph-build-next/build/build_deb index d273a8bd..6c179786 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="test" || chacra_ref="$vers" +[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH" 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 12116e91..6e85393d 100644 --- a/ceph-build-next/build/build_rpm +++ b/ceph-build-next/build/build_rpm @@ -56,7 +56,7 @@ dist=$DIST echo dist $dist vers=`cat ./dist/version` -[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$vers" +[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH" chacra_baseurl="ceph/${chacra_ref}/${DISTRO}/${RELEASE}" ./venv/bin/chacractl exists binaries/${chacra_baseurl}/${ARCH}; exists=$? || true -- 2.39.5