| 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 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 'os': 'win', | 586 'os': 'win', |
| 587 'version': 'win7', | 587 'version': 'win7', |
| 588 'bits': '64', | 588 'bits': '64', |
| 589 } for i in range(3, 6) | 589 } for i in range(3, 6) |
| 590 ] | 590 ] |
| 591 swarm_slaves = [] | 591 swarm_slaves = [] |
| 592 for i in range(511, 520): | 592 for i in range(511, 520): |
| 593 swarm_slaves.extend( | 593 swarm_slaves.extend( |
| 594 { | 594 { |
| 595 'master': 'TryServer', | 595 'master': 'TryServer', |
| 596 'builder': ['swarm_triggered'], | 596 'builder': [ |
| 597 # Note: they all do the exact same thing, but having different names |
| 598 # makes it easier for developpers. |
| 599 'linux_swarm_triggered', |
| 600 'mac_swarm_triggered', |
| 601 'win_swarm_triggered', |
| 602 # TODO(maruel): Temporary to ease the transition; to be deleted around |
| 603 # 2013-10-28. |
| 604 'swarm_triggered', |
| 605 ], |
| 597 'hostname': 'slave%d-c4' % i, | 606 'hostname': 'slave%d-c4' % i, |
| 598 'os': 'linux', | 607 'os': 'linux', |
| 599 'version': 'precise', | 608 'version': 'precise', |
| 600 'bits': '64', | 609 'bits': '64', |
| 601 'subdir': str(j), | 610 'subdir': str(j), |
| 602 } for j in xrange(20)) | 611 } for j in xrange(20)) |
| 603 | 612 |
| 604 win_tsan_slave = [ | 613 win_tsan_slave = [ |
| 605 { | 614 { |
| 606 'master': 'TryServer', | 615 'master': 'TryServer', |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 chromeframe_slave + | 663 chromeframe_slave + |
| 655 gpu_slaves + | 664 gpu_slaves + |
| 656 swarm_slaves + | 665 swarm_slaves + |
| 657 win_tsan_slave + | 666 win_tsan_slave + |
| 658 win_x64_slaves + | 667 win_x64_slaves + |
| 659 swarm_dumb_slaves + | 668 swarm_dumb_slaves + |
| 660 perf_bisect_slaves) | 669 perf_bisect_slaves) |
| 661 | 670 |
| 662 | 671 |
| 663 slaves = linux() + mac() + windows() + cros() + android() + ios() | 672 slaves = linux() + mac() + windows() + cros() + android() + ios() |
| OLD | NEW |