CrOS: Update public waterfall to auto-configure.

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.
 """
 
 from collections import OrderedDict, namedtuple
 
 from common.cros_chromite import ChromiteTarget, SlaveType
@@ skipping 32 matching lines @@
   # Default set of class base properties. Subclasses can override these to
   # affect behavior.
   CLOSER = False
   FLOATING = None
   UNIQUE = False
   COLLAPSE = True
   MASTER_BUILDER_NAME = None
   SLAVE_TYPE = SlaveType.BAREMETAL
   SLAVE_CLASS = None
   CBB_VARIANT = None
+  TIMEOUT = None
 
   def __init__(self, config):
     """Initializes a new configuration.
 
     Args:
       config (ChromiteTarget): The underlying Chromite configuration object.
     """
     self.config = config
 
   def __str__(self):
@@ skipping 26 matching lines @@
   @property
   def cbb_variant(self):
     """Returns (str): Cbuildbot recipe variant for this builder type, or None.
     """
     variant = self.config.category
     if variant and self.config.is_master:
       return '%s-master' % (variant,)
     return variant
 
   @property
+  def timeout(self):
+    """Returns (int/None): This builder type's custom build timeout value.
+    """
+    return self.TIMEOUT
+
+  @property
   def unique(self):
     """Returns (bool): Whether BuildBot should enforce singleton locks."""
     return self.UNIQUE
 
   @property
   def collapse(self):
     """Returns (bool): Whether BuildBot should collapse multiple builds.
 
     This will be passed to the 'collapseRequests' builder property, and can
     either be True, False, or a lambda function (see
@@ skipping 69 matching lines @@
 class IncrementalBuilderConfig(BuilderConfig):
   """BuilderConfig for Incremental launcher targets."""
 
   CLOSER = True
   COLLAPSE = AlwaysCollapseFunc
 
   def _GetBuilderName(self):
     return '%s incremental' % (self.config.base,)
 
 
+class FullBuilderConfig(BuilderConfig):
+  """BuilderConfig for Full launcher targets."""
+
+  CLOSER = True
+  COLLAPSE = AlwaysCollapseFunc
+
+  def _GetBuilderName(self):
+    return '%s full' % (self.config.base,)
+
+
+class AsanBuilderConfig(BuilderConfig):
+  """BuilderConfig for ASAN launcher targets."""
+
+  CLOSER = True
+  COLLAPSE = AlwaysCollapseFunc
+
+  def _GetBuilderName(self):
+    return '%s ASAN' % (self.config.base,)
+
+
 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."""
 
@@ skipping 16 matching lines @@
 
   def _GetBuilderName(self):
     return '%s canary' % (self.config.base,)
 
 
 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,)
 
 
 class ToolchainBuilderConfig(BuilderConfig):
   """BuilderConfig for toolchain launcher targets.
 
   Toolchain builders leverage a declared slave class to share slaves between
@@ skipping 17 matching lines @@
 # 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.CANARY, CanaryBuilderConfig),
     (ChromiteTarget.SDK, SdkBuilderConfig),
     (ChromiteTarget.TOOLCHAIN, ToolchainBuilderConfig),
     (None, BuilderConfig),
 ))
 
 # Determine ordinals for each BuilderTarget type.
 _config_map_keys = CONFIG_MAP.keys()
@@ skipping 14 matching lines @@
   """Returns (OrderedDict): BuilderConfig instances for a set of targets.
 
   Args:
     targets (list): A list of ChromiteTarget instances to generate
         BuilderConfigs for.
   """
   configs = [GetBuilderConfig(t)
              for t in targets.itervalues()]
   configs.sort()
   return OrderedDict((c.config.name, c) for c in configs)