| 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 17 matching lines...) Expand all Loading... |
| 28 'mac_nacl_sdk_build', | 28 'mac_nacl_sdk_build', |
| 29 'mac_optional_gpu_tests_rel', | 29 'mac_optional_gpu_tests_rel', |
| 30 ] | 30 ] |
| 31 | 31 |
| 32 optional2_slaves = ['vm%d-m4' % i for i in [1025, 1026]] | 32 optional2_slaves = ['vm%d-m4' % i for i in [1025, 1026]] |
| 33 optional2_builders = [ | 33 optional2_builders = [ |
| 34 'mac_chromium_archive_rel_ng', | 34 'mac_chromium_archive_rel_ng', |
| 35 'mac_chromium_asan_rel_ng', | 35 'mac_chromium_asan_rel_ng', |
| 36 'mac_chromium_compile_rel_ng', | 36 'mac_chromium_compile_rel_ng', |
| 37 'mac_deterministic', | 37 'mac_deterministic', |
| 38 'mac_chromium_asan_variable', |
| 38 'mac_chromium_variable', | 39 'mac_chromium_variable', |
| 39 'mac_chromium_asan_variable', | 40 'mac_chromium_variable_gn', |
| 40 ] | 41 ] |
| 41 | 42 |
| 42 out = [] | 43 out = [] |
| 43 out.extend( | 44 out.extend( |
| 44 { | 45 { |
| 45 'master': 'TryServerChromiumMac', | 46 'master': 'TryServerChromiumMac', |
| 46 'builder': cq_builders, | 47 'builder': cq_builders, |
| 47 'preferred_builder': cq_builders[i % len(cq_builders)], | 48 'preferred_builder': cq_builders[i % len(cq_builders)], |
| 48 'hostname': slave, | 49 'hostname': slave, |
| 49 'os': 'mac', | 50 'os': 'mac', |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 'pool': 'ios_cq_rel', | 140 'pool': 'ios_cq_rel', |
| 140 } for slave in cq_slaves_rel] | 141 } for slave in cq_slaves_rel] |
| 141 | 142 |
| 142 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 143 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 143 # the bots. | 144 # the bots. |
| 144 | 145 |
| 145 return compile_slaves_dbg + compile_slaves_rel | 146 return compile_slaves_dbg + compile_slaves_rel |
| 146 | 147 |
| 147 | 148 |
| 148 slaves = mac() + ios() | 149 slaves = mac() + ios() |
| OLD | NEW |