Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(679)

Unified Diff: scripts/master/cros/builder_config.py

Issue 2250443002: Update floating builder logic, add to "chromiumos" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Pylint fixes. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/common/slave_alloc.py ('k') | scripts/master/floating_builder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/master/cros/builder_config.py
diff --git a/scripts/master/cros/builder_config.py b/scripts/master/cros/builder_config.py
index cce999ccbbd7e01cd8f8af510d7ad8858eb5a7eb..f8e79e057599c97b451d3c9b08827734ac04d520 100644
--- a/scripts/master/cros/builder_config.py
+++ b/scripts/master/cros/builder_config.py
@@ -45,7 +45,7 @@ class BuilderConfig(object):
# 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
@@ -120,7 +120,8 @@ class BuilderConfig(object):
@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
@@ -188,7 +189,14 @@ 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):
@@ -271,7 +279,7 @@ CONFIG_MAP = OrderedDict((
(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),
« no previous file with comments | « scripts/common/slave_alloc.py ('k') | scripts/master/floating_builder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698