| 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 27 matching lines...) Expand all Loading... |
| 38 optional2b_slaves = ['vm782-m4'] | 38 optional2b_slaves = ['vm782-m4'] |
| 39 optional2b_builders = [ | 39 optional2b_builders = [ |
| 40 'mac_chromium_variable', | 40 'mac_chromium_variable', |
| 41 'mac_chromium_variable_archive', | 41 'mac_chromium_variable_archive', |
| 42 ] | 42 ] |
| 43 | 43 |
| 44 # When adding builders here, make sure there is a maximum of 3 different | 44 # When adding builders here, make sure there is a maximum of 3 different |
| 45 # values for slavebuilddir. Otherwise we'll run out of disk space. | 45 # values for slavebuilddir. Otherwise we'll run out of disk space. |
| 46 optional3_slaves = ['build190-m4', 'vm1026-m4', 'vm117-m4'] | 46 optional3_slaves = ['build190-m4', 'vm1026-m4', 'vm117-m4'] |
| 47 optional3_builders = [ | 47 optional3_builders = [ |
| 48 'mac_chromium_variable_10.10', | |
| 49 'mac_chromium_variable_10.10_layout', | |
| 50 'mac_chromium_archive_rel_ng', | 48 'mac_chromium_archive_rel_ng', |
| 51 'mac_chromium_asan_rel_ng', | 49 'mac_chromium_asan_rel_ng', |
| 52 'mac_chromium_asan_variable', | 50 'mac_chromium_asan_variable', |
| 53 'mac_chromium_variable_chrome', | 51 'mac_chromium_variable_chrome', |
| 54 'mac_chromium_variable_gn', | 52 'mac_chromium_variable_gn', |
| 55 'mac_chromium_variable_layout', | 53 'mac_chromium_variable_layout', |
| 56 ] | 54 ] |
| 57 | 55 |
| 56 # Highend physical mac pro running OSX 10.10. |
| 57 optional3_slaves_highend = ['build554-m4'] |
| 58 optional3_builders_highend = [ |
| 59 'mac_chromium_variable_10.10', |
| 60 'mac_chromium_variable_10.10_layout', |
| 61 ] |
| 62 |
| 58 # Mac 10.11. | 63 # Mac 10.11. |
| 59 optional4_slaves = ['build417-m4'] | 64 optional4_slaves = ['build417-m4'] |
| 60 optional4_builders = [ | 65 optional4_builders = [ |
| 61 'mac_chromium_variable_10.11', | 66 'mac_chromium_variable_10.11', |
| 62 'mac_chromium_variable_10.11_layout', | 67 'mac_chromium_variable_10.11_layout', |
| 63 ] | 68 ] |
| 64 | 69 |
| 65 out = [] | 70 out = [] |
| 66 out.extend( | 71 out.extend( |
| 67 { | 72 { |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 'hostname': slave, | 154 'hostname': slave, |
| 150 'os': 'mac', | 155 'os': 'mac', |
| 151 'version': '10.10', | 156 'version': '10.10', |
| 152 'bits': '64', | 157 'bits': '64', |
| 153 'pool': 'mac_optional_10_10', | 158 'pool': 'mac_optional_10_10', |
| 154 } for slave in optional3_slaves | 159 } for slave in optional3_slaves |
| 155 ) | 160 ) |
| 156 out.extend( | 161 out.extend( |
| 157 { | 162 { |
| 158 'master': 'TryServerChromiumMac', | 163 'master': 'TryServerChromiumMac', |
| 164 'builder': optional3_builders_highend, |
| 165 'hostname': slave, |
| 166 'os': 'mac', |
| 167 'version': '10.10', |
| 168 'bits': '64', |
| 169 'pool': 'mac_optional_10_10_highend', |
| 170 } for slave in optional3_slaves_highend |
| 171 ) |
| 172 out.extend( |
| 173 { |
| 174 'master': 'TryServerChromiumMac', |
| 159 'builder': optional4_builders, | 175 'builder': optional4_builders, |
| 160 'hostname': slave, | 176 'hostname': slave, |
| 161 'os': 'mac', | 177 'os': 'mac', |
| 162 'version': '10.11', | 178 'version': '10.11', |
| 163 'bits': '64', | 179 'bits': '64', |
| 164 'pool': 'mac_optional_10_11', | 180 'pool': 'mac_optional_10_11', |
| 165 } for slave in optional4_slaves | 181 } for slave in optional4_slaves |
| 166 ) | 182 ) |
| 167 | 183 |
| 168 return out | 184 return out |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 'hostname': 'vm255-m4', | 242 'hostname': 'vm255-m4', |
| 227 'os': 'mac', | 243 'os': 'mac', |
| 228 'version': '10.10', | 244 'version': '10.10', |
| 229 }, | 245 }, |
| 230 ] | 246 ] |
| 231 | 247 |
| 232 return compile_slaves_dbg + compile_slaves_rel + extra_builders | 248 return compile_slaves_dbg + compile_slaves_rel + extra_builders |
| 233 | 249 |
| 234 | 250 |
| 235 slaves = mac() + ios() | 251 slaves = mac() + ios() |
| OLD | NEW |