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

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/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: updated baselines 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import contextlib 5 import contextlib
6 import copy 6 import copy
7 import json 7 import json
8 8
9 from infra.libs.infra_types import freeze, thaw 9 from infra.libs.infra_types import freeze, thaw
10 from recipe_engine import recipe_api 10 from recipe_engine import recipe_api
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 except self.m.step.StepFailure: 100 except self.m.step.StepFailure:
101 # As part of deapplying patch we call runhooks without the patch. 101 # As part of deapplying patch we call runhooks without the patch.
102 self.deapply_patch(update_step) 102 self.deapply_patch(update_step)
103 raise 103 raise
104 else: 104 else:
105 self.m.chromium.runhooks() 105 self.m.chromium.runhooks()
106 106
107 test_spec_file = bot_config.get('testing', {}).get('test_spec_file', 107 test_spec_file = bot_config.get('testing', {}).get('test_spec_file',
108 '%s.json' % mastername) 108 '%s.json' % mastername)
109 109
110 if self.m.chromium.c.project_generator.tool == 'mb':
111 self.m.chromium.run_mb(mastername, buildername)
112
113 # TODO(phajdan.jr): Bots should have no generators instead. 110 # TODO(phajdan.jr): Bots should have no generators instead.
114 if bot_config.get('disable_tests'): 111 if bot_config.get('disable_tests'):
115 test_spec = {} 112 test_spec = {}
116 scripts_compile_targets = {} 113 scripts_compile_targets = {}
117 else: 114 else:
118 test_spec = self.read_test_spec(self.m, test_spec_file) 115 test_spec = self.read_test_spec(self.m, test_spec_file)
119 test_spec_path = self.m.path['checkout'].join('testing', 'buildbot', 116 test_spec_path = self.m.path['checkout'].join('testing', 'buildbot',
120 test_spec_file) 117 test_spec_file)
121 118
122 scripts_compile_targets = \ 119 scripts_compile_targets = \
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 master_config.get('build_gs_bucket'), 608 master_config.get('build_gs_bucket'),
612 extra_url_components=None) 609 extra_url_components=None)
613 elif (mastername == 'tryserver.chromium.perf' or 610 elif (mastername == 'tryserver.chromium.perf' or
614 (mastername == 'tryserver.chromium.linux' and 611 (mastername == 'tryserver.chromium.linux' and
615 buildername == 'linux_full_bisect_builder')): 612 buildername == 'linux_full_bisect_builder')):
616 return None 613 return None
617 else: 614 else:
618 return self.m.archive.legacy_upload_url( 615 return self.m.archive.legacy_upload_url(
619 master_config.get('build_gs_bucket'), 616 master_config.get('build_gs_bucket'),
620 extra_url_components=self.m.properties['mastername']) 617 extra_url_components=self.m.properties['mastername'])
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698