* Remove iwj-specific stuff from adt-testreport-onepackage and put

  it into onepackage-config with scary warnings to tell people to
  edit the file.

diff --git a/debian/changelog b/debian/changelog
index 0b414e9a853ed287129f4530fc1569bda8b6978a..21d1a0780ff5e0349ba3121c3672669118209467 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ autopkgtest (0.9.0~iwj) unstable; urgency=low
   * close fd 8 when running vgdisplay (which avoids an annoying and
     spurious warning from the lvm tools).
   * autopkgtest Suggests curl (adt-testreport-onepackage needs it).
+  * Remove iwj-specific stuff from adt-testreport-onepackage and put
+    it into onepackage-config with scary warnings to tell people to
+    edit the file.
 
  --
 

diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index 9f1de64290f86f6a7fbc743eb2133d7d28406a7f..519e4020518556b92ec467d4dcd62eca3d04ba8f 100755 (executable)
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -2,16 +2,9 @@
 
 set -e
 
-mirror=http://mirror.relativity.greenend.org.uk/mirror/ubuntu.good
-distro=feisty
-suite=main
 salt=''
 tmp=tmp
 var=var
-administrator_email=ian@davenant.greenend.org.uk
-maintainer_email_override="$administrator_email"
-salutation="Ian"
-from="$salutation Jackson <ian@davenant.greenend.org.uk>"
 rsync=rsync
 disable=true
 interactive=true

diff --git a/runner/onepackage-config b/runner/onepackage-config
index 883a7039be02299319372e819202d94425dc38e6..73ac198577013ddd503db89beb7d1579c54dc2be 100644 (file)
--- a/runner/onepackage-config
+++ b/runner/onepackage-config
@@ -1,5 +1,19 @@
 cd /root/adt-play
-disable=false
+distro=gutsy
+suite=main
+destdirtail=autopkgtest-output/$distro
+
+# NOTE - YOU MUST EDIT THIS FILE.
+# EVERY LINE AFTER THIS ONE IS WRONG FOR YOU!
+
+mirror=http://mirror.relativity.greenend.org.uk/mirror/ubuntu.good
+administrator_email=ian@davenant.greenend.org.uk
+false; : are you paying attention?
+maintainer_email_override="$administrator_email"
+salutation="Ian"
+from="$salutation Jackson <ian@davenant.greenend.org.uk>"
+disable=true
 desthttphead=http://www.chiark.greenend.org.uk/~ijackson/
 destrsynchead=ijackson@login.chiark.greenend.org.uk:public-html/
-destdircommon=autopkgtest-output/
+
+# EDIT EVERY LINE ABOVE THIS ONE!