Merge lp:~benji/charms/oneiric/buildbot-slave/small-tweaks into lp:~yellow/charms/oneiric/buildbot-slave/trunk

[Benji York]

These are some small changes to our Buildbot slave charm:

- tweak the lpbuildbot example config to specify alternate key names
- make the buildbot group creation unconditional

Unmerged revisions

=== modified file 'examples/lpbuildbot.yaml'
--- examples/lpbuildbot.yaml	2012-03-01 18:22:10 +0000
+++ examples/lpbuildbot.yaml	2012-03-06 18:30:27 +0000
@@ -1,10 +1,10 @@
 buildbot-slave:
-  builders: lucid_lp,lucid_db_lp
+  builders: lucid_lp
   script-retrieval-method: bzr_cat
-  script-url: "http://bazaar.launchpad.net/~yellow/launchpad/setuplxc/utilities/setuplxc.py"
+  script-url: "http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel/utilities/setuplxc.py"
   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 [e-mail] -f 'Launchpad PQM' /var/lib/buildbot"
+  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

=== modified file 'hooks/install'
--- hooks/install	2012-03-02 17:07:11 +0000
+++ hooks/install	2012-03-06 18:30:27 +0000
@@ -67,7 +67,11 @@
     # default, and requires a "-y" flag to be set.
     assume_yes = None if distribution == 'lucid' else '-y'
     try:
+<<<<<<< TREE
         run('apt-add-repository', assume_yes, extra_repository)
+=======
+        run('apt-add-repository', '--yes', extra_repository)
+>>>>>>> MERGE-SOURCE
         run('apt-get', 'update')
     except subprocess.CalledProcessError as e:
         log('Error adding repository: ' + extra_repository)
@@ -172,6 +176,10 @@
         log('Creating initial buildbot slave in ' + buildbot_dir)
         create_slave('temporary', 'temporary', buildbot_dir=buildbot_dir)
 
+    # Some versions of LXC require the user to have a group.  Bug #942850.
+    run('addgroup', 'buildbot')
+    run('usermod', '--gid', 'buildbot', 'buildbot')
+
     config_json.set(config)
 
     retrieve = METHODS.get(method)
@@ -181,9 +189,6 @@
         # need (e.g. those that create lxc containers).  We choose sh as
         # a standard and basic "system" shell.
         run('usermod', '-s', '/bin/sh', 'buildbot')
-        # Some versions of LXC require the user to have a group.  Bug #942850.
-        run('addgroup', 'buildbot')
-        run('usermod', '--gid', 'buildbot', 'buildbot')
         sys.exit(handle_script(retrieve, url, path, args))
 
 

=== modified file 'revision'
--- revision	2012-03-01 16:25:20 +0000
+++ revision	2012-03-06 18:30:27 +0000
@@ -1,1 +1,1 @@
-1
+8