| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 'mac_chromium_variable_10.10', | 47 'mac_chromium_variable_10.10', |
| 48 'mac_chromium_variable_10.10_layout', | 48 'mac_chromium_variable_10.10_layout', |
| 49 'mac_chromium_archive_rel_ng', | 49 'mac_chromium_archive_rel_ng', |
| 50 'mac_chromium_asan_rel_ng', | 50 'mac_chromium_asan_rel_ng', |
| 51 'mac_chromium_asan_variable', | 51 'mac_chromium_asan_variable', |
| 52 'mac_chromium_variable_chrome', | 52 'mac_chromium_variable_chrome', |
| 53 'mac_chromium_variable_gn', | 53 'mac_chromium_variable_gn', |
| 54 'mac_chromium_variable_layout', | 54 'mac_chromium_variable_layout', |
| 55 ] | 55 ] |
| 56 | 56 |
| 57 # Mac 10.11. |
| 58 optional4_slaves = ['build417-m4'] |
| 59 optional4_builders = [ |
| 60 'mac_chromium_variable_10.11', |
| 61 'mac_chromium_variable_10.11_layout', |
| 62 ] |
| 63 |
| 57 out = [] | 64 out = [] |
| 58 out.extend( | 65 out.extend( |
| 59 { | 66 { |
| 60 'master': 'TryServerChromiumMac', | 67 'master': 'TryServerChromiumMac', |
| 61 'builder': cq_builders, | 68 'builder': cq_builders, |
| 62 'preferred_builder': cq_builders[i % len(cq_builders)], | 69 'preferred_builder': cq_builders[i % len(cq_builders)], |
| 63 'hostname': slave, | 70 'hostname': slave, |
| 64 'os': 'mac', | 71 'os': 'mac', |
| 65 'version': '10.9', | 72 'version': '10.9', |
| 66 'bits': '64', | 73 'bits': '64', |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 { | 134 { |
| 128 'master': 'TryServerChromiumMac', | 135 'master': 'TryServerChromiumMac', |
| 129 'builder': optional3_builders, | 136 'builder': optional3_builders, |
| 130 'hostname': slave, | 137 'hostname': slave, |
| 131 'os': 'mac', | 138 'os': 'mac', |
| 132 'version': '10.10', | 139 'version': '10.10', |
| 133 'bits': '64', | 140 'bits': '64', |
| 134 'pool': 'mac_optional_10_10', | 141 'pool': 'mac_optional_10_10', |
| 135 } for slave in optional3_slaves | 142 } for slave in optional3_slaves |
| 136 ) | 143 ) |
| 144 out.extend( |
| 145 { |
| 146 'master': 'TryServerChromiumMac', |
| 147 'builder': optional4_builders, |
| 148 'hostname': slave, |
| 149 'os': 'mac', |
| 150 'version': '10.11', |
| 151 'bits': '64', |
| 152 'pool': 'mac_optional_10_11', |
| 153 } for slave in optional4_slaves |
| 154 ) |
| 137 | 155 |
| 138 return out | 156 return out |
| 139 | 157 |
| 140 | 158 |
| 141 def ios(): | 159 def ios(): |
| 142 # Split by simulator/device because it splits the load evenly. | 160 # Split by simulator/device because it splits the load evenly. |
| 143 cq_builders_dbg = [ | 161 cq_builders_dbg = [ |
| 144 'ios-simulator', | 162 'ios-simulator', |
| 145 'ios-simulator-gn', | 163 'ios-simulator-gn', |
| 146 ] | 164 ] |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 'pool': 'ios_cq_rel', | 203 'pool': 'ios_cq_rel', |
| 186 } for slave in cq_slaves_rel] | 204 } for slave in cq_slaves_rel] |
| 187 | 205 |
| 188 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 206 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 189 # the bots. | 207 # the bots. |
| 190 | 208 |
| 191 return compile_slaves_dbg + compile_slaves_rel | 209 return compile_slaves_dbg + compile_slaves_rel |
| 192 | 210 |
| 193 | 211 |
| 194 slaves = mac() + ios() | 212 slaves = mac() + ios() |
| OLD | NEW |