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 linux(): | 10 def linux(): |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 'version': 'lucid', | 150 'version': 'lucid', |
151 'bits': '64', | 151 'bits': '64', |
152 } for i in (2, 4, 5, 6) | 152 } for i in (2, 4, 5, 6) |
153 ] | 153 ] |
154 | 154 |
155 | 155 |
156 def android(): | 156 def android(): |
157 compile_slaves = [ | 157 compile_slaves = [ |
158 { | 158 { |
159 'master': 'TryServer', | 159 'master': 'TryServer', |
160 'builder': ['android'], | 160 'builder': ['android', 'android_builder'], |
161 'hostname': 'vm%d-m4' % i, | 161 'hostname': 'vm%d-m4' % i, |
162 'os': 'linux', | 162 'os': 'linux', |
163 'version': 'lucid', | 163 'version': 'lucid', |
164 'bits': '64', | 164 'bits': '64', |
165 } for i in range(430, 468) | 165 } for i in range(430, 468) |
166 ] | 166 ] |
167 | 167 |
168 test_slaves = [ | 168 test_slaves = [ |
169 { | 169 { |
170 'master': 'TryServer', | 170 'master': 'TryServer', |
171 'builder': ['android_test'], | 171 'builder': ['android_test', 'android_tester'], |
172 'hostname': 'chromeperf%d' % i, | 172 'hostname': 'chromeperf%d' % i, |
173 'os': 'linux', | 173 'os': 'linux', |
174 'version': 'lucid', | 174 'version': 'lucid', |
175 'bits': '64', | 175 'bits': '64', |
176 } for i in (23, 26, 27, 28, 29) | 176 } for i in (23, 24, 26, 27, 28, 29, 44, 45, 46) |
177 ] | 177 ] |
178 | 178 |
179 return compile_slaves + test_slaves | 179 return compile_slaves + test_slaves |
180 | 180 |
181 | 181 |
182 def windows(): | 182 def windows(): |
183 # One of these builders set is seletected in alternance as an extra builder. | 183 # One of these builders set is seletected in alternance as an extra builder. |
184 extras = [ | 184 extras = [ |
185 ['win_vs2010', 'win_vs2010_rel'], | 185 ['win_vs2010', 'win_vs2010_rel'], |
186 ['win_ash'], | 186 ['win_ash'], |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 ] | 237 ] |
238 | 238 |
239 return ( | 239 return ( |
240 normal_slaves + | 240 normal_slaves + |
241 drmemory_slaves + | 241 drmemory_slaves + |
242 chromeframe_slave + | 242 chromeframe_slave + |
243 gpu_slaves) | 243 gpu_slaves) |
244 | 244 |
245 | 245 |
246 slaves = linux() + mac() + windows() + cros() + android() | 246 slaves = linux() + mac() + windows() + cros() + android() |
OLD | NEW |