X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=b61d03e46f56a4ad34b3a14b91895c947d5eb3ca;hb=a94f47f637a6b2191653fe17f968af1f56af828e;hp=95f5427b944bf11fadb8a71dbee0a6a8c355f950;hpb=5f76aa22d7e4b23e6299a7edd062be1263371ef1;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 95f5427b..b61d03e4 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -48,7 +48,7 @@ EOF
 
 # Push merkels qa user, so the qa pages can show "dinstall is running" information
 echo "Telling merkels QA user that we start dinstall"
-ssh -2 -i ~dak/.ssh/push_merkel_qa  -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 qa@merkel.debian.org sleep 1
+ssh -2 -i ~dak/.ssh/push_merkel_qa  -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@merkel.debian.org sleep 1 || true
 ts
 
 ################################################################################
@@ -175,7 +175,7 @@ cd $scriptsdir
 ts
 
 echo "Trigger daily wanna-build run"
-ssh buildd@buildd /org/wanna-build/trigger.daily
+ssh -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 buildd@buildd /org/wanna-build/trigger.daily || echo "W-B trigger.daily failed" | mail -s "W-B Daily trigger failed" ftpmaster@ftp-master.debian.org
 
 rm -f $NOTICE
 rm -f $LOCKCU
@@ -217,7 +217,7 @@ $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
 
 # Push katie@merkel so it syncs the projectb there. Returns immediately, the sync runs detached
 echo "Trigger merkels projectb sync"
-ssh -2 -i ~/.ssh/push_merkel_projectb katie@merkel.debian.org sleep 1
+ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_projectb katie@merkel.debian.org sleep 1 || true
 
 ################################################################################