Change the cron script (btw. we are now triggered by systemd timers)

[can-benchmark.git] / continuous / cron.sh

diff --git a/continuous/cron.sh b/continuous/cron.sh
index a7794cd2f6a45abc65094b70883b391716ce4e28..6a53ecd9865fa26b98f874a8fa2a70f19c4c201b 100755 (executable)
--- a/continuous/cron.sh
+++ b/continuous/cron.sh
@@ -3,12 +3,13 @@
 PATH=$PATH:$HOME/bin
 
 set -e
+set -o pipefail
 
 cd $(dirname $0)
 
 # Wakeup glab
 sudo /usr/sbin/etherwake 00:0c:f1:77:ec:46
-while ! ssh sojka@glab true; do sleep 1; done
+chronic timeout 5m sh -c 'while ! ssh sojka@glab true; do sleep 1; done'
 sleep 30 # Wait a bit to finish all boot jobs etc.
 
 mkdir -p logs
@@ -16,13 +17,9 @@ mkdir -p logs
 NOW=$(date +%F_%R:%S)
 LOG=${NOW}.log
 
-if ! make -C steps > logs/$LOG 2>&1; then
-       cat logs/$LOG
-       exit 1
-fi
-
+make -C steps 1>&1 | tee logs/$LOG
 make -C www --silent publish
 
 ( cd logs && git add $LOG && git commit --quiet -m 'Automatic commit' && git push --quiet )
 
-ssh -f sojka@glab 'sudo /sbin/poweroff'
+#ssh -f sojka@glab 'sudo /sbin/poweroff'