summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-20 15:04:56 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-20 15:04:56 +0200
commit8a05bb5f5b1bbfcd5681dbf23282a9ba32e0eb0f (patch)
tree8e52212ff0be71075387849fb28410b03673b462 /bin
parent0f5b425990a2e9d24e1aec3eedcf94555cbb0c57 (diff)
downloadjenkins.debian.net-8a05bb5f5b1bbfcd5681dbf23282a9ba32e0eb0f.tar.xz
reproducible: on remote host problems: sleep longer if the 2nd host is down, in general sleep shorter though, as retrying is rather cheap
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index ce5cc8a3..5fcda1a6 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