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

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

Issue 1187773004: Add swarming support for MB (and the GN bots) in the chromium recipes. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: fixes 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
Index: scripts/slave/recipe_modules/chromium_tests/api.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/api.py b/scripts/slave/recipe_modules/chromium_tests/api.py
index 25c29b51bd345aff9a20e1c83fc2a6ba1fb75942..af774b7a9a09ef059f896b73936b1536f7c729e3 100644
--- a/scripts/slave/recipe_modules/chromium_tests/api.py
+++ b/scripts/slave/recipe_modules/chromium_tests/api.py
@@ -127,9 +127,6 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
test_spec_file = bot_config.get('testing', {}).get('test_spec_file',
'%s.json' % mastername)
- if self.m.chromium.c.project_generator.tool == 'mb':
- self.m.chromium.run_mb(mastername, buildername)
-
# TODO(phajdan.jr): Bots should have no generators instead.
if bot_config.get('disable_tests'):
test_spec = {}
@@ -315,6 +312,10 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
self.m.chromium_android.clean_local_files()
self.m.chromium_android.run_tree_truth()
+ if self.m.chromium.c.project_generator.tool == 'mb':
+ self.m.chromium.run_mb(mastername, buildername, swarming_targets=[
+ t.name for t in tests_including_triggered if t.uses_swarming])
+
if bot_type in ['builder', 'builder_tester']:
isolated_targets = [
t.isolate_target for t in tests_including_triggered if t.uses_swarming
« no previous file with comments | « scripts/slave/recipe_modules/chromium/api.py ('k') | scripts/slave/recipe_modules/chromium_tests/chromium_win.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698