From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Mon, 25 Aug 2008 17:20:20 +0000 (+0100)
Subject: fixes from deployment
X-Git-Tag: converted-from-bzr~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3e6bf75f50aed84b7e12a21cfd2c06d63f1bfc67;p=autopkgtest.git

fixes from deployment
---

diff --git a/hosts/magrathea/cfg b/hosts/magrathea/cfg
index 8a89b6b..35092d5 100644
--- a/hosts/magrathea/cfg
+++ b/hosts/magrathea/cfg
@@ -9,9 +9,9 @@ administrator_email=ian@davenant.greenend.org.uk
 salutation="Ian"
 from="$salutation Jackson <ian+debian-autopkgtest@chiark.greenend.org.uk>"
 disable=false
-desthttphead=http://www.chiark.greenend.org.uk/~ijackson/
+desthttphead=http://www.chiark.greenend.org.uk/~ijackson
 destrsynchead=ijackson@chiark:public-html/
-destdirtail=autopkgtest/testing
+destdircommon=autopkgtest/
 adtvirt_extra_opts=--userv
 upload_if_ok=false
 upload_if_notests=true
@@ -32,23 +32,25 @@ rather than simple lack of a suitable package.
 While this bug remains open and assigned to this package, no further
 retesting will be done and no additional bugs will be filed.  When you
 have corrected the problem, close the bug and your package will be
-immediatley eligible for retesting.
+immediately eligible for retesting.
+
+If this automatic testing and bug filing is undesirable for certain
+packages(s) please let me know and I will add them to my blacklist.
 '
 
-#maintainer_email_override="new@bugs.launchpad.net"
 maintainer_email_override="$administrator_email"
 
 email_sourcepackage_header=\
 "Source: @p
 Version: @v
-User: autopkgtest@packages.debian.org
+User: autopkgtest@_packages.debian.org
 Usertags: autopkgtest
 
 "
 email_binarypackage_header=\
 "Package: @p
 Version: @v
-User: autopkgtest@packages.debian.org
+User: autopkgtest@_packages.debian.org
 Usertags: autopkgtest
 
 "
diff --git a/hosts/magrathea/crontab b/hosts/magrathea/crontab
index 4fb0997..c8d3895 100644
--- a/hosts/magrathea/crontab
+++ b/hosts/magrathea/crontab
@@ -1,4 +1,4 @@
 # m h    dom mon dow	command
-4-59/5 *    * * *	autopkgtest/runner/adt-testreport-cronjob adt-play cfg
+1-59/5 *    * * *	autopkgtest/runner/adt-testreport-cronjob adt-play cfg
 5-35/30 *   * * *	autopkgtest/runner/adt-openbugs-update adt-play cfg >/dev/null
 4 13	    * * Sun	savelog -c7 adt-play/var/log adt-play/var/overall.log
diff --git a/runner/adt-testreport-cronjob b/runner/adt-testreport-cronjob
index 833753a..5eb5f46 100755
--- a/runner/adt-testreport-cronjob
+++ b/runner/adt-testreport-cronjob
@@ -10,6 +10,6 @@ cd "$1"
 shift
 . "$1"
 exec >>var/overall.log 2>&1
-test -f go
+${ADT_GO_ANYWAY:-false} || test -f go
 with-lock-ex -q cronjob-lock \
  adt-testreport-runloop max_test_count=100 "$@"
diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index 61ce4a9..48e9b3b 100755
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -396,7 +396,7 @@ END
 	email_package_header="${email_package_header//@p/$pkg}"
 	email_package_header="${email_package_header//@s/$src}"
 	email_package_header="${email_package_header//@v/$pVersion}"
-	email_package_header="${email_package_header//@a/@}"
+	email_package_header="${email_package_header//@_/@}"
 	printf >"$tmp"/_email "%s" "$email_package_header"
 
 	cat >>"$tmp"/_email <<END
diff --git a/runner/adt-testreport-runloop b/runner/adt-testreport-runloop
index bda8da4..52abd9f 100755
--- a/runner/adt-testreport-runloop
+++ b/runner/adt-testreport-runloop
@@ -24,7 +24,7 @@
 set -e
 
 max_test_count=10
-go_anyway=false
+${ADT_GO_ANYWAY:=false}
 
 for arg in "$@"; do
 	case "$arg" in
@@ -59,7 +59,8 @@ progress testing
 
 test_count=0
 
-while ($go_anyway || test -f go) && test $test_count -lt $max_test_count; do
+while ($ADT_GO_ANYWAY || test -f go) && \
+      test $test_count -lt $max_test_count; do
 	now=`date`
 	printf "%s" "$now: "