| 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 linux(): | 9 def linux(): |
| 10 linux_arm_testers = [9] | 10 linux_arm_testers = [9] |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 'linux_chromium_chromeos_compile_rel_ng', | 44 'linux_chromium_chromeos_compile_rel_ng', |
| 45 'linux_chromium_chromeos_dbg_ng', | 45 'linux_chromium_chromeos_dbg_ng', |
| 46 'linux_chromium_chromeos_msan_rel_ng', | 46 'linux_chromium_chromeos_msan_rel_ng', |
| 47 'linux_chromium_chromeos_ozone_dbg_ng', | 47 'linux_chromium_chromeos_ozone_dbg_ng', |
| 48 'linux_chromium_compile_rel_ng', | 48 'linux_chromium_compile_rel_ng', |
| 49 'linux_chromium_dbg_ng', | 49 'linux_chromium_dbg_ng', |
| 50 'linux_chromium_gn_upload', | 50 'linux_chromium_gn_upload', |
| 51 'linux_chromium_msan_rel_ng', | 51 'linux_chromium_msan_rel_ng', |
| 52 'linux_chromium_tsan_rel_ng', | 52 'linux_chromium_tsan_rel_ng', |
| 53 'linux_chromium_practice_rel_ng', | 53 'linux_chromium_practice_rel_ng', |
| 54 'linux_deterministic', |
| 54 'linux_ecs_ozone', | 55 'linux_ecs_ozone', |
| 55 'linux_nacl_sdk', | 56 'linux_nacl_sdk', |
| 56 'linux_nacl_sdk_bionic', | 57 'linux_nacl_sdk_bionic', |
| 57 'linux_nacl_sdk_bionic_build', | 58 'linux_nacl_sdk_bionic_build', |
| 58 'linux_nacl_sdk_build', | 59 'linux_nacl_sdk_build', |
| 59 'linux_site_isolation', | 60 'linux_site_isolation', |
| 60 ] | 61 ] |
| 61 | 62 |
| 62 # Set up normal slaves. | 63 # Set up normal slaves. |
| 63 result = [] | 64 result = [] |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 'os': 'linux', | 180 'os': 'linux', |
| 180 'version': 'precise', | 181 'version': 'precise', |
| 181 'bits': '64', | 182 'bits': '64', |
| 182 } for i in range(101,139+1) | 183 } for i in range(101,139+1) |
| 183 ] | 184 ] |
| 184 | 185 |
| 185 test_optional_slaves = [ | 186 test_optional_slaves = [ |
| 186 { | 187 { |
| 187 'master': 'TryServerChromiumLinux', | 188 'master': 'TryServerChromiumLinux', |
| 188 'builder': [ | 189 'builder': [ |
| 190 'android_deterministic', |
| 189 'linux_android_dbg_ng', | 191 'linux_android_dbg_ng', |
| 190 ], | 192 ], |
| 191 'hostname': 'build%d-a4' % i, | 193 'hostname': 'build%d-a4' % i, |
| 192 'os': 'linux', | 194 'os': 'linux', |
| 193 'version': 'precise', | 195 'version': 'precise', |
| 194 'bits': '64', | 196 'bits': '64', |
| 195 } for i in [100] | 197 } for i in [100] |
| 196 ] | 198 ] |
| 197 | 199 |
| 198 amp_slaves = [ | 200 amp_slaves = [ |
| 199 { | 201 { |
| 200 'master': 'TryServerChromiumLinux', | 202 'master': 'TryServerChromiumLinux', |
| 201 'builder': 'android_amp_rel_tests_recipe', | 203 'builder': 'android_amp_rel_tests_recipe', |
| 202 'hostname': 'build%d-a4' % i, | 204 'hostname': 'build%d-a4' % i, |
| 203 'os': 'linux', | 205 'os': 'linux', |
| 204 'version': 'precise', | 206 'version': 'precise', |
| 205 'bits': '64', | 207 'bits': '64', |
| 206 } for i in range(225,229+1) | 208 } for i in range(225,229+1) |
| 207 ] | 209 ] |
| 208 | 210 |
| 209 return compile_slaves + test_cq_slaves + test_optional_slaves + amp_slaves | 211 return compile_slaves + test_cq_slaves + test_optional_slaves + amp_slaves |
| 210 | 212 |
| 211 | 213 |
| 212 slaves = linux() + android() | 214 slaves = linux() + android() |
| OLD | NEW |