Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 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 | 9 |
| 10 def expand_extra_builders(extras, total): | 10 def expand_extra_builders(extras, total): |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 return extras_expanded | 24 return extras_expanded |
| 25 | 25 |
| 26 | 26 |
| 27 def mac(): | 27 def mac(): |
| 28 all_old_slaves = [600] | 28 all_old_slaves = [600] |
| 29 out = [ | 29 out = [ |
| 30 # vms. | 30 # vms. |
| 31 { | 31 { |
| 32 'master': 'TryServerChromiumMac', | 32 'master': 'TryServerChromiumMac', |
| 33 'builder': [ | 33 'builder': [ |
| 34 'mac_xcodebuild', | |
| 35 'mac_nacl_sdk' | 34 'mac_nacl_sdk' |
| 36 ], | 35 ], |
| 37 'hostname': 'vm%d-m4' % number, | 36 'hostname': 'vm%d-m4' % number, |
| 38 'os': 'mac', | 37 'os': 'mac', |
| 39 'version': '10.6', | 38 'version': '10.6', |
| 40 'bits': '64', | 39 'bits': '64', |
| 41 } for index, number in enumerate(all_old_slaves) | 40 } for index, number in enumerate(all_old_slaves) |
| 42 ] | 41 ] |
| 43 out.extend( | 42 out.extend( |
| 44 { | 43 { |
| 45 'master': 'TryServerChromiumMac', | 44 'master': 'TryServerChromiumMac', |
| 46 'builder': [ | 45 'builder': [ |
| 47 'mac_chromium_compile_dbg', | 46 'mac_chromium_compile_dbg', |
| 48 'mac_chromium_compile_dbg_ng', | 47 'mac_chromium_compile_dbg_ng', |
| 49 'mac_chromium_compile_rel', | 48 'mac_chromium_compile_rel', |
| 50 'mac_chromium_dbg', | 49 'mac_chromium_dbg', |
| 51 'mac_chromium_rel', | 50 'mac_chromium_rel', |
| 52 'mac_chromium_rel_ng', | 51 'mac_chromium_rel_ng', |
| 53 'mac_rel_naclmore', | |
| 54 'mac_chromium_gn_dbg', | 52 'mac_chromium_gn_dbg', |
| 55 'mac_chromium_gn_rel', | 53 'mac_chromium_gn_rel', |
| 56 ], | 54 ], |
| 57 'hostname': 'vm%d-m4' % i, | 55 'hostname': 'vm%d-m4' % i, |
| 58 'os': 'mac', | 56 'os': 'mac', |
| 59 'version': '10.8', | 57 'version': '10.8', |
| 60 'bits': '64', | 58 'bits': '64', |
| 61 } for i in range(682, 711) + range(712, 714) | 59 } for i in range(682, 711) + range(712, 714) |
| 62 ) | 60 ) |
| 63 out.extend( | 61 out.extend( |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 145 { | 143 { |
| 146 'master': 'TryServerChromiumMac', | 144 'master': 'TryServerChromiumMac', |
| 147 'os': 'mac', | 145 'os': 'mac', |
| 148 'version': '10.8', | 146 'version': '10.8', |
| 149 'bits': '64', | 147 'bits': '64', |
| 150 'builder': 'mac_x64_rel', | 148 'builder': 'mac_x64_rel', |
| 151 'hostname': 'vm%d-m4' % i, | 149 'hostname': 'vm%d-m4' % i, |
| 152 } for i in [800] | 150 } for i in [800] |
| 153 ) | 151 ) |
| 154 | 152 |
| 155 out.extend( | |
| 156 # mac_valgrind - mac minis | |
| 157 { | |
| 158 'master': 'TryServerChromiumMac', | |
| 159 'os': 'mac', | |
| 160 'version': '10.7', | |
| 161 'bits': '64', | |
| 162 'builder': 'mac_valgrind', | |
| 163 'hostname': 'mini%d-m4' % i, | |
| 164 } for i in range(84, 90) | |
|
Sergiy Byelozyorov
2014/11/25 15:33:44
Please compile a list of all slaves that are freed
Paweł Hajdan Jr.
2014/11/25 16:16:36
Yes, I'm keeping track of this in a doc, will batc
| |
| 165 ) | |
| 166 | |
| 167 out.extend([ | |
| 168 { | |
| 169 'master': 'TryServerChromiumMac', | |
| 170 'os': 'mac', | |
| 171 'version': '10.8', | |
| 172 'bits': '64', | |
| 173 'builder': ['mac_chromium_openssl_dbg', 'mac_chromium_openssl_rel'], | |
| 174 'hostname': 'vm%d-m4' % i, | |
| 175 } for i in [803] | |
| 176 ]) | |
| 177 | |
| 178 return out | 153 return out |
| 179 | 154 |
| 180 | 155 |
| 181 def ios(): | 156 def ios(): |
| 182 compile_slaves = [ | 157 compile_slaves = [ |
| 183 { | 158 { |
| 184 'master': 'TryServerChromiumMac', | 159 'master': 'TryServerChromiumMac', |
| 185 'builder': [ | 160 'builder': [ |
| 186 'ios_rel_device', 'ios_dbg_simulator', 'ios_rel_device_ninja'], | 161 'ios_rel_device', 'ios_dbg_simulator', 'ios_rel_device_ninja'], |
| 187 'hostname': 'build%d-a4' % i, | 162 'hostname': 'build%d-a4' % i, |
| 188 'os': 'mac', | 163 'os': 'mac', |
| 189 'version': '10.8', | 164 'version': '10.8', |
| 190 } for i in range(79, 82) + range(83, 99) # Skip 82. http://crbug.com/395099. | 165 } for i in range(79, 82) + range(83, 99) # Skip 82. http://crbug.com/395099. |
| 191 ] | 166 ] |
| 192 | 167 |
| 193 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 168 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 194 # the bots. | 169 # the bots. |
| 195 | 170 |
| 196 return compile_slaves | 171 return compile_slaves |
| 197 | 172 |
| 198 | 173 |
| 199 slaves = mac() + ios() | 174 slaves = mac() + ios() |
| OLD | NEW |