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

Side by Side Diff: scripts/slave/recipes/chromium.py

Issue 1185693002: Move builders.py and steps.py to chromium_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Add builders property to chromium_tests test_api. 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 DEPS = [ 5 DEPS = [
6 'adb', 6 'adb',
7 'bisect_tester', 7 'bisect_tester',
8 'chromium', 8 'chromium',
9 'chromium_android', 9 'chromium_android',
10 'chromium_tests', 10 'chromium_tests',
11 'isolate', 11 'isolate',
12 'json', 12 'json',
13 'path', 13 'path',
14 'platform', 14 'platform',
15 'properties', 15 'properties',
16 'python', 16 'python',
17 'raw_io', 17 'raw_io',
18 'test_utils', 18 'test_utils',
19 'step', 19 'step',
20 'swarming', 20 'swarming',
21 ] 21 ]
22 22
23 23
24 def GenSteps(api): 24 def GenSteps(api):
25 mastername = api.properties.get('mastername') 25 mastername = api.properties.get('mastername')
26 buildername = api.properties.get('buildername') 26 buildername = api.properties.get('buildername')
27 api.chromium_tests.load_builder_configs(mastername)
27 28
28 if mastername == 'tryserver.chromium.perf' and api.chromium.builders[ 29 if mastername == 'tryserver.chromium.perf' and api.chromium.builders[
29 mastername]['builders'][buildername]['bot_type'] == 'tester': 30 mastername]['builders'][buildername]['bot_type'] == 'tester':
30 api.bisect_tester.upload_job_url() 31 api.bisect_tester.upload_job_url()
31 32
32 api.chromium_tests.configure_build(mastername, buildername) 33 api.chromium_tests.configure_build(mastername, buildername)
33 update_step, master_dict, test_spec = \ 34 update_step, master_dict, test_spec = \
34 api.chromium_tests.prepare_checkout(mastername, buildername) 35 api.chromium_tests.prepare_checkout(mastername, buildername)
35 api.chromium_tests.compile(mastername, buildername, update_step, master_dict, 36 api.chromium_tests.compile(mastername, buildername, update_step, master_dict,
36 test_spec) 37 test_spec)
37 tests = api.chromium_tests.tests_for_builder( 38 tests = api.chromium_tests.tests_for_builder(
38 mastername, buildername, update_step, master_dict) 39 mastername, buildername, update_step, master_dict)
39 40
40 if not tests: 41 if not tests:
41 return 42 return
42 43
43 api.chromium_tests.configure_swarming('chromium', precommit=False, 44 api.chromium_tests.configure_swarming('chromium', precommit=False,
44 mastername=mastername) 45 mastername=mastername)
45 test_runner = api.chromium_tests.create_test_runner(api, tests) 46 test_runner = api.chromium_tests.create_test_runner(api, tests)
46 with api.chromium_tests.wrap_chromium_tests(mastername): 47 with api.chromium_tests.wrap_chromium_tests(mastername):
47 test_runner() 48 test_runner()
48 49
49 50
50 def _sanitize_nonalpha(text): 51 def _sanitize_nonalpha(text):
51 return ''.join(c if c.isalnum() else '_' for c in text) 52 return ''.join(c if c.isalnum() else '_' for c in text)
52 53
53 54
54 def GenTests(api): 55 def GenTests(api):
55 for mastername, master_config in api.chromium.builders.iteritems(): 56 # TODO(akuegel): Filter out those masters that are not using this recipe.
Paweł Hajdan Jr. 2015/06/15 09:09:29 Well, I'd say these masters just shouldn't be in c
Adrian Kuegel 2015/06/15 12:33:22 Acknowledged. I removed this TODO.
57 for mastername, master_config in api.chromium_tests.builders.iteritems():
56 58
57 # parent builder name -> list of triggered builders. 59 # parent builder name -> list of triggered builders.
58 triggered_by_parent = {} 60 triggered_by_parent = {}
59 for buildername, bot_config in master_config['builders'].iteritems(): 61 for buildername, bot_config in master_config['builders'].iteritems():
60 parent = bot_config.get('parent_buildername') 62 parent = bot_config.get('parent_buildername')
61 if parent: 63 if parent:
62 triggered_by_parent.setdefault(parent, []).append(buildername) 64 triggered_by_parent.setdefault(parent, []).append(buildername)
63 65
64 for buildername, bot_config in master_config['builders'].iteritems(): 66 for buildername, bot_config in master_config['builders'].iteritems():
65 bot_type = bot_config.get('bot_type', 'builder_tester') 67 bot_type = bot_config.get('bot_type', 'builder_tester')
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 api.properties.generic( 451 api.properties.generic(
450 mastername='chromium.webkit', 452 mastername='chromium.webkit',
451 buildername='WebKit XP', 453 buildername='WebKit XP',
452 project='chromium', 454 project='chromium',
453 parent_buildername='WebKit Win Builder', 455 parent_buildername='WebKit Win Builder',
454 parent_got_revision='1e74b372f951d4491f305ec64f6decfcda739e73', 456 parent_got_revision='1e74b372f951d4491f305ec64f6decfcda739e73',
455 parent_got_webkit_revision='191269', 457 parent_got_webkit_revision='191269',
456 revision='1e74b372f951d4491f305ec64f6decfcda739e73') + 458 revision='1e74b372f951d4491f305ec64f6decfcda739e73') +
457 api.platform('win', 32) 459 api.platform('win', 32)
458 ) 460 )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698