fixes from deployment

diff --git a/hosts/magrathea/cfg b/hosts/magrathea/cfg
index 8a89b6b37ba7c5dae5919980610696044fa44707..35092d5c1bbb4f63ff4d1ffff7cf1fc93d49be8f 100644 (file)
--- 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 4fb099715f92c4e40f6eedc76c217beb6a889ec2..c8d38951ef1e05107aa057b861647a9a1c058554 100644 (file)
--- 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 833753a550c6ac1c9b92035c86048f944a1e789f..5eb5f463c1faecaea9a54cc04523500275780649 100755 (executable)
--- 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 61ce4a90e3aba0c6e14448dff2f55e04b9f56304..48e9b3b1257f20938020c3e33d9fb7fe70304999 100755 (executable)
--- 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 bda8da4380869c5e68586497e2b3c8df37b3fb53..52abd9f8b2d03c9251e94f49068f9656e7e86c81 100755 (executable)
--- 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: "