[Qa-jenkins-scm] [jenkins.debian.net] 04/05: reproducible: on remote host problems: sleep longer if the 2nd host is down, in general sleep shorter though, as retrying is rather cheap

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 8a05bb5f5b1bbfcd5681dbf23282a9ba32e0eb0f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Sep 20 15:04:56 2015 +0200

    reproducible: on remote host problems: sleep longer if the 2nd host is down, in general sleep shorter though, as retrying is rather cheap
---
 bin/reproducible_build.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ce5cc8a..5fcda1a 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -572,9 +572,10 @@ remote_build() {
 	RESULT=$?
 	# abort job if host is down
 	if [ $RESULT -ne 0 ] ; then
-		echo "$(date -u) - $NODE seems to be down, sleeping 23min before aborting this job."
+		SLEEPTIME=$(echo "$BUILDNR*$BUILDNR*5"|bc)
+		echo "$(date -u) - $NODE seems to be down, sleeping ${SLEEPTIME}min before aborting this job."
 		unregister_build
-		sleep 23m
+		sleep ${SLEEPTIME}m
 		exec /srv/jenkins/bin/abort.sh
 	fi
 	ssh -p $PORT $NODE /srv/jenkins/bin/reproducible_build.sh $BUILDNR ${SRCPACKAGE} ${SUITE} ${TMPDIR}
@@ -588,8 +589,8 @@ remote_build() {
 	rsync -e "ssh -p $PORT" -r $NODE:$TMPDIR/b$BUILDNR $TMPDIR/
 	RESULT=$?
 	if [ $RESULT -ne 0 ] ; then
-		echo "$(date -u ) - rsync from $NODE failed, sleeping 5m before re-trying..." | tee -a ${RBUILDLOG}
-		sleep 5m
+		echo "$(date -u ) - rsync from $NODE failed, sleeping 2m before re-trying..." | tee -a ${RBUILDLOG}
+		sleep 2m
 		rsync -e "ssh -p $PORT" -r $NODE:$TMPDIR/b$BUILDNR $TMPDIR/
 		RESULT=$?
 		if [ $RESULT -ne 0 ] ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git