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 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 481 | 481 |
| 482 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 482 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 483 # the bots. | 483 # the bots. |
| 484 | 484 |
| 485 return compile_slaves | 485 return compile_slaves |
| 486 | 486 |
| 487 | 487 |
| 488 def windows(): | 488 def windows(): |
| 489 win7 = (range(103, 106) + range(111, 114) + range(118, 152) + | 489 win7 = (range(103, 106) + range(111, 114) + range(118, 152) + |
| 490 range(300, 384) + range(510, 519) + range(525, 530)) | 490 range(300, 384) + range(510, 519) + range(525, 530)) |
| 491 new_win7 = (range(164, 207) + range(208, 211) + range(212, 215) + | |
| 492 range(216, 219) + range(220, 223) + range(224, 227) + | |
|
ghost stip (do not use)
2013/11/12 19:19:24
can you move these to master.tryserver.unused?
jam
2013/11/12 19:32:27
Done.
| |
| 493 range(228, 231)) | |
| 494 win7_x64 = range(231, 234) + range(235, 252) + range(750, 782) | 491 win7_x64 = range(231, 234) + range(235, 252) + range(750, 782) |
| 495 perf_bisect_slave_ids = [82] | 492 perf_bisect_slave_ids = [82] |
| 496 perf_a4_slaves = [2, 3] | 493 perf_a4_slaves = [2, 3] |
| 497 | 494 |
| 498 normal_slaves = [ | 495 normal_slaves = [ |
| 499 { | 496 { |
| 500 'master': 'TryServer', | 497 'master': 'TryServer', |
| 501 'builder': [ | 498 'builder': [ |
| 502 'win', 'win_rel_naclmore', 'win_rel' | 499 'win', 'win_rel_naclmore', 'win_rel' |
| 503 ], | 500 ], |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 537 'win_blink_git', 'win_blink_rel_git', | 534 'win_blink_git', 'win_blink_rel_git', |
| 538 ], | 535 ], |
| 539 'hostname': 'vm%d-m4' % number, | 536 'hostname': 'vm%d-m4' % number, |
| 540 'os': 'win', | 537 'os': 'win', |
| 541 'version': 'win7', | 538 'version': 'win7', |
| 542 'bits': '64', | 539 'bits': '64', |
| 543 } for number in ([106, 114, 425, 496] + range(152, 158) + range(521, 525) + | 540 } for number in ([106, 114, 425, 496] + range(152, 158) + range(521, 525) + |
| 544 range(782, 786) + range(790, 798) + range(427, 430) + | 541 range(782, 786) + range(790, 798) + range(427, 430) + |
| 545 range(498, 501)) | 542 range(498, 501)) |
| 546 ] | 543 ] |
| 547 win7_aura_slaves = [ | |
| 548 { | |
| 549 'master': 'TryServer', | |
| 550 'builder': [ | |
| 551 'win7_aura' | |
| 552 ], | |
| 553 'hostname': 'vm%d-m4' % number, | |
| 554 'os': 'win', | |
| 555 'version': 'win7', | |
| 556 'bits': '64', | |
| 557 } for number in new_win7 | |
| 558 ] | |
| 559 win8_aura_slaves = [ | 544 win8_aura_slaves = [ |
| 560 { | 545 { |
| 561 'master': 'TryServer', | 546 'master': 'TryServer', |
| 562 'builder': [ | 547 'builder': [ |
| 563 'win8_aura', | 548 'win8_aura', |
| 564 ], | 549 ], |
| 565 'hostname': 'vm115-m4', | 550 'hostname': 'vm115-m4', |
| 566 'os': 'win', | 551 'os': 'win', |
| 567 'version': 'win8', | 552 'version': 'win8', |
| 568 'bits': '64', | 553 'bits': '64', |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 659 'bits': '64', | 644 'bits': '64', |
| 660 'builder': 'win_perf_bisect', | 645 'builder': 'win_perf_bisect', |
| 661 'hostname': 'build%d-a4' % i, | 646 'hostname': 'build%d-a4' % i, |
| 662 } for i in perf_a4_slaves | 647 } for i in perf_a4_slaves |
| 663 ) | 648 ) |
| 664 | 649 |
| 665 return ( | 650 return ( |
| 666 normal_slaves + | 651 normal_slaves + |
| 667 nacl_sdk_slaves + | 652 nacl_sdk_slaves + |
| 668 layout_slaves + | 653 layout_slaves + |
| 669 win7_aura_slaves + | |
| 670 win8_aura_slaves + | 654 win8_aura_slaves + |
| 671 drmemory_slaves + | 655 drmemory_slaves + |
| 672 chromeframe_slave + | 656 chromeframe_slave + |
| 673 gpu_slaves + | 657 gpu_slaves + |
| 674 swarm_slaves + | 658 swarm_slaves + |
| 675 win_tsan_slave + | 659 win_tsan_slave + |
| 676 win_x64_slaves + | 660 win_x64_slaves + |
| 677 swarm_dumb_slaves + | 661 swarm_dumb_slaves + |
| 678 perf_bisect_slaves) | 662 perf_bisect_slaves) |
| 679 | 663 |
| 680 | 664 |
| 681 slaves = linux() + mac() + windows() + cros() + android() + ios() | 665 slaves = linux() + mac() + windows() + cros() + android() + ios() |
| OLD | NEW |