From 8ff051ad786e3c0f0c8ba48948f9eb472ecc5af1 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 1 Dec 2015 15:24:36 -0500 Subject: [PATCH] define universal and all/noarch for ceph-deploy binaries Signed-off-by: Alfredo Deza --- ceph-deploy-build/build/build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ceph-deploy-build/build/build b/ceph-deploy-build/build/build index c8eb82dc..56ffb0f5 100644 --- a/ceph-deploy-build/build/build +++ b/ceph-deploy-build/build/build @@ -45,8 +45,9 @@ then [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH" chacra_endpoint="ceph-deploy/${chacra_ref}/${DISTRO}/${DISTRO_VERSION}" - # this exists in scripts/build_utils.sh - check_binary_existence $chacra_endpoint/$ARCH + # this exists in scripts/build_utils.sh for ceph-deploy, binaries have + # no architecture so we POST them to 'noarch' for rpms + check_binary_existence $chacra_endpoint/noarch if [ ! -e setup.py ] ; then echo "Are we in the right directory" @@ -67,7 +68,7 @@ then [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" find ${BUILDAREA}/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source - find ${BUILDAREA}/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH} + find ${BUILDAREA}/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/noarch exit 0 @@ -86,7 +87,9 @@ then DISTRO=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"` [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH" - chacra_endpoint="ceph-deploy/${chacra_ref}/${DISTRO}/${DEB_BUILD}/${ARCH}" + # ceph-deploy isn't architecture dependant, so we use 'all' as architecture and + # uses 'universal' to signal this is not specific to any distro version + chacra_endpoint="ceph-deploy/${chacra_ref}/${DISTRO}/universal/all" # this exists in scripts/build_utils.sh check_binary_existence $chacra_endpoint -- 2.39.5