CrOS: Builder names == target config names.

scripts/master/cros/builder_config.py

 # Copyright 2015 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.
 
 """Utility classes to define and coordinate CrOS Chromite builder display.
 """
 
 import re
 
 from collections import OrderedDict, namedtuple
@@ skipping 30 matching lines @@
   configuration. Information stored in this class should be examined in detail
   and, as appropriate, moved into Chromite.
   """
 
   # Default set of class base properties. Subclasses can override these to
   # affect behavior.
   CLOSER = False
   FLOATING = None
   UNIQUE = False
   COLLAPSE = True
-  CONFIG_BUILDERNAME_MAP = {}
   SLAVE_TYPE = SlaveType.BAREMETAL
   SLAVE_CLASS = None
   CBB_VARIANT = None
   TIMEOUT = None
 
   def __init__(self, config, branch=None):
     """Initializes a new configuration.
 
     Args:
       config (ChromiteTarget): The underlying Chromite configuration object.
@@ skipping 74 matching lines @@
     result = ORDINALS.get(self.config.category)
     if result is None:
       return ORDINALS.get(None)
     return result
 
   @property
   def builder_name(self):
     """Returns (str): The waterfall builder name for this configuration."""
     if self.config.get('buildbot_waterfall_name'):
       return self.config['buildbot_waterfall_name']
-    return str(self.CONFIG_BUILDERNAME_MAP.get(self.config.name) or
-               self._GetBuilderName())
+    return str(self._GetBuilderName())
 
   @property
   def is_experimental(self):
     """Returns (bool): If this builder is experimental."""
     return self._IsExperimental()
 
   def _GetBuilderName(self):
     """Returns (str): Returns the generated builder name.
 
     Unless overloaded, the builder name will default to the target configuration
@@ skipping 21 matching lines @@
     return not (self.config.is_master or self.config.get('important'))
 
 
 class PreCqLauncherBuilderConfig(BuilderConfig):
   """BuilderConfig for the Pre-CQ launcher target."""
 
   UNIQUE = True
   CLOSER = True
   SLAVE_TYPE = SlaveType.GCE_WIMPY
 
-  def _GetBuilderName(self):
-    return 'Pre-CQ Launcher'
-
 
 class PaladinBuilderConfig(BuilderConfig):
   """BuilderConfig for Paladin launcher targets."""
 
   UNIQUE = True
   FLOATING = 'paladin'
-  CONFIG_BUILDERNAME_MAP = {
-      'master-paladin': 'CQ master',
-  }
-
-  def _GetBuilderName(self):
-    return '%s paladin' % (self.config.base,)
 
 
 class IncrementalBuilderConfig(BuilderConfig):
   """BuilderConfig for Incremental launcher targets."""
 
   CLOSER = True
   COLLAPSE = AlwaysCollapseFunc
 
-  def _GetBuilderName(self):
-    return '%s incremental' % (self.config.base,)
-
   def _IsExperimental(self):
     return False
 
 
 class FullBuilderConfig(BuilderConfig):
   """BuilderConfig for Full launcher targets."""
 
   CLOSER = True
   COLLAPSE = AlwaysCollapseFunc
 
-  def _GetBuilderName(self):
-    return '%s full' % (self.config.base,)
-
   def _IsExperimental(self):
     return False
 
 
 class AsanBuilderConfig(BuilderConfig):
   """BuilderConfig for ASAN launcher targets."""
 
   CLOSER = True
   COLLAPSE = AlwaysCollapseFunc
 
-  def _GetBuilderName(self):
-    return '%s ASAN' % (self.config.base,)
-
   def _IsExperimental(self):
     return False
 
 
-class FirmwareBuilderConfig(BuilderConfig):
-  """BuilderConfig for Firmware launcher targets."""
-
-  def _GetBuilderName(self):
-    return '%s firmware' % (self.config.base,)
-
-
-class PfqBuilderConfig(BuilderConfig):
-  """BuilderConfig for PFQ launcher targets."""
-
-  CONFIG_BUILDERNAME_MAP = {
-      'master-chromium-pfq': 'Chrome PFQ master',
-      'master-android-pfq': 'Android PFQ master',
-  }
-
-  def _GetBuilderName(self):
-    project = self.config.suffix
-    if project.endswith('-pfq'):
-      project = project[:-4]
-    return '%s %s PFQ' % (self.config.base, project)
-
-
-class PreFlightBranchBuilderConfig(BuilderConfig):
-  """BuilderConfig for pre-flight branch targets."""
-
-  def _GetBuilderName(self):
-    return '%s pre-flight' % (self.config.base,)
-
-
 class CanaryBuilderConfig(BuilderConfig):
   """BuilderConfig for canary/release launcher targets."""
 
-  CONFIG_BUILDERNAME_MAP = {
-      'master-release': 'Canary master',
-  }
-
-  def _GetBuilderName(self):
-    parts = [self.config.base]
-    if self.config.children:
-      parts.append('group')
-    if self.config.category == ChromiteTarget.CANARY_TOOLCHAIN:
-      parts.append('toolchain')
-    parts.append('canary' if self.config.get('active_waterfall') == 'chromeos'
-                 else 'full')
-    return ' '.join(parts)
-
   def _GetLegacySlaveType(self):
     if self.config.is_master and not self.config['boards']:
       # For boardless release masters, use a wimpy builder.
       #
       # NOTE: Currently only implemented on release branch.
       if self.branch:
         return SlaveType.GCE_WIMPY
     return SlaveType.BAREMETAL
 
 
 class SdkBuilderConfig(BuilderConfig):
   """BuilderConfig for SDK launcher targets."""
 
   SLAVE_TYPE = SlaveType.GCE
   COLLAPSE = AlwaysCollapseFunc
   TIMEOUT = 22 * 3600 # 22 Hours.
 
-  def _GetBuilderName(self):
-    # Return 'major/minor' (end of toolchain name).
-    return '%s sdk' % (self.config.base,)
-
   def _IsExperimental(self):
     return False
 
 
 class ToolchainBuilderConfig(BuilderConfig):
   """BuilderConfig for toolchain launcher targets.
 
   Toolchain builders leverage a declared slave class to share slaves between
   them.
   """
 
   SLAVE_CLASS = 'toolchain'
 
-  def _GetBuilderName(self):
-    # Expected toolchain names are:
-    # - internal-toolchain-VERSION (base='internal', suffix='toolchain-VERSION')
-    # - toolchain-VERSION (base='', suffix='toolchain-VERSION')
-    frags = self.config.suffix.split('-')
-    assert len(frags) == 2, (
-        "Unsupported toolchain suffix: %s" % (self.config.suffix,))
-    if self.config.name:
-      return '%s %s (%s)' % (frags[0], frags[1], self.config.base)
-    return '%s %s' % (frags[0], frags[1])
-
 
 # Map of cbuildbot target type to configuration class.
 #
 # This is an ordered dictionary. The order of items corresponds to the
 # config type's order on the waterfall.
 #
 # Any configuration type not mapped should default to the 'None' value.
 CONFIG_MAP = OrderedDict((
     (ChromiteTarget.PRE_CQ_LAUNCHER, PreCqLauncherBuilderConfig),
     (ChromiteTarget.PALADIN, PaladinBuilderConfig),
     (ChromiteTarget.INCREMENTAL, IncrementalBuilderConfig),
     (ChromiteTarget.FULL, FullBuilderConfig),
     (ChromiteTarget.ASAN, AsanBuilderConfig),
-    (ChromiteTarget.FIRMWARE, FirmwareBuilderConfig),
-    (ChromiteTarget.PFQ, PfqBuilderConfig),
-    (ChromiteTarget.PRE_FLIGHT_BRANCH, PreFlightBranchBuilderConfig),
+    (ChromiteTarget.FIRMWARE, BuilderConfig),
+    (ChromiteTarget.PFQ, BuilderConfig),
+    (ChromiteTarget.PRE_FLIGHT_BRANCH, BuilderConfig),
     (ChromiteTarget.CANARY, CanaryBuilderConfig),
     (ChromiteTarget.SDK, SdkBuilderConfig),
     (ChromiteTarget.CANARY_TOOLCHAIN, CanaryBuilderConfig),
     (ChromiteTarget.TOOLCHAIN, ToolchainBuilderConfig),
-    (ChromiteTarget.ANDROID_PFQ, PfqBuilderConfig),
+    (ChromiteTarget.ANDROID_PFQ, BuilderConfig),
     (None, BuilderConfig),
 ))
 
 # Determine ordinals for each BuilderTarget type.
 _config_map_keys = CONFIG_MAP.keys()
 ORDINALS = dict((k, _config_map_keys.index(k))
                 for k in CONFIG_MAP.iterkeys())
 
 
 def GetBuilderConfig(target, **kwargs):
@@ skipping 20 matching lines @@
 
 def IsGCESlave(slavename):
   """Returns (bool): Whether |slavename| is hosted on GCE.
 
   Args:
     slavename: The hostname of the slave.
   """
   # The "-c2" suffix indicates that a builder is in GCE (as opposed to
   # in the Chrome Golo, which has a -m2 suffix).
   return bool(re.search(r'-c\d+$', slavename))