From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Mon, 15 Oct 2007 10:14:10 +0000 (+0100)
Subject: * hosts/cadmium/lalonde-nightly: check for testbed sentinel file
X-Git-Tag: converted-from-bzr~30^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=454d96db64ed32e2ff91b7d3795b551366b545f3;p=autopkgtest.git

* hosts/cadmium/lalonde-nightly: check for testbed sentinel file
  and stop if not present.
---

diff --git a/debian/changelog b/debian/changelog
index 73f9641..a180712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ autopkgtest (1.0.9) unstable; urgency=low
     blacklist ltsp-client{,-core}.
   * adt-testreport-onepackage: limit log to 64K (32K head, 32K tail)
     to avoid humungous bug reports which LP silently discards.
+  * hosts/cadmium/lalonde-nightly: check for testbed sentinel file
+    and stop if not present.
 
  --
 
diff --git a/hosts/cadmium/lalonde-nightly b/hosts/cadmium/lalonde-nightly
index 020b5f2..70ce91a 100755
--- a/hosts/cadmium/lalonde-nightly
+++ b/hosts/cadmium/lalonde-nightly
@@ -15,6 +15,8 @@ go_anyway=false
 
 for x in "$@"; do eval "$x"; done
 
+: ${testbed_check_path:=/var/lib/autopkgtest/xenlvm/adt_gutsy/good}
+
 fail () { printf >&2 "%s\n" "$*"; exit 127; }
 progress () { printf "========== %s ==========\n" "$1"; }
 x () { printf "+ %s\n" "$*"; "$@"; }
@@ -42,7 +44,12 @@ test_count=0
 while $any_tests_ok && ($go_anyway || test -f go) && test $test_count -lt $max_test_count; do
 	now=`date`
 	printf "%s" "$now: "
-	
+
+	if ! test -f $testbed_check_path; then
+		printf " testbed broken, bailing\n"
+		break
+	fi
+
 	xopts="${xoptslist%%:*}"
 	xopts_opts="${xopts#*,}"
 	xoptslist="${xoptslist#*:}:$xopts"