Merge default -->production production
authorAndrei Obreja <aobreja@mozilla.com>
Mon, 28 Aug 2017 13:03:22 +0300
branchproduction
changeset 5702 72de47271a6b731b3f1b9158537c7cd8064388a9
parent 5700 0da450a5412289b03425bb66be16a1c730dcaa94 (current diff)
parent 5701 5b56c3302bf84784ebb3aa32e641d71addfc8c83 (diff)
child 5704 1fb890e981b433509a048cea1394f9f66519a483
push id4541
push useraobreja@mozilla.com
push dateMon, 28 Aug 2017 10:03:40 +0000
Merge default -->production
--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -153,25 +153,16 @@ node /(dev|try)-.*\.(dev|try)\.releng\.(
     # dev-* hosts are *always* staging
     $aspects          = [ 'low-security' ]
     $slave_trustlevel = 'try'
     include toplevel::slave::releng::build::mock
 }
 
 # OS X
 
-# OS X try test for Bug 1315977
-node /bld-lion-r5-0[10-11]\.try\.releng\.scl3\.mozilla\.com/ {
-    $aspects           = [ 'low-security' ]
-    $slave_trustlevel  = 'try'
-    $pin_puppet_server = 'releng-puppet2.build.scl1.mozilla.com'
-    $pin_puppet_env    = 'aobreja'
-    include toplevel::slave::releng::build::standard
-}
-
 node /bld-(lion|yosemite)-r5-\d+.try.releng.scl3.mozilla.com/ {
     $aspects          = [ 'low-security' ]
     $slave_trustlevel = 'try'
     include fw::profiles::buildbot_slave
     include toplevel::slave::releng::build::standard
 }
 
 node /y-yosemite-r5-\d+.try.releng.scl3.mozilla.com/ {