yellow team mailing list archive

[Francesco Banconi <francesco.banconi@xxxxxxxxxxxxx>]

Francesco Banconi has proposed merging lp:~frankban/lpbuildbot/use-lpsetup into lp:~launchpad/lpbuildbot/public.

Requested reviews:
  Launchpad Yellow Squad (yellow)

For more details, see:
https://code.launchpad.net/~frankban/lpbuildbot/use-lpsetup/+merge/105085

= Summary =

lpsetup uses different names for the generated scripts. Buildbot configuration
must reflect this change.

== Implementation details ==

Renamed the script names used in buildbot steps and in testr.conf.

Updated dependencies path to reflect the directory used by default by lpsetup.
-- 
https://code.launchpad.net/~frankban/lpbuildbot/use-lpsetup/+merge/105085
Your team Launchpad Yellow Squad is requested to review the proposed merge of lp:~frankban/lpbuildbot/use-lpsetup into lp:~launchpad/lpbuildbot/public.

=== modified file 'master.cfg'
--- master.cfg	2012-04-27 17:32:05 +0000
+++ master.cfg	2012-05-08 16:38:19 +0000
@@ -70,7 +70,7 @@
 def addEnvironmentPrepSteps(fac):
     fac.addStep(bzrbuildbot.shell.ShellCommand(
         command=['./utilities/link-external-sourcecode',
-                 '-p/var/lib/buildbot/dependencies'],
+                 '-p/var/lib/buildbot/launchpad/dependencies'],
         description=['linking', 'dependencies'],
         descriptionDone=['link', 'dependencies']))
     fac.addStep(bzrbuildbot.shell.ShellCommand(
@@ -88,7 +88,7 @@
         mode=0644))
     # Clean up any potential cruft left around by lxc from a previous run.
     fac.addStep(bzrbuildbot.shell.ShellCommand(
-        command=['sudo', '/usr/local/bin/launchpad-lxc-cleanup'],
+        command=['sudo', '/usr/local/bin/lp-setup-lxc-cleanup'],
         description=['cleanup','previous','lxc','containers'],
         descriptionDone=['cleaned','previous','lxc','containers']))
     fac.addStep(transfer.FileDownload(
@@ -115,7 +115,7 @@
     # Run the root setuid script to make build && make schema in
     # the lptests container.
     fac.addStep(bzrbuildbot.shell.ShellCommand(
-        command=['sudo', '/usr/local/bin/launchpad-lxc-build'],
+        command=['sudo', '/usr/local/bin/lp-setup-lxc-build'],
         description=['building', 'in', 'base', 'lxc', 'container'],
         descriptionDone=['build', 'in', 'base', 'lxc', 'container']))
 

=== modified file 'testr.conf'
--- testr.conf	2012-02-27 22:01:23 +0000
+++ testr.conf	2012-05-08 16:38:19 +0000
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=sudo /usr/local/bin/launchpad-lxc-test $IDOPTION $LISTOPT
+test_command=sudo /usr/local/bin/lp-setup-lxc-test $IDOPTION $LISTOPT
 test_id_option=--load-list $IDFILE
 test_list_option=--list