Merge lp:~frankban/charms/oneiric/buildbot-slave/explicit-dependencies-dir into lp:~yellow/charms/oneiric/buildbot-slave/trunk

Proposed by Francesco Banconi
Status: Merged
Approved by: Gary Poster
Approved revision: 29
Merged at revision: 29
Proposed branch: lp:~frankban/charms/oneiric/buildbot-slave/explicit-dependencies-dir
Merge into: lp:~yellow/charms/oneiric/buildbot-slave/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
examples/lpbuildbot.yaml (+1/-1)
To merge this branch: bzr merge lp:~frankban/charms/oneiric/buildbot-slave/explicit-dependencies-dir
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve
Review via email: mp+106774@code.launchpad.net

Description of the change

== Changes ==

A recent branch of lpsetup (MP here: https://code.launchpad.net/~frankban/lpsetup/haveged/+merge/106771) changes the default paths used for Launchpad checkout and dependencies. This branch reflects that change: now, in lpbuildbot.yaml, the dependencies path is explicitly provided as an argument of lp-setup.

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Cool, thanks Francesco.

review: Approve

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-08 12:05:03 +0000
3+++ examples/lpbuildbot.yaml 2012-05-22 10:30:26 +0000
4@@ -5,7 +5,7 @@
5 script-path: "/usr/bin/lp-setup"
6 # The buildbot user's home directory is /var/lib/buildout.
7 # The LP dependencies will be in /var/lib/buildout/launchpad/dependencies.
8- script-args: "lxc-install -u buildbot -e launchpad-pqm@canonical.com -f 'Launchpad PQM' -c {installdir} -S launchpad_lxc_id_rsa --testing"
9+ script-args: "lxc-install -u buildbot -e launchpad-pqm@canonical.com -f 'Launchpad PQM' -c {installdir} -d /var/lib/buildout/launchpad/dependencies -S launchpad_lxc_id_rsa --testing"
10 extra-repository: deb http://us.archive.ubuntu.com/ubuntu/ lucid main universe
11 buildbot-pkg: buildbot/lucid
12 extra-packages: testrepository

Subscribers

People subscribed via source and target branches