Merge lp:~frankban/charms/oneiric/buildbot-slave/new-lpsetup into lp:~yellow/charms/oneiric/buildbot-slave/trunk

Proposed by Francesco Banconi
Status: Merged
Approved by: Francesco Banconi
Approved revision: 32
Merged at revision: 31
Proposed branch: lp:~frankban/charms/oneiric/buildbot-slave/new-lpsetup
Merge into: lp:~yellow/charms/oneiric/buildbot-slave/trunk
Diff against target: 16 lines (+3/-3)
1 file modified
examples/lpbuildbot.yaml (+3/-3)
To merge this branch: bzr merge lp:~frankban/charms/oneiric/buildbot-slave/new-lpsetup
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email:

Commit message

Update lpsetup command line arguments.

Description of the change

== Changes ==

Fixed the arguments passed to lp-setup in lpbuildbot.yaml to reflect the lpsetup new UI.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/lpbuildbot.yaml'
2--- examples/lpbuildbot.yaml 2012-05-22 14:47:07 +0000
3+++ examples/lpbuildbot.yaml 2012-07-25 08:28:21 +0000
4@@ -3,9 +3,9 @@
5 script-retrieval-method: apt
6 script-source: lpsetup
7 script-path: "/usr/bin/lp-setup"
8- # The buildbot user's home directory is /var/lib/buildout.
9- # The LP dependencies will be in /var/lib/buildout/launchpad/dependencies.
10- script-args: "lxc-install -u buildbot -e -f 'Launchpad PQM' -c {installdir} -d /var/lib/buildbot/launchpad/dependencies -S launchpad_lxc_id_rsa --testing"
11+ # The buildbot user's home directory is `/var/lib/buildout`.
12+ # The LP dependencies will be in `/var/lib/buildout/slaves/slave/devel`.
13+ script-args: "install-lxc -u buildbot -E -f 'Launchpad PQM' -r {installdir} -S launchpad_lxc_id_rsa --testing"
14 extra-repository: deb lucid main universe
15 buildbot-pkg: buildbot/lucid
16 extra-packages: testrepository


People subscribed via source and target branches