| 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 26 matching lines...) Expand all Loading... |
| 37 optional2_builders = [ | 37 optional2_builders = [ |
| 38 'mac_chromium_archive_rel_ng', | 38 'mac_chromium_archive_rel_ng', |
| 39 'mac_chromium_asan_rel_ng', | 39 'mac_chromium_asan_rel_ng', |
| 40 'mac_chromium_compile_rel_ng', | 40 'mac_chromium_compile_rel_ng', |
| 41 'mac_deterministic', | 41 'mac_deterministic', |
| 42 'mac_chromium_asan_variable', | 42 'mac_chromium_asan_variable', |
| 43 'mac_chromium_variable', | 43 'mac_chromium_variable', |
| 44 'mac_chromium_variable_archive', | 44 'mac_chromium_variable_archive', |
| 45 'mac_chromium_variable_chrome', | 45 'mac_chromium_variable_chrome', |
| 46 'mac_chromium_variable_gn', | 46 'mac_chromium_variable_gn', |
| 47 'mac_chromium_variable_layout', |
| 47 ] | 48 ] |
| 48 | 49 |
| 50 optional3_builders = [ |
| 51 'mac_chromium_variable_10.10', |
| 52 'mac_chromium_variable_10.10_layout', |
| 53 ] |
| 54 |
| 55 optional3_slaves = ['build%d-m4' % i for i in [190]] |
| 56 |
| 49 out = [] | 57 out = [] |
| 50 out.extend( | 58 out.extend( |
| 51 { | 59 { |
| 52 'master': 'TryServerChromiumMac', | 60 'master': 'TryServerChromiumMac', |
| 53 'builder': cq_builders, | 61 'builder': cq_builders, |
| 54 'preferred_builder': cq_builders[i % len(cq_builders)], | 62 'preferred_builder': cq_builders[i % len(cq_builders)], |
| 55 'hostname': slave, | 63 'hostname': slave, |
| 56 'os': 'mac', | 64 'os': 'mac', |
| 57 'version': '10.9', | 65 'version': '10.9', |
| 58 'bits': '64', | 66 'bits': '64', |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 out.extend( | 103 out.extend( |
| 96 { | 104 { |
| 97 'master': 'TryServerChromiumMac', | 105 'master': 'TryServerChromiumMac', |
| 98 'builder': ['mac_chromium_10.10_rel_ng'], | 106 'builder': ['mac_chromium_10.10_rel_ng'], |
| 99 'hostname': slave, | 107 'hostname': slave, |
| 100 'os': 'mac', | 108 'os': 'mac', |
| 101 'version': '10.10', | 109 'version': '10.10', |
| 102 'bits': '64', | 110 'bits': '64', |
| 103 'pool': 'mac_10_10', | 111 'pool': 'mac_10_10', |
| 104 } for slave in ['build%d-m4' % i for i in xrange(158, 167)] + | 112 } for slave in ['build%d-m4' % i for i in xrange(158, 167)] + |
| 105 ['build%d-m4' % i for i in xrange(179, 190)] | 113 ['build%d-m4' % i for i in xrange(179, 189)] |
| 114 ) |
| 115 out.extend( |
| 116 { |
| 117 'master': 'TryServerChromiumMac', |
| 118 'builder': optional3_builders, |
| 119 'hostname': slave, |
| 120 'os': 'mac', |
| 121 'version': '10.10', |
| 122 'bits': '64', |
| 123 'pool': 'mac_optional_10_10', |
| 124 } for slave in optional3_slaves |
| 106 ) | 125 ) |
| 107 | 126 |
| 108 return out | 127 return out |
| 109 | 128 |
| 110 | 129 |
| 111 def ios(): | 130 def ios(): |
| 112 # Split by dbg/rel because it splits the load evenly. | 131 # Split by dbg/rel because it splits the load evenly. |
| 113 cq_builders_dbg = [ | 132 cq_builders_dbg = [ |
| 114 'ios_dbg_simulator', | 133 'ios_dbg_simulator', |
| 115 'ios_dbg_simulator_gn', | 134 'ios_dbg_simulator_gn', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 'pool': 'ios_cq_rel', | 176 'pool': 'ios_cq_rel', |
| 158 } for slave in cq_slaves_rel] | 177 } for slave in cq_slaves_rel] |
| 159 | 178 |
| 160 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on | 179 # TODO(lliabraa): Add test_slaves once we're actually running iOS tests on |
| 161 # the bots. | 180 # the bots. |
| 162 | 181 |
| 163 return compile_slaves_dbg + compile_slaves_rel | 182 return compile_slaves_dbg + compile_slaves_rel |
| 164 | 183 |
| 165 | 184 |
| 166 slaves = mac() + ios() | 185 slaves = mac() + ios() |
| OLD | NEW |