From f2a9a7adaa7d4603d0489d0f292e44fe58b9ac45 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 4 Nov 2015 09:28:23 -0600 Subject: [PATCH] ceph-build-next: use --force with chacractl when FORCE is checked Signed-off-by: Andrew Schoen --- ceph-build-next/build/build_deb | 4 +++- ceph-build-next/build/build_rpm | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ceph-build-next/build/build_deb b/ceph-build-next/build/build_deb index 295baf36..72da8b24 100644 --- a/ceph-build-next/build/build_deb +++ b/ceph-build-next/build/build_deb @@ -176,8 +176,10 @@ echo lintian --allow-root $releasedir/$cephver/*$bpvers*.deb echo "Start Time = $start_time" echo " End Time = $(date)" +[ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" + # push binaries to chacra -find release/$vers/ | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | chacractl binary create ${chacra_endpoint} +find release/$vers/ | egrep "*\.(changes|deb|dsc|gz)$" | egrep -v "(Packages|Sources|Contents)" | chacractl binary ${chacra_flags} create ${chacra_endpoint} echo "End Date: $(date)" diff --git a/ceph-build-next/build/build_rpm b/ceph-build-next/build/build_rpm index 3b3096b3..19b3e8d8 100644 --- a/ceph-build-next/build/build_rpm +++ b/ceph-build-next/build/build_rpm @@ -117,9 +117,10 @@ echo done # Make sure we execute at the top level directory cd "$WORKSPACE" +[ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" # push binaries to chacra -find release/${vers}/rpm/*/SRPMS | grep rpm | chacractl binary create ${chacra_baseurl}/source -find release/${vers}/rpm/*/RPMS/* | grep rpm | chacractl binary create ${chacra_baseurl}/${ARCH} +find release/${vers}/rpm/*/SRPMS | grep rpm | chacractl binary ${chacra_flags} create ${chacra_baseurl}/source +find release/${vers}/rpm/*/RPMS/* | grep rpm | chacractl binary ${chacra_flags} create ${chacra_baseurl}/${ARCH} echo "End Date: $(date)" -- 2.39.5