| 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 ([213, 256, 257, 258, 902, 903, 1000] + | 11 ['vm%d-m4' % i for i in ([213, 256, 257, 258, 902, 903, 1000] + |
| 12 range(277, 300) + range(552, 555) + | 12 range(277, 300) + range(552, 555) + |
| 13 range(682, 711) + range(860, 870) + | 13 range(682, 711) + range(860, 870) + |
| 14 range(969, 987)) + range(783, 788)]) | 14 range(969, 987)) + range(783, 788)]) |
| 15 cq_builders = [ | 15 cq_builders = [ |
| 16 'mac_chromium_compile_dbg_ng', | 16 'mac_chromium_compile_dbg_ng', |
| 17 'mac_chromium_gyp_rel', | |
| 18 'mac_chromium_rel_ng', | 17 'mac_chromium_rel_ng', |
| 19 ] | 18 ] |
| 20 | 19 |
| 21 optional0_slaves = ['vm%d-m4' % i for i in [713, 645, 646, 647, 648]] | 20 optional0_slaves = ['vm%d-m4' % i for i in [713, 645, 646, 647, 648]] |
| 22 optional0_builders = [ | 21 optional0_builders = [ |
| 23 'mac_chromium_dbg_ng', | 22 'mac_chromium_dbg_ng', |
| 24 'mac_chromium_gyp_dbg', | |
| 25 'mac_chromium_gn_upload', | 23 'mac_chromium_gn_upload', |
| 26 'mac_upload_clang', | 24 'mac_upload_clang', |
| 27 'mac_optional_gpu_tests_rel', | 25 'mac_optional_gpu_tests_rel', |
| 28 ] | 26 ] |
| 29 | 27 |
| 30 optional1_slaves = ['vm723-m4'] | 28 optional1_slaves = ['vm723-m4'] |
| 31 optional1_builders = [ | 29 optional1_builders = [ |
| 32 'mac_nacl_sdk', | 30 'mac_nacl_sdk', |
| 33 'mac_nacl_sdk_build', | 31 'mac_nacl_sdk_build', |
| 34 ] | 32 ] |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 } for slave in optional4_slaves | 165 } for slave in optional4_slaves |
| 168 ) | 166 ) |
| 169 | 167 |
| 170 return out | 168 return out |
| 171 | 169 |
| 172 | 170 |
| 173 def ios(): | 171 def ios(): |
| 174 # Split by simulator/device because it splits the load evenly. | 172 # Split by simulator/device because it splits the load evenly. |
| 175 cq_builders_dbg = [ | 173 cq_builders_dbg = [ |
| 176 'ios-simulator', | 174 'ios-simulator', |
| 177 'ios-simulator-gn', | |
| 178 ] | 175 ] |
| 179 cq_builders_rel = [ | 176 cq_builders_rel = [ |
| 180 'ios-device', | 177 'ios-device', |
| 181 'ios-device-gn', | |
| 182 ] | 178 ] |
| 183 | 179 |
| 184 # 12 + 1 builders for dbg | 180 # 12 + 1 builders for dbg |
| 185 cq_slaves_dbg = ( | 181 cq_slaves_dbg = ( |
| 186 ['build%d-m4' % i for i in ([21] + range(418, 426) + range(456, 460))]) | 182 ['build%d-m4' % i for i in ([21] + range(418, 426) + range(456, 460))]) |
| 187 # 7 + 1 builders for rel | 183 # 7 + 1 builders for rel |
| 188 cq_slaves_rel = (['build%d-m4' % i for i in ( | 184 cq_slaves_rel = (['build%d-m4' % i for i in ( |
| 189 [73] + range(460, 466) + [496, 497, 540, 541, 542])]) | 185 [73] + range(460, 466) + [496, 497, 540, 541, 542])]) |
| 190 | 186 |
| 191 # 12 slaves each | 187 # 12 slaves each |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 'hostname': 'vm255-m4', | 226 'hostname': 'vm255-m4', |
| 231 'os': 'mac', | 227 'os': 'mac', |
| 232 'version': '10.10', | 228 'version': '10.10', |
| 233 }, | 229 }, |
| 234 ] | 230 ] |
| 235 | 231 |
| 236 return compile_slaves_dbg + compile_slaves_rel + extra_builders | 232 return compile_slaves_dbg + compile_slaves_rel + extra_builders |
| 237 | 233 |
| 238 | 234 |
| 239 slaves = mac() + ios() | 235 slaves = mac() + ios() |
| OLD | NEW |