| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright 2014 The Chromium Authors. All rights reserved. | 3 # Copyright 2014 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 def mac(): | 9 def mac(): |
| 10 cq_slaves = ( | 10 cq_slaves = ( |
| 11 ['vm%d-m4' % i for i in range(682, 711)] + | 11 ['vm%d-m4' % i for i in range(682, 711)] + |
| 12 ['vm%d-a4' % i for i in range(53, 63)]) | 12 ['vm%d-a4' % i for i in range(53, 63)]) |
| 13 cq_builders = [ | 13 cq_builders = [ |
| 14 'mac_chromium_compile_dbg_ng', | 14 'mac_chromium_compile_dbg_ng', |
| 15 'mac_chromium_gn_dbg', | 15 'mac_chromium_gn_dbg', |
| 16 'mac_chromium_gn_rel', | 16 'mac_chromium_gn_rel', |
| 17 'mac_chromium_gn_upload', | 17 'mac_chromium_gn_upload', |
| 18 'mac_chromium_rel_ng', | 18 'mac_chromium_rel_ng', |
| 19 ] | 19 ] |
| 20 | 20 |
| 21 optional_slaves = ['vm%d-m4' % i for i in [713, 723]] | 21 optional_slaves = ['vm%d-m4' % i for i in [713, 723]] |
| 22 optional_builders = [ | 22 optional_builders = [ |
| 23 'mac_chromium_10.6_rel_ng', | 23 'mac_chromium_10.6_rel_ng', |
| 24 'mac_chromium_asan_rel_ng', | 24 'mac_chromium_asan_rel_ng', |
| 25 'mac_chromium_compile_rel_ng', | 25 'mac_chromium_compile_rel_ng', |
| 26 'mac_chromium_dbg_ng', | 26 'mac_chromium_dbg_ng', |
| 27 'mac_deterministic', |
| 27 'mac_nacl_sdk', | 28 'mac_nacl_sdk', |
| 28 'mac_nacl_sdk_build', | 29 'mac_nacl_sdk_build', |
| 29 ] | 30 ] |
| 30 | 31 |
| 31 out = [] | 32 out = [] |
| 32 out.extend( | 33 out.extend( |
| 33 { | 34 { |
| 34 'master': 'TryServerChromiumMac', | 35 'master': 'TryServerChromiumMac', |
| 35 'builder': cq_builders, | 36 'builder': cq_builders, |
| 36 'hostname': slave, | 37 'hostname': slave, |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 } for i in range(79, 82) + range(83, 99) # Skip 82. http://crbug.com/395099. | 80 } for i in range(79, 82) + range(83, 99) # Skip 82. http://crbug.com/395099. |
| 80 ] | 81 ] |
| 81 | 82 |
| 82 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 83 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 83 # the bots. | 84 # the bots. |
| 84 | 85 |
| 85 return compile_slaves | 86 return compile_slaves |
| 86 | 87 |
| 87 | 88 |
| 88 slaves = mac() + ios() | 89 slaves = mac() + ios() |
| OLD | NEW |