| 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 = ( |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 'mac_nacl_sdk_build', | 27 'mac_nacl_sdk_build', |
| 28 ] | 28 ] |
| 29 | 29 |
| 30 optional2_slaves = ['vm%d-m4' % i for i in [1025, 1026]] | 30 optional2_slaves = ['vm%d-m4' % i for i in [1025, 1026]] |
| 31 optional2_builders = [ | 31 optional2_builders = [ |
| 32 'mac_chromium_10.6_rel_ng', | 32 'mac_chromium_10.6_rel_ng', |
| 33 'mac_chromium_archive_rel_ng', | 33 'mac_chromium_archive_rel_ng', |
| 34 'mac_chromium_asan_rel_ng', | 34 'mac_chromium_asan_rel_ng', |
| 35 'mac_chromium_compile_rel_ng', | 35 'mac_chromium_compile_rel_ng', |
| 36 'mac_deterministic', | 36 'mac_deterministic', |
| 37 'mac_chromium_variable', |
| 37 ] | 38 ] |
| 38 | 39 |
| 39 out = [] | 40 out = [] |
| 40 out.extend( | 41 out.extend( |
| 41 { | 42 { |
| 42 'master': 'TryServerChromiumMac', | 43 'master': 'TryServerChromiumMac', |
| 43 'builder': cq_builders, | 44 'builder': cq_builders, |
| 44 'preferred_builder': cq_builders[i % len(cq_builders)], | 45 'preferred_builder': cq_builders[i % len(cq_builders)], |
| 45 'hostname': slave, | 46 'hostname': slave, |
| 46 'os': 'mac', | 47 'os': 'mac', |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 } | 132 } |
| 132 ] | 133 ] |
| 133 | 134 |
| 134 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 135 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 135 # the bots. | 136 # the bots. |
| 136 | 137 |
| 137 return compile_slaves | 138 return compile_slaves |
| 138 | 139 |
| 139 | 140 |
| 140 slaves = mac() + ios() | 141 slaves = mac() + ios() |
| OLD | NEW |