ceph-build-next: use --force with chacractl when FORCE is checked

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-build-next/build/build_deb b/ceph-build-next/build/build_deb
index 295baf36db629ab05772b565173c8750d595bf2f..72da8b24e04c1e52f2ddf63915df4e286c1c3a63 100644 (file)
--- 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 3b3096b38e0bf8b87ec5b17dc89a62e7b1c28ea5..19b3e8d8d35777917cd18734873df9c35d68dd74 100644 (file)
--- 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)"