summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-01-11 20:30:11 +0100
committerHolger Levsen <holger@layer-acht.org>2013-01-11 20:30:11 +0100
commit7565848ba2599f426e7ba4e6e2229a7d47482ca9 (patch)
treebdacde9039d485e7b3dfa67b3850e344cba1b9ba
parent295ae75826d4563dc7b0e7a014da902f815078e1 (diff)
downloadjenkins.debian.net-7565848ba2599f426e7ba4e6e2229a7d47482ca9.tar.xz
g-i: try harder to understand combi-server failures
-rwxr-xr-xbin/g-i-installation.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 321b1759..47308153 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -501,11 +501,12 @@ monitor_system() {
rm snapshot_${PRINTF_NR}.jpg
else
echo "could not take vncsnapshot, no qemu running on $DISPLAY"
+ let NR=NR+1
break
fi
# give signal we are still running
if [ $(($NR % 14)) -eq 0 ] ; then
- date
+ echo "$PRINTF_NR: $(date)"
fi
if [ $(($NR % 100)) -eq 0 ] ; then
# press ctrl-key to avoid screensaver kicking in
@@ -522,9 +523,11 @@ monitor_system() {
rm $GOCR
if [[ "$LAST_LINE" =~ .*Power\ down.* ]] ; then
echo "QEMU was powered down, continuing."
+ let NR=NR+1
break
elif [ ! -z "$STACK_LINE" ] ; then
echo "INFO: got a stack-trace, probably on power-down."
+ let NR=NR+1
break
fi
fi
@@ -554,7 +557,7 @@ monitor_system() {
if [ ! -z "$TRIGGER_MODE" ] ; then
echo "Warning: snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm match, ending installation."
ls -la snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm
- figlet "Installation hangs."
+ figlet "Mode $MODE hangs."
let NR=NR+1
break
else