From a94f47f637a6b2191653fe17f968af1f56af828e Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 15 Jun 2008 01:34:18 +0200 Subject: [PATCH] Make the ssh calls a bit more robust --- ChangeLog | 5 +++++ config/debian/cron.dinstall | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cafcd752..4f92bb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-06-15 Joerg Jaspert + * 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 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 ################################################################################ -- 2.39.5