Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 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 # See master.experimental/slaves.cfg for documentation. | 7 # See master.experimental/slaves.cfg for documentation. |
| 8 | 8 |
| 9 | 9 |
| 10 def expand_extra_builders(extras, total): | 10 def expand_extra_builders(extras, total): |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 368 { | 368 { |
| 369 'master': 'TryServer', | 369 'master': 'TryServer', |
| 370 'builder': ['android_dbg', 'android_fyi_dbg', 'android_clang_dbg', | 370 'builder': ['android_dbg', 'android_fyi_dbg', 'android_clang_dbg', |
| 371 'blink_android_compile_dbg', 'blink_android_compile_rel', | 371 'blink_android_compile_dbg', 'blink_android_compile_rel', |
| 372 'android_rel', 'android_x86_dbg'], | 372 'android_rel', 'android_x86_dbg'], |
| 373 'hostname': 'vm%d-m4' % i, | 373 'hostname': 'vm%d-m4' % i, |
| 374 'os': 'linux', | 374 'os': 'linux', |
| 375 'version': 'precise', | 375 'version': 'precise', |
| 376 'bits': '64', | 376 'bits': '64', |
| 377 } for i in range(384, 422) | 377 } for i in range(384, 422) |
| 378 ] + [ | |
| 379 # TODO(navabi): move all vm%d-m4 slaves to ccompute slaves (BUG=302063). | |
| 380 # ccompute slaves | |
| 381 { | |
| 382 'master': 'TryServer', | |
| 383 'builder': ['android_dbg', 'android_fyi_dbg', 'android_clang_dbg', | |
| 384 'blink_android_compile_dbg', 'blink_android_compile_rel', | |
| 385 'android_rel', 'android_x86_dbg'], | |
| 386 'hostname': 'slave%d-m4' % i, | |
|
Ryan Tseng
2013/10/10 21:20:17
s/m4/c4/
navabi
2013/10/10 21:26:30
Done.
| |
| 387 'os': 'linux', | |
| 388 'version': 'precise', | |
| 389 'bits': '64', | |
| 390 } for i in range(102, 120) | |
|
Ryan Tseng
2013/10/10 21:20:17
s/120/121/ (so that 120 is inclusive)
navabi
2013/10/10 21:26:30
Done.
| |
| 378 ] | 391 ] |
| 379 | 392 |
| 380 test_slaves = [ | 393 test_slaves = [ |
| 381 { | 394 { |
| 382 'master': 'TryServer', | 395 'master': 'TryServer', |
| 383 'builder': ['android_dbg_triggered_tests', | 396 'builder': ['android_dbg_triggered_tests', |
| 384 'android_rel_triggered_tests', | 397 'android_rel_triggered_tests', |
| 385 'android_fyi_dbg_triggered_tests'], | 398 'android_fyi_dbg_triggered_tests'], |
| 386 'hostname': 'chromeperf%d' % i, | 399 'hostname': 'chromeperf%d' % i, |
| 387 'os': 'linux', | 400 'os': 'linux', |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 626 chromeframe_slave + | 639 chromeframe_slave + |
| 627 gpu_slaves + | 640 gpu_slaves + |
| 628 swarm_slaves + | 641 swarm_slaves + |
| 629 win_tsan_slave + | 642 win_tsan_slave + |
| 630 win_x64_slaves + | 643 win_x64_slaves + |
| 631 swarm_dumb_slaves + | 644 swarm_dumb_slaves + |
| 632 perf_bisect_slaves) | 645 perf_bisect_slaves) |
| 633 | 646 |
| 634 | 647 |
| 635 slaves = linux() + mac() + windows() + cros() + android() + ios() | 648 slaves = linux() + mac() + windows() + cros() + android() + ios() |
| OLD | NEW |