← Back to team overview

yellow team mailing list archive

[Merge] lp:~bac/lp-tarmac-configs/dos into lp:~yellow/lp-tarmac-configs/tarmac-puppet

 

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

Requested reviews:
  Brad Crittenden (bac): code

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

* Stop managing 'Yellow squad' kanban board.

* Set 'projects = juju-ui, juju' for 'Juju GUI' board.

* Put the credentials file in ~lp2kanban/lp2kanban.

* Update the cron script to use a single log file.


-- 
https://code.launchpad.net/~bac/lp-tarmac-configs/dos/+merge/122560
Your team Yellow Squad is subscribed to branch lp:~yellow/lp-tarmac-configs/tarmac-puppet.
=== modified file 'lp2kanban-config.ini'
--- lp2kanban-config.ini	2012-08-31 19:27:32 +0000
+++ lp2kanban-config.ini	2012-09-03 18:42:22 +0000
@@ -5,8 +5,6 @@
 user = gary.poster@xxxxxxxxx
 password = GfgzWyPe
 
-lp_credentials_file = "./credentials"
-
 # Defaults are common values overridable in each of the boards definition.
 [DEFAULT]
 lp_server = production
@@ -36,14 +34,16 @@
 credentials_file = ./credentials
 
 # Use the board title to define board settings.
-[Yellow squad]
-downtime_deploy_lanes = downtime
-autosync = on
+#[Yellow squad]
+#downtime_deploy_lanes = downtime
+#autosync = on
+#project_group = launchpad-project
 
 [Juju GUI]
+projects = juju-ui, juju
 autosync = on
-landing_lanes = 
+landing_lanes =
 qa_lanes = QA
-deploy_lanes = 
+deploy_lanes =
 downtime_deploy_lanes =
 done_lanes = DONE-DONE

=== modified file 'tarmac.pp'
--- tarmac.pp	2012-08-31 19:41:04 +0000
+++ tarmac.pp	2012-09-03 18:42:22 +0000
@@ -205,12 +205,17 @@
     ensure  => directory,
     owner   => "lp2kanban",
   }
-
+  file {
+    "$home/lp2kanban/credentials":
+      owner   => "lp2kanban",
+      require => [File["$home"], Exec["lp2kanban-source"]],
+      content => template("credentials"),
+  }
   exec { "lp2kanban-source":
     command => "/usr/bin/bzr branch lp:lp2kanban",
     user    => "lp2kanban",
     cwd     => "$home",
-    require => [File[$home], Package["bzr"]],
+    require => [File[$home], Package["bzr"], File["$home/credentials"]],
     creates => "$home/lp2kanban",
   }
   exec { "lp2kanban-make":
@@ -231,7 +236,7 @@
   }
 
   cron { "lp2kanban":
-    command     => 'cd $HOME/lp2kanban; /usr/bin/flock -n $HOME/lp2kanban.lock date "+\%c" >> $HOME/updates.log && bin/py src/lp2kanban/bugs2cards.py 2>&1 >> updates.log',
+    command     => 'cd $HOME/lp2kanban; /usr/bin/flock -n $HOME/lp2kanban.lock date "+\%c" >> $HOME/updates.log && bin/py src/lp2kanban/bugs2cards.py 2>&1 >> $HOME/updates.log',
     user        => "lp2kanban",
     minute      => [9,29,49],
     require     => [User["lp2kanban"], File["$home/lp2kanban.lock"], Exec["lp2kanban-make"]],


Follow ups