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

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

Issue 1068263003: CrOS: Update public waterfall to auto-configure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Updated from comments. Created 5 years, 8 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
Index: scripts/master/cros/builder_config.py
diff --git a/scripts/master/cros/builder_config.py b/scripts/master/cros/builder_config.py
index f127fa2aaae98ae41bd2118def5aa78d5c6b9285..1e5ab0bfdd5581e28390b9b4f0af36f0a1192563 100644
--- a/scripts/master/cros/builder_config.py
+++ b/scripts/master/cros/builder_config.py
@@ -50,6 +50,7 @@ class BuilderConfig(object):
SLAVE_TYPE = SlaveType.BAREMETAL
SLAVE_CLASS = None
CBB_VARIANT = None
+ TIMEOUT = None
def __init__(self, config):
"""Initializes a new configuration.
@@ -96,6 +97,12 @@ class BuilderConfig(object):
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
@@ -185,6 +192,26 @@ class IncrementalBuilderConfig(BuilderConfig):
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."""
@@ -221,6 +248,7 @@ class SdkBuilderConfig(BuilderConfig):
SLAVE_TYPE = SlaveType.GCE
COLLAPSE = AlwaysCollapseFunc
+ TIMEOUT = 22 * 3600 # 22 Hours.
def _GetBuilderName(self):
# Return 'major/minor' (end of toolchain name).
@@ -258,6 +286,8 @@ 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),

Powered by Google App Engine
This is Rietveld 408576698