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

Unified Diff: scripts/slave/recipe_modules/chromium/api.py

Issue 1177593002: Add swarming support for MB (and the GN bots) in the chromium recipes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge patchset #3 to r295696 (no other changes) Created 5 years, 6 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 | « no previous file | scripts/slave/recipe_modules/chromium_tests/api.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium/api.py
diff --git a/scripts/slave/recipe_modules/chromium/api.py b/scripts/slave/recipe_modules/chromium/api.py
index 479e0cd5532059e348714a061792241b723ae4eb..d5753858b4b89ebacd6b0892dbf904feb3dad968 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -562,24 +562,33 @@ class ChromiumApi(recipe_api.RecipeApi):
'--args=%s' % ' '.join(gn_args),
])
+ def run_mb_if_necessary(self, mastername, buildername, tests):
+ if self.c.project_generator.tool == 'mb':
+ self.run_mb(mastername, buildername,
+ swarming_targets=[t.name for t in tests if t.uses_swarming])
+
def run_mb(self, mastername, buildername, use_goma=True,
- mb_config_path=None):
+ mb_config_path=None, swarming_targets=None):
mb_config_path = (mb_config_path or
self.m.path['checkout'].join('tools', 'mb',
'mb_config.pyl'))
+ swarming_targets = swarming_targets or []
+
args=[
'gen', '-v',
'-m', mastername,
'-b', buildername,
'--config-file', mb_config_path,
]
+
if use_goma:
- args += [
- '--goma-dir', self.m.path['build'].join('goma'),
- ]
- args += [
- '//out/%s' % self.c.build_config_fs
- ]
+ args += ['--goma-dir', self.m.path['build'].join('goma')]
+
+ if swarming_targets:
+ data = '\n'.join(swarming_targets) + '\n'
+ args += ['--swarming-targets-file', self.m.raw_io.input(data)]
+
+ args += ['//out/%s' % self.c.build_config_fs]
# This runs with no env being passed along, so we get a clean environment
# without any GYP_DEFINES being present to cause confusion.
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698