* hosts/cadmium/lalonde-nightly: check for testbed sentinel file

  and stop if not present.

diff --git a/debian/changelog b/debian/changelog
index 73f9641f871e3a33cfa4e5a66276f1cdeac41d76..a1807123cecf1782e3a33f6e3a3effbf38f2fa6e 100644 (file)
--- 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 020b5f29429a9728bfb1f9e4ca2caec603379776..70ce91ad9e56fdf16f8549cbbeed535181f2e276 100755 (executable)
--- 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"