Merge lp:~gary/charms/oneiric/buildbot-slave/extra-packages into lp:~yellow/charms/oneiric/buildbot-slave/trunk

[Gary Poster]

This branch moves over the extra-packages feature from the buildbot-master. LP needs it for parallel testing, as shown by the included config change.

[Benji York (benji)]

This looks good.

A small redundancy: there's no need for the .strip() because the split
will remove any leading, trailing, or duplicate whitespace around the
package names.

review: Approve (code)

[lp:~gary/charms/oneiric/buildbot-slave/extra-packages]

15. By Gary Poster on 2012-02-28

[r=bac] move HACKING to README per review

16. By Francesco Banconi on 2012-02-29

[r=gmb] Added revision file. Removed juju_wrapper.

17. By Brad Crittenden on 2012-03-01

[r=frankban] Install python-shell-toolbox in the install hook. Temporarily add copies of helpers.py and local.py until a proper sharing solution is implemented. These files are to be edited in the buildbot-master and kept in sync.

18. By Benji York on 2012-03-01

correct the buildbot home dir

19. By Benji York on 2012-03-01

[r=gary] add a work-around to a bug in LXC

20. By Francesco Banconi on 2012-03-02

[r=gmb] upgrade-charm hook.

21. By Benji York on 2012-03-06

- tweak the lpbuildbot example config to specify alternate key names
- make the buildbot group creation unconditional
- add a --yes when adding a repository

22. By Benji York on 2012-03-06

merge from trunk

23. By Gary Poster on 2012-03-10

add extra-packages functionality, as with buildbot-master. We need it to include testrepository.

=== modified file 'config.yaml'
--- config.yaml	2012-02-09 14:02:35 +0000
+++ config.yaml	2012-03-10 14:01:17 +0000
@@ -36,6 +36,14 @@
       ones added previously will not be removed. An example would be:
       deb http://us.archive.ubuntu.com/ubuntu/ lucid main universe
     type: string
+  extra-packages:
+    description: |
+      A space-separated list of packages to be installed.  The
+      repositories to use in getting these packages should have been
+      set prior to setting this value.  Calling multiple times will
+      install the newly specified packages while leaving the previous
+      ones installed.
+    type: string
   installdir:
     description: |
       The directory where the Buildbot slave will be installed.
 
=== modified file 'examples/lpbuildbot.yaml'
--- examples/lpbuildbot.yaml	2012-03-06 18:23:20 +0000
+++ examples/lpbuildbot.yaml	2012-03-10 14:01:17 +0000
@@ -8,3 +8,4 @@
   script-args: "-u buildbot -e [e-mail] -f 'Launchpad PQM' -s launchpad_lxc_id_rsa {installdir}"
   extra-repository: deb http://us.archive.ubuntu.com/ubuntu/ lucid main universe
   buildbot-pkg: buildbot/lucid
+  extra-packages: testrepository
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-02-29 22:45:07 +0000
+++ hooks/config-changed	2012-03-10 14:01:17 +0000
@@ -33,6 +33,7 @@
 
     buildbot_pkg = config.get('buildbot-pkg')
     extra_repo = config.get('extra-repository')
+    extra_pkgs = config.get('extra-packages')
     buildbot_dir = config.get('installdir')
 
     if extra_repo and 'extra-repository' in diff.added_or_changed:
@@ -43,6 +44,10 @@
             log(e)
             raise
 
+    if extra_pkgs and 'extra-packages' in diff.added_or_changed:
+        apt_get_install(
+            *(pkg.strip() for pkg in extra_pkgs.split()))
+
     if buildbot_pkg and 'buildbot-pkg' in diff.added_or_changed:
         log('Installing ' + buildbot_pkg)
         apt_get_install(buildbot_pkg)