Merge lp:~bac/lpbuildbot/remember-the-testr into lp:lpbuildbot

[Brad Crittenden]

Add a script for initializing testrepository in a spot where the results can be re-used.

Add a script for initializing testrepository in a spot where the results can be re-used.

Painfully tested on ec2 and demonstrated to work.

[Gary Poster (gary)]

Cool. Thank you!

review: Approve

Unmerged revisions

=== modified file 'master.cfg'
--- master.cfg	2012-04-02 12:23:29 +0000
+++ master.cfg	2012-04-03 18:07:30 +0000
@@ -91,10 +91,14 @@
         command=['sudo', '/usr/local/bin/launchpad-lxc-cleanup'],
         description=['cleanup','previous','lxc','containers'],
         descriptionDone=['cleaned','previous','lxc','containers']))
+    fac.addStep(transfer.FileDownload(
+        mastersrc='scripts/init_testr.sh',
+        slavedest='init_testr.sh',
+        mode=0544))
     fac.addStep(bzrbuildbot.shell.ShellCommand(
-        command=['testr', 'init'],
+        command=['./init_testr.sh'],
         description=['initializing', 'testrepository'],
-        descriptionDone=['initialize', 'testrepository']))
+        descriptionDone=['initialized', 'testrepository']))
     # Make a temp dir, to work around bug 808557.
     fac.addStep(bzrbuildbot.shell.ShellCommand(
         command=['mkdir', 'temp']))
 
=== added directory 'scripts'
=== added file 'scripts/init_testr.sh'
--- scripts/init_testr.sh	1970-01-01 00:00:00 +0000
+++ scripts/init_testr.sh	2012-04-03 18:07:30 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Initialize testrepository, re-using the results from a previous run,
+# if available.
+
+# The results from a run will be stored in the directory above the
+# current working directory and symlinked from the cwd.
+
+# If there is no .testrepository directory in the parent directory,
+# make one.
+if [ ! -d '../.testrepository' ]]; then
+  (cd ..; testr init)
+fi
+
+ln -s ../.testrepository/