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

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

Issue 2172553003: The second solution solution for ToT catapult. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressing feedback and rebasing Created 4 years, 4 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 6
7 from . import steps 7 from . import steps
8 8
9 9
10 _builders = collections.defaultdict(dict) 10 _builders = collections.defaultdict(dict)
11 11
12 12
13 SPEC = { 13 SPEC = {
14 'builders': {}, 14 'builders': {},
15 'settings': { 15 'settings': {
16 'build_gs_bucket': 'chrome-perf', 16 'build_gs_bucket': 'chrome-perf',
17 }, 17 },
18 } 18 }
19 19
20 20
21 def _BaseSpec(bot_type, chromium_config, disable_tests, 21 def _BaseSpec(bot_type, config_name, disable_tests,
22 platform, target_bits, tests): 22 platform, target_bits, tests):
23 spec = { 23 spec = {
24 'bot_type': bot_type, 24 'bot_type': bot_type,
25 'chromium_config': chromium_config, 25 'chromium_config': config_name,
26 'chromium_config_kwargs': { 26 'chromium_config_kwargs': {
27 'BUILD_CONFIG': 'Release', 27 'BUILD_CONFIG': 'Release',
28 'TARGET_BITS': target_bits, 28 'TARGET_BITS': target_bits,
29 }, 29 },
30 'disable_tests': disable_tests, 30 'disable_tests': disable_tests,
31 'gclient_config': 'chromium_perf', 31 'gclient_config': config_name,
32 'testing': { 32 'testing': {
33 'platform': 'linux' if platform == 'android' else platform, 33 'platform': 'linux' if platform == 'android' else platform,
34 }, 34 },
35 'tests': tests, 35 'tests': tests,
36 } 36 }
37 37
38 if platform == 'android': 38 if platform == 'android':
39 spec['android_config'] = 'chromium_perf' 39 spec['android_config'] = 'chromium_perf'
40 spec['chromium_apply_config'] = ['android'] 40 spec['chromium_apply_config'] = ['android']
41 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm' 41 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm'
42 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android' 42 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android'
43 spec['gclient_apply_config'] = ['android'] 43 spec['gclient_apply_config'] = ['android']
44 44
45 return spec 45 return spec
46 46
47 47
48 def BuildSpec(chromium_config, perf_id, platform, target_bits): 48 def BuildSpec(config_name, perf_id, platform, target_bits):
49 if platform == 'android': 49 if platform == 'android':
50 # TODO: Run sizes on Android. 50 # TODO: Run sizes on Android.
51 tests = [] 51 tests = []
52 else: 52 else:
53 tests = [steps.SizesStep('https://chromeperf.appspot.com', perf_id)] 53 tests = [steps.SizesStep('https://chromeperf.appspot.com', perf_id)]
54 54
55 spec = _BaseSpec( 55 spec = _BaseSpec(
56 bot_type='builder', 56 bot_type='builder',
57 chromium_config=chromium_config, 57 config_name=config_name,
58 disable_tests=True, 58 disable_tests=True,
59 platform=platform, 59 platform=platform,
60 target_bits=target_bits, 60 target_bits=target_bits,
61 tests=tests) 61 tests=tests,
62 )
62 63
63 spec['compile_targets'] = ['chromium_builder_perf'] 64 spec['compile_targets'] = ['chromium_builder_perf']
64 65
65 return spec 66 return spec
66 67
67 68
68 def _TestSpec(chromium_config, parent_builder, perf_id, platform, target_bits, 69 def _TestSpec(config_name, parent_builder, perf_id, platform, target_bits,
69 max_battery_temp, shard_index, num_host_shards, 70 max_battery_temp, shard_index, num_host_shards,
70 num_device_shards): 71 num_device_shards):
71 spec = _BaseSpec( 72 spec = _BaseSpec(
72 bot_type='tester', 73 bot_type='tester',
73 chromium_config=chromium_config, 74 config_name=config_name,
74 disable_tests=platform == 'android', 75 disable_tests=platform == 'android',
75 platform=platform, 76 platform=platform,
76 target_bits=target_bits, 77 target_bits=target_bits,
77 tests=[steps.DynamicPerfTests( 78 tests=[steps.DynamicPerfTests(
78 perf_id, platform, target_bits, max_battery_temp=max_battery_temp, 79 perf_id, platform, target_bits, max_battery_temp=max_battery_temp,
79 num_device_shards=num_device_shards, num_host_shards=num_host_shards, 80 num_device_shards=num_device_shards, num_host_shards=num_host_shards,
80 shard_index=shard_index)], 81 shard_index=shard_index)],
81 ) 82 )
82 83
83 spec['parent_buildername'] = parent_builder 84 spec['parent_buildername'] = parent_builder
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', 162 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac',
162 num_host_shards=5) 163 num_host_shards=5)
163 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', 164 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac',
164 num_host_shards=5) 165 num_host_shards=5)
165 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', 166 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac',
166 num_host_shards=5) 167 num_host_shards=5)
167 168
168 169
169 _AddTestSpec('Linux Perf', 'linux-release', 'linux', 170 _AddTestSpec('Linux Perf', 'linux-release', 'linux',
170 num_host_shards=5) 171 num_host_shards=5)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698