yellow team mailing list archive

[Brad Crittenden <bac@xxxxxxxxxxxxx>]

Brad Crittenden has proposed merging lp:~bac/lp-tarmac-configs/lpset-integration into lp:~yellow/lp-tarmac-configs/tarmac-puppet.

Requested reviews:
  Yellow Squad (yellow)

For more details, see:
https://code.launchpad.net/~bac/lp-tarmac-configs/lpset-integration/+merge/118098

Add support for lpsetup integration tests.  Requires sudo for configuring the tarmac machine to allow nested lxc.
-- 
https://code.launchpad.net/~bac/lp-tarmac-configs/lpset-integration/+merge/118098
Your team Yellow Squad is requested to review the proposed merge of lp:~bac/lp-tarmac-configs/lpset-integration into lp:~yellow/lp-tarmac-configs/tarmac-puppet.

=== added file 'environments.yaml'
--- environments.yaml	1970-01-01 00:00:00 +0000
+++ environments.yaml	2012-08-03 13:49:48 +0000
@@ -0,0 +1,8 @@
+environments:
+  lpsetup-testing-lxc:
+    type: local
+    data-dir: /tmp/juju-local
+    control-bucket: local-bucket
+    admin-secret: ba4eedc0-dd69-11e1-ad22-002332c87854
+    default-series: precise
+    juju-origin: distro

=== added file 'tarmac-sudoers'
--- tarmac-sudoers	1970-01-01 00:00:00 +0000
+++ tarmac-sudoers	2012-08-03 13:49:48 +0000
@@ -0,0 +1,4 @@
+# Allow tarmac to run any commands as root in 'bin' in any of the
+# tarmac checkouts.
+tarmac ALL = (ALL) NOPASSWD: /home/tarmac/repos/lpsetup/*/bin/
+

=== modified file 'tarmac.conf'
--- tarmac.conf	2012-07-06 11:33:31 +0000
+++ tarmac.conf	2012-08-03 13:49:48 +0000
@@ -2,7 +2,7 @@
 tree_dir = /home/tarmac/repos/lpsetup/trunk
 # Commit message more intelligently constructed by commit.py
 #commit_message_template = [r=<approved_by_nicks>][bug=<bugs_fixed>] <commit_message> (<author_nick>)
-verify_command =  ./pre-commit.sh
+verify_command =  ./pre-commit.sh --nested-mods
 rejected_branch_status = Work in progress
 voting_criteria = Approve >= 1, Disapprove == 0
 

=== modified file 'tarmac.pp'
--- tarmac.pp	2012-07-12 11:51:23 +0000
+++ tarmac.pp	2012-08-03 13:49:48 +0000
@@ -26,6 +26,10 @@
     "python-pocket-lint": ensure => present;
     "python-nose": ensure => present;
     "lxc": ensure => present;
+    "apt-cacher-ng": ensure => present;
+    "juju": ensure => present;
+    "libvirt-bin": ensure => present;
+    "zookeeper": ensure => present;
     # Packages required for zope.testing:
     "subunit": ensure => present;
     "python-dev": ensure => present;
@@ -124,7 +128,22 @@
       require => File["$home/.ssh"],
       content => template("known_hosts");
   }
-
+  file { "/etc/sudoers.d/tarmac":
+      require => File["/etc/sudoers.d/tarmac"],
+      content => template("tarmac-sudoers"),
+      mode    => 0440;
+  }
+  file {
+    "$home/.juju": 
+      owner   => "tarmac",
+      ensure  => directory,
+      require => File["$home"];
+    "$home/.juju/environments.yaml":
+      owner   => "tarmac",
+      require => File["$home/.juju"],
+      content => template("environments.yaml"),
+      mode    => 0440;
+  }
   exec { "launchpad-login":
     # CHANGEME: Replace LP-ID with the id of your tarmac LP user
     command     => "/usr/bin/bzr launchpad-login lpqabot 2>&1",