yellow team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~gary/charms/oneiric/buildbot-slave/extra-packages into lp:~yellow/charms/oneiric/buildbot-slave/trunk.

Requested reviews:
  Launchpad Yellow Squad (yellow)

For more details, see:
https://code.launchpad.net/~gary/charms/oneiric/buildbot-slave/extra-packages/+merge/93515

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.


-- 
https://code.launchpad.net/~gary/charms/oneiric/buildbot-slave/extra-packages/+merge/93515
Your team Launchpad Yellow Squad is requested to review the proposed merge of lp:~gary/charms/oneiric/buildbot-slave/extra-packages into lp:~yellow/charms/oneiric/buildbot-slave/trunk.

=== modified file 'config.setuplxc.yaml'
--- config.setuplxc.yaml	2012-02-10 20:08:16 +0000
+++ config.setuplxc.yaml	2012-02-17 01:18:23 +0000
@@ -5,6 +5,7 @@
   script-path: setuplxc.py
   # The buildbot user's home directory is /var/lib/buildout.
   # The LP dependencies will be in /var/lib/buildout/dependencies.
-  script-args: "-u buildbot -e launchpad-pqm@xxxxxxxxxxxxx -f 'Launchpad PQM' {installdir}"
+  script-args: "-u buildbot -e launchpad-pqm@xxxxxxxxxxxxx -f 'Launchpad PQM' /var/lib/buildbot"
   extra-repository: deb http://us.archive.ubuntu.com/ubuntu/ lucid main universe
   buildbot-pkg: buildbot/lucid
+  extra-packages: testrepository

=== modified file 'config.yaml'
--- config.yaml	2012-02-09 14:02:35 +0000
+++ config.yaml	2012-02-17 01:18:23 +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 'hooks/config-changed'
--- hooks/config-changed	2012-02-08 15:22:40 +0000
+++ hooks/config-changed	2012-02-17 01:18:23 +0000
@@ -29,11 +29,16 @@
 
     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:
         install_extra_repository(extra_repo)
 
+    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)