Make the ssh calls a bit more robust

diff --git a/ChangeLog b/ChangeLog
index cafcd7524b23b7de2a2f3da8aa887c5e05003280..4f92bb1c6d7c2c423d73dfb56beb299c7804f849 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-06-15  Joerg Jaspert  <joerg@debian.org>
 
+       * config/debian/cron.dinstall: (various ssh calls): Make them use
+       batchmode/connect/setuptimeout to not take too long with
+       connections... Also || true them, no need to die in dinstall if
+       one host isn't reachable.
+
        * README: Updated mailing list location
 
 2008-06-14  Otavio Salvador  <otavio@debian.org>

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 95f5427b944bf11fadb8a71dbee0a6a8c355f950..b61d03e46f56a4ad34b3a14b91895c947d5eb3ca 100755 (executable)
--- 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
 
 ################################################################################