Update floating builder logic, add to "chromiumos"

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 27 matching lines @@
   """Represents the presentation of a Chromite builder on a waterfall.
 
   Note that every property here is potentially derivable from the Chromite
   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
+  FLOATING = 0
   UNIQUE = False
   COLLAPSE = True
   SLAVE_TYPE = SlaveType.BAREMETAL
   CBB_VARIANT = None
   TIMEOUT = None
 
   def __init__(self, config, branch=None):
     """Initializes a new configuration.
 
     Args:
@@ skipping 54 matching lines @@
     """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
     http://docs.buildbot.net/latest/manual/customization.html).
     """
     return self.COLLAPSE
 
   @property
   def floating(self):
-    """Returns (bool): Whether this builder should have a floating backup slave.
+    """Returns (int): The number of floating builders that this builder type
+        should be supported by.
     """
     return self.FLOATING
 
   @property
   def ordinal(self):
     """Returns (int): This builder's ordinal (sort order).
 
     This BuilderConfig class' ordinal. This is determined by its position in the
     CONFIG_MAP.
     """
@@ skipping 47 matching lines @@
 
   UNIQUE = True
   CLOSER = True
   SLAVE_TYPE = SlaveType.GCE_WIMPY
 
 
 class PaladinBuilderConfig(BuilderConfig):
   """BuilderConfig for Paladin launcher targets."""
 
   UNIQUE = True
-  FLOATING = 'paladin'
+  FLOATING = 2
+
+
+class PfqBuilderConfig(BuilderConfig):
+  """BuilderConfig for Paladin launcher targets."""
+
+  UNIQUE = True
+  FLOATING = 2
 
 
 class IncrementalBuilderConfig(BuilderConfig):
   """BuilderConfig for Incremental launcher targets."""
 
   CLOSER = True
   COLLAPSE = AlwaysCollapseFunc
 
   def _IsExperimental(self):
     return False
@@ skipping 62 matching lines @@
 # 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, BuilderConfig),
-    (ChromiteTarget.PFQ, BuilderConfig),
+    (ChromiteTarget.PFQ, PfqBuilderConfig),
     (ChromiteTarget.PRE_FLIGHT_BRANCH, BuilderConfig),
     (ChromiteTarget.CANARY, CanaryBuilderConfig),
     (ChromiteTarget.SDK, SdkBuilderConfig),
     (ChromiteTarget.TOOLCHAIN, ToolchainBuilderConfig),
     (ChromiteTarget.ANDROID_PFQ, BuilderConfig),
     (None, BuilderConfig),
 ))
 
 # Determine ordinals for each BuilderTarget type.
 _config_map_keys = CONFIG_MAP.keys()
@@ skipping 25 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))