Reimplemented tree_for_master, which now uses gatekeeper config files to map master URLs to the tre…

infra/tools/builder_alerts/gatekeeper_extras.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # FIXME: Everything in this file belongs in gatekeeper_ng_config.py
 
 import logging
 
 
 def excluded_builders(master_config):
   return master_config[0].get('*', {}).get('excluded_builders', set())
 
 
-# pylint: disable=C0301
-# FIXME: This is currently baked into:
-# https://chromium.googlesource.com/chromium/tools/build/+/master/scripts/slave/gatekeeper_launch.py
-# http://crbug.com/394961
-MASTER_CONFIG = {
-  'chromium-status': [
-    'chromium',
-    'chromium.chrome',
-    'chromium.chromiumos',
-    'chromium.gpu',
-    'chromium.linux',
-    'chromium.mac',
-    'chromium.memory',
-    'chromium.win',
-  ],
-  'blink-status': [
-    'chromium.webkit',
-  ],
-}
-
-
-def tree_for_master(master_name):
-  for tree_name, master_names in MASTER_CONFIG.items():
-    if master_name in master_names:
+def tree_for_master(master_url, gatekeeper_trees_config):
+  """Returns name of the tree for a given master or None if failed to detect."""
+  for tree_name, tree_config in gatekeeper_trees_config.iteritems():
+    if tree_name == 'non-closers':

[ojan, 2014/08/28 03:34:15]

Lets include the non-closers as a tree name for now. Down the road we might
decide to use the master name as the tree name in those cases, but this is a
start.

[Sergiy Byelozyorov, 2014/08/28 17:45:58]

Done.

+      continue
+    if master_url in tree_config['masters']:
       return tree_name
+  return None

[ojan, 2014/08/28 03:34:15]

Instead of returning None, lets return the last bit of the master_url, e.g.
chromium.lkgr. Can do this as a TODO if you'd like.

[Sergiy Byelozyorov, 2014/08/28 17:45:58]

Done.

 
 
 def would_close_tree(master_config, builder_name, step_name):
   # FIXME: Section support should be removed:
   master_config = master_config[0]
   builder_config = master_config.get(builder_name, {})
   if not builder_config:
     builder_config = master_config.get('*', {})
 
   # close_tree is currently unused in gatekeeper.json but planned to be.
@@ skipping 21 matching lines @@
 
   # A '*' in any of the above types means it applies to all steps.
   if '*' in closing_steps:
     return True
 
   if step_name in closing_steps:
     return True
 
   logging.debug('%s not in closing_steps: %s' % (step_name, closing_steps))
   return False