From aa9bfbf74e03c3499fa0e4ded749176f0de97a95 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 13 Dec 2013 22:21:22 +0100 Subject: auto-delay forced builds, as if several builds are triggered at once, this is likely to fail (repoquery locks, dpkg-source on changing Git files) --- bin/build-deb-package | 7 +++++++ bin/build-rpm-package | 8 ++++++++ 2 files changed, 15 insertions(+) (limited to 'bin') diff --git a/bin/build-deb-package b/bin/build-deb-package index 49c0d80..9cc8bae 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -333,10 +333,17 @@ unlock_workspace() { rm -f $LOCK_FILE } +delay_build() { + sleep $[ ( $RANDOM % 30 ) + 1 ]s +} + ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { + if [ "x$FORCE_BUILD" = "xyes" ]; then + delay_build + fi lock_workspace prepare_workspace && { unlock_workspace diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 03b31c5..01d107b 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -312,10 +312,18 @@ unlock_workspace() { rm -f $LOCK_FILE } +delay_build() { + sleep $[ ( ( $RANDOM % 10 ) + 1 ) * 10 ]s +} + + ### MAIN ### set_vars $@ && { if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" = "yes" ] && { + if [ "x$FORCE_BUILD" = "xyes" ]; then + delay_build + fi lock_workspace prepare_workspace && { unlock_workspace -- cgit v1.2.3