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

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/api.py

Issue 1915473003: goma: back to build-provided client and disable oauth2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 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 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 collections 5 import collections
6 import contextlib 6 import contextlib
7 import copy 7 import copy
8 import itertools 8 import itertools
9 import json 9 import json
10 10
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 def create_bot_db_from_master_dict(self, mastername, master_dict): 195 def create_bot_db_from_master_dict(self, mastername, master_dict):
196 bot_db = bdb_module.BotConfigAndTestDB() 196 bot_db = bdb_module.BotConfigAndTestDB()
197 bot_db._add_master_dict_and_test_spec(mastername, master_dict, {}) 197 bot_db._add_master_dict_and_test_spec(mastername, master_dict, {})
198 return bot_db 198 return bot_db
199 199
200 def prepare_checkout(self, bot_config, root_solution_revision=None, 200 def prepare_checkout(self, bot_config, root_solution_revision=None,
201 force=False): 201 force=False):
202 update_step = self.ensure_checkout( 202 update_step = self.ensure_checkout(
203 bot_config, root_solution_revision, force=force) 203 bot_config, root_solution_revision, force=force)
204 204
205 if (self.m.chromium.c.compile_py.compiler and
206 'goma' in self.m.chromium.c.compile_py.compiler):
207 self.m.chromium.ensure_goma()
208
209 # TODO(robertocn): Remove this hack by the end of Q1/2016. 205 # TODO(robertocn): Remove this hack by the end of Q1/2016.
210 if (bot_config.matches_any_bot_id( 206 if (bot_config.matches_any_bot_id(
211 lambda bot_id: bot_id['mastername'] == 'tryserver.chromium.perf' and 207 lambda bot_id: bot_id['mastername'] == 'tryserver.chromium.perf' and
212 bot_id['buildername'].endswith('builder')) 208 bot_id['buildername'].endswith('builder'))
213 and bot_config.get('bot_type') == 'builder'): 209 and bot_config.get('bot_type') == 'builder'):
214 if bot_config.should_force_legacy_compiling(self): 210 if bot_config.should_force_legacy_compiling(self):
215 self.m.chromium.c.project_generator.tool = 'gyp' 211 self.m.chromium.c.project_generator.tool = 'gyp'
216 212
217 self.set_up_swarming(bot_config) 213 self.set_up_swarming(bot_config)
218 self.runhooks(update_step) 214 self.runhooks(update_step)
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 def get_compile_targets_for_scripts(self): 812 def get_compile_targets_for_scripts(self):
817 return self.m.python( 813 return self.m.python(
818 name='get compile targets for scripts', 814 name='get compile targets for scripts',
819 script=self.m.path['checkout'].join( 815 script=self.m.path['checkout'].join(
820 'testing', 'scripts', 'get_compile_targets.py'), 816 'testing', 'scripts', 'get_compile_targets.py'),
821 args=[ 817 args=[
822 '--output', self.m.json.output(), 818 '--output', self.m.json.output(),
823 '--', 819 '--',
824 ] + self.get_common_args_for_scripts(), 820 ] + self.get_common_args_for_scripts(),
825 step_test_data=lambda: self.m.json.test_api.output({})) 821 step_test_data=lambda: self.m.json.test_api.output({}))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698