Merge default -> production production
authorDustin J. Mitchell <dustin@mozilla.com>
Thu, 13 Feb 2014 15:46:58 -0500
branchproduction
changeset 1364 c9328b86670e94e5b1308f4afcf7fe606ecaab0a
parent 1361 9702c4329f0ed58e675b24bdbb251adf9df74a38 (current diff)
parent 1363 a2329280343e3a17cb874ea1265fc411c6d2c84b (diff)
child 1367 e20f667f4201f12967be939541678a462ed987a7
push id987
push userdmitchell@mozilla.com
push dateThu, 13 Feb 2014 20:47:01 +0000
Merge default -> production
--- a/modules/foopy/manifests/init.pp
+++ b/modules/foopy/manifests/init.pp
@@ -39,26 +39,16 @@ class foopy {
             mode => 0644;
 
         # Link the helper scripts for humans to /builds
         "/builds/check.sh":
             owner => $users::builder::username,
             group => $users::builder::group,
             ensure => link,
             target => "/builds/tools/buildfarm/mobile/check.sh";
-        "/builds/start_cp.sh":
-            owner => $users::builder::username,
-            group => $users::builder::group,
-            ensure => link,
-            target => "/builds/tools/buildfarm/mobile/start_cp.sh";
-        "/builds/stop_cp.sh":
-            owner => $users::builder::username,
-            group => $users::builder::group,
-            ensure => link,
-            target => "/builds/tools/buildfarm/mobile/stop_cp.sh";
         "/builds/kill_stalled.sh":
             owner => $users::builder::username,
             group => $users::builder::group,
             ensure => link,
             target => "/builds/tools/buildfarm/mobile/kill_stalled.sh";
         "/builds/tegra_stats.sh":
             owner => $users::builder::username,
             group => $users::builder::group,
@@ -112,15 +102,14 @@ class foopy {
             group => $users::builder::group,
             ensure => link,
             target => "/etc/logrotate.d/watch_devices",
             require => File['/etc/logrotate.d/watch_devices'];
     }
     
     # Obsolete
     file {
-        "$::users::builder::home/bin":
-            ensure => absent,
-            force => true;
-        "$::users::builder::home/bin/minidump_stackwalk":
+        # Bug 875599: these files should no longer exist
+        ["/builds/start_cp.sh",
+         "/builds/stop_cp.sh"]:
             ensure => absent;
     }
 }
--- a/modules/selfserve_agent/manifests/install.pp
+++ b/modules/selfserve_agent/manifests/install.pp
@@ -12,41 +12,42 @@ class selfserve_agent::install {
     include selfserve_agent::settings
     python::virtualenv {
         "${selfserve_agent::settings::root}":
             python   => "${packages::mozilla::python27::python}",
             require  => Class['packages::mozilla::python27'],
             user     => "${users::builder::username}",
             group    => "${users::builder::group}",
             packages => [
+                "anyjson==0.3.3",
                 "Beaker==1.5.4",
                 "FormEncode==1.2.4",
                 "Mako==0.4.1",
                 "MarkupSafe==0.12",
                 "MySQL-python==1.2.3",
                 "Paste==1.7.5.1",
                 "PasteDeploy==1.5.0",
                 "PasteScript==1.7.3",
                 "Pygments==1.4",
                 "Pylons==1.0",
+                "amqp==1.4.3",
+                "anyjson==0.3",
+                "buildapi==0.2.0",
+                "buildbot==0.8.4-pre-moz1",
+                "decorator==3.3.1",
+                "distribute==0.6.14",
+                "kombu==3.0.12",
                 "Routes==1.12.3",
                 "SQLAlchemy==0.6.8",
                 "Tempita==0.5.1",
                 "Twisted==10.1.0",
                 "WebError==0.10.3",
                 "WebHelpers==1.3",
                 "WebOb==1.0.8",
                 "WebTest==1.2.3",
-                "amqplib==0.6.1",
-                "anyjson==0.3",
-                "buildapi==0.1.2",
-                "buildbot==0.8.4-pre-moz1",
-                "carrot==0.10.7",
-                "decorator==3.3.1",
-                "distribute==0.6.14",
                 "meld3==0.6.5",
                 "nose==1.0.0",
                 "pytz==2011d",
                 "redis==2.4.10",
                 "simplejson==2.1.6",
                 "wsgiref==0.1.2",
                 "zope.interface==3.6.1",
             ];
--- a/modules/selfserve_agent/templates/selfserve-agent.ini.erb
+++ b/modules/selfserve_agent/templates/selfserve-agent.ini.erb
@@ -1,22 +1,20 @@
 <%# This Source Code Form is subject to the terms of the Mozilla Public
   # License, v. 2.0. If a copy of the MPL was not distributed with this
   # file, You can obtain one at http://mozilla.org/MPL/2.0/. %>
 
 [db]
 url = mysql://<%= scope.function_secret(["buildbot_schedulerdb_username"])%>:<%= scope.function_secret(["buildbot_schedulerdb_password"])%>@<%= scope.function_secret(["buildbot_schedulerdb_hostname"])%>/<%= scope.function_secret(["buildbot_schedulerdb_database"])%>
 
-[carrot]
-hostname = <%= scope.lookupvar('::config::selfserve_agent_carrot_hostname') %>
-vhost = <%= scope.lookupvar('::config::selfserve_agent_carrot_vhost') %>
-userid = <%= scope.lookupvar('::config::selfserve_agent_carrot_userid') %>
-password = <%= scope.function_secret(["buildapi_rmq_password"]) %>
+[mq]
+kombu_url = amqp://<%= scope.lookupvar('::config::selfserve_agent_carrot_userid') %>:<%= scope.function_secret(["buildapi_rmq_password"]) %>@<%= scope.lookupvar('::config::selfserve_agent_carrot_hostname') %>/<%= scope.lookupvar('::config::selfserve_agent_carrot_vhost') %>
+heartbeat_interval = 280
 exchange = <%= scope.lookupvar('::config::selfserve_agent_carrot_exchange') %>
-queue = <%= scope.lookupvar('::config::selfserve_agent_carrot_queue') %>
+queue.agent = <%= scope.lookupvar('::config::selfserve_agent_carrot_queue') %>
 
 [masters]
 masters-url = <%= scope.lookupvar('::config::selfserve_agent_masters_json') %>
 buildbot = <%= scope.lookupvar('::config::selfserve_agent_root') %>/bin/buildbot
 sendchange-master = <%= scope.lookupvar('::config::selfserve_agent_sendchange_master') %>
 
 [branches]
 url = <%=scope.lookupvar('::config::selfserve_agent_branches_json')%>