| 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 15 matching lines...) Expand all Loading... |
| 26 'mac_upload_clang', | 26 'mac_upload_clang', |
| 27 'mac_optional_gpu_tests_rel', | 27 'mac_optional_gpu_tests_rel', |
| 28 ] | 28 ] |
| 29 | 29 |
| 30 optional1_slaves = ['vm723-m4'] | 30 optional1_slaves = ['vm723-m4'] |
| 31 optional1_builders = [ | 31 optional1_builders = [ |
| 32 'mac_nacl_sdk', | 32 'mac_nacl_sdk', |
| 33 'mac_nacl_sdk_build', | 33 'mac_nacl_sdk_build', |
| 34 ] | 34 ] |
| 35 | 35 |
| 36 optional2_slaves = ['vm1025-m4'] | 36 optional2a_slaves = ['vm1025-m4'] |
| 37 optional2_builders = [ | 37 optional2a_builders = [ |
| 38 'mac_chromium_compile_rel_ng', | 38 'mac_chromium_compile_rel_ng', |
| 39 ] |
| 40 optional2b_slaves = ['vm782-m4'] |
| 41 optional2b_builders = [ |
| 39 'mac_chromium_variable', | 42 'mac_chromium_variable', |
| 40 'mac_chromium_variable_archive', | 43 'mac_chromium_variable_archive', |
| 41 ] | 44 ] |
| 42 | 45 |
| 43 # When adding builders here, make sure there is a maximum of 3 different | 46 # When adding builders here, make sure there is a maximum of 3 different |
| 44 # values for slavebuilddir. Otherwise we'll run out of disk space. | 47 # values for slavebuilddir. Otherwise we'll run out of disk space. |
| 45 optional3_slaves = ['build190-m4', 'vm1026-m4', 'vm117-m4'] | 48 optional3_slaves = ['build190-m4', 'vm1026-m4', 'vm117-m4'] |
| 46 optional3_builders = [ | 49 optional3_builders = [ |
| 47 'mac_chromium_variable_10.10', | 50 'mac_chromium_variable_10.10', |
| 48 'mac_chromium_variable_10.10_layout', | 51 'mac_chromium_variable_10.10_layout', |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 'hostname': slave, | 95 'hostname': slave, |
| 93 'os': 'mac', | 96 'os': 'mac', |
| 94 'version': '10.9', | 97 'version': '10.9', |
| 95 'bits': '64', | 98 'bits': '64', |
| 96 'pool': 'mac_optional1_dbg', | 99 'pool': 'mac_optional1_dbg', |
| 97 } for slave in optional1_slaves | 100 } for slave in optional1_slaves |
| 98 ) | 101 ) |
| 99 out.extend( | 102 out.extend( |
| 100 { | 103 { |
| 101 'master': 'TryServerChromiumMac', | 104 'master': 'TryServerChromiumMac', |
| 102 'builder': optional2_builders, | 105 'builder': optional2a_builders, |
| 103 'hostname': slave, | 106 'hostname': slave, |
| 104 'os': 'mac', | 107 'os': 'mac', |
| 105 'version': '10.9', | 108 'version': '10.9', |
| 106 'bits': '64', | 109 'bits': '64', |
| 107 'pool': 'mac_optional_rel', | 110 'pool': 'mac_optional_rel', |
| 108 } for slave in optional2_slaves | 111 } for slave in optional2a_slaves |
| 109 ) | 112 ) |
| 110 out.extend( | 113 out.extend( |
| 111 { | 114 { |
| 115 'master': 'TryServerChromiumMac', |
| 116 'builder': optional2b_builders, |
| 117 'hostname': slave, |
| 118 'os': 'mac', |
| 119 'version': '10.9', |
| 120 'bits': '64', |
| 121 'pool': 'mac_optional_rel', |
| 122 } for slave in optional2b_slaves |
| 123 ) |
| 124 out.extend( |
| 125 { |
| 112 'master': 'TryServerChromiumMac', | 126 'master': 'TryServerChromiumMac', |
| 113 'builder': ['mac_chromium_10.10_rel_ng'], | 127 'builder': ['mac_chromium_10.10_rel_ng'], |
| 114 'hostname': slave, | 128 'hostname': slave, |
| 115 'os': 'mac', | 129 'os': 'mac', |
| 116 'version': '10.10', | 130 'version': '10.10', |
| 117 'bits': '64', | 131 'bits': '64', |
| 118 'pool': 'mac_10_10', | 132 'pool': 'mac_10_10', |
| 119 } for slave in ['build%d-m4' % i for i in xrange(158, 167)] + | 133 } for slave in ['build%d-m4' % i for i in xrange(158, 167)] + |
| 120 ['build%d-m4' % i for i in xrange(179, 189)] | 134 ['build%d-m4' % i for i in xrange(179, 189)] |
| 121 ) | 135 ) |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 'pool': 'ios_cq_rel', | 216 'pool': 'ios_cq_rel', |
| 203 } for slave in cq_slaves_rel] | 217 } for slave in cq_slaves_rel] |
| 204 | 218 |
| 205 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 219 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 206 # the bots. | 220 # the bots. |
| 207 | 221 |
| 208 return compile_slaves_dbg + compile_slaves_rel | 222 return compile_slaves_dbg + compile_slaves_rel |
| 209 | 223 |
| 210 | 224 |
| 211 slaves = mac() + ios() | 225 slaves = mac() + ios() |
| OLD | NEW |