| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 import collections | 7 import collections |
| 8 import copy | 8 import copy |
| 9 import json | 9 import json |
| 10 import os | 10 import os |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 H(compile_step, extra_gyp='component=shared_library'), | 154 H(compile_step, extra_gyp='component=shared_library'), |
| 155 T(std_tests, ['--experimental', flakiness_server])), | 155 T(std_tests, ['--experimental', flakiness_server])), |
| 156 B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])), | 156 B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])), |
| 157 B('perf-tests-rel', H(std_test_steps), | 157 B('perf-tests-rel', H(std_test_steps), |
| 158 T([], ['--install=ChromiumTestShell'])), | 158 T([], ['--install=ChromiumTestShell'])), |
| 159 B('webkit-latest-webkit-tests', H(std_test_steps), | 159 B('webkit-latest-webkit-tests', H(std_test_steps), |
| 160 T(['webkit_layout', 'webkit'], ['--auto-reconnect'])), | 160 T(['webkit_layout', 'webkit'], ['--auto-reconnect'])), |
| 161 B('webkit-latest-contentshell', H(compile_step), | 161 B('webkit-latest-contentshell', H(compile_step), |
| 162 T(['webkit_layout'], ['--auto-reconnect'])), | 162 T(['webkit_layout'], ['--auto-reconnect'])), |
| 163 B('builder-unit-tests', H(compile_step), T(['unit'])), | 163 B('builder-unit-tests', H(compile_step), T(['unit'])), |
| 164 B('webrtc-builder', |
| 165 H(std_build_steps, |
| 166 extra_args=['--build-targets=android_builder_webrtc'], |
| 167 extra_gyp='include_tests=1 enable_tracing=1')), |
| 164 B('webrtc-tests', H(std_test_steps), T(['webrtc'], [flakiness_server])), | 168 B('webrtc-tests', H(std_test_steps), T(['webrtc'], [flakiness_server])), |
| 165 | 169 |
| 166 # Generic builder config (for substring match). | 170 # Generic builder config (for substring match). |
| 167 B('builder', H(std_build_steps)), | 171 B('builder', H(std_build_steps)), |
| 168 ] | 172 ] |
| 169 | 173 |
| 170 bot_map = dict((config.bot_id, config) for config in bot_configs) | 174 bot_map = dict((config.bot_id, config) for config in bot_configs) |
| 171 | 175 |
| 172 # These bots have identical configuration to ones defined earlier. | 176 # These bots have identical configuration to ones defined earlier. |
| 173 copy_map = [ | 177 copy_map = [ |
| 174 ('lkgr-clobber', 'main-clobber'), | 178 ('lkgr-clobber', 'main-clobber'), |
| 175 ('try-builder-dbg', 'main-builder-dbg'), | 179 ('try-builder-dbg', 'main-builder-dbg'), |
| 176 ('try-builder-rel', 'main-builder-rel'), | 180 ('try-builder-rel', 'main-builder-rel'), |
| 177 ('try-clang-builder', 'main-clang-builder'), | 181 ('try-clang-builder', 'main-clang-builder'), |
| 178 ('try-fyi-builder-dbg', 'fyi-builder-dbg'), | 182 ('try-fyi-builder-dbg', 'fyi-builder-dbg'), |
| 179 ('try-x86-builder-dbg', 'x86-builder-dbg'), | 183 ('try-x86-builder-dbg', 'x86-builder-dbg'), |
| 180 ('try-tests', 'main-tests'), | 184 ('try-tests', 'main-tests'), |
| 181 ('try-fyi-tests', 'fyi-tests'), | 185 ('try-fyi-tests', 'fyi-tests'), |
| 182 ('webkit-latest-tests', 'main-tests'), | 186 ('webkit-latest-tests', 'main-tests'), |
| 183 ('webrtc-builder', 'main-builder-rel'), | |
| 184 ] | 187 ] |
| 185 for to_id, from_id in copy_map: | 188 for to_id, from_id in copy_map: |
| 186 assert to_id not in bot_map | 189 assert to_id not in bot_map |
| 187 # pylint: disable=W0212 | 190 # pylint: disable=W0212 |
| 188 bot_map[to_id] = copy.deepcopy(bot_map[from_id])._replace(bot_id=to_id) | 191 bot_map[to_id] = copy.deepcopy(bot_map[from_id])._replace(bot_id=to_id) |
| 189 | 192 |
| 190 # Trybots do not upload to flakiness dashboard. They should be otherwise | 193 # Trybots do not upload to flakiness dashboard. They should be otherwise |
| 191 # identical in configuration to their trunk building counterparts. | 194 # identical in configuration to their trunk building counterparts. |
| 192 test_obj = bot_map[to_id].test_obj | 195 test_obj = bot_map[to_id].test_obj |
| 193 if to_id.startswith('try') and test_obj: | 196 if to_id.startswith('try') and test_obj: |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 for command in commands: | 267 for command in commands: |
| 265 print 'Will run: ', bb_utils.CommandToString(command) | 268 print 'Will run: ', bb_utils.CommandToString(command) |
| 266 print | 269 print |
| 267 | 270 |
| 268 env = GetEnvironment(bot_config.host_obj, options.testing) | 271 env = GetEnvironment(bot_config.host_obj, options.testing) |
| 269 return RunBotCommands(options, commands, env) | 272 return RunBotCommands(options, commands, env) |
| 270 | 273 |
| 271 | 274 |
| 272 if __name__ == '__main__': | 275 if __name__ == '__main__': |
| 273 sys.exit(main(sys.argv)) | 276 sys.exit(main(sys.argv)) |
| OLD | NEW |