| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 { | 76 { |
| 77 'master': 'TryServerChromiumLinux', | 77 'master': 'TryServerChromiumLinux', |
| 78 'os': 'linux', | 78 'os': 'linux', |
| 79 'version': 'precise', | 79 'version': 'precise', |
| 80 'bits': '64', | 80 'bits': '64', |
| 81 'builder': 'linux_clang_tsan', | 81 'builder': 'linux_clang_tsan', |
| 82 'hostname': 'slave496-c4', | 82 'hostname': 'slave496-c4', |
| 83 } | 83 } |
| 84 ) | 84 ) |
| 85 | 85 |
| 86 result.append( |
| 87 { |
| 88 'master': 'TryServerChromiumLinux', |
| 89 'os': 'linux', |
| 90 'version': 'precise', |
| 91 'bits': '64', |
| 92 'builder': 'linux_site_isolation', |
| 93 'hostname': 'slave568-c4', |
| 94 } |
| 95 ) |
| 96 |
| 86 result.extend( | 97 result.extend( |
| 87 { | 98 { |
| 88 'master': 'TryServerChromiumLinux', | 99 'master': 'TryServerChromiumLinux', |
| 89 'os': 'linux', | 100 'os': 'linux', |
| 90 'version': 'quantal', | 101 'version': 'quantal', |
| 91 'bits': '32', | 102 'bits': '32', |
| 92 'builder': 'linux_arm_tester', | 103 'builder': 'linux_arm_tester', |
| 93 'hostname': 'build%d-a4' % i, | 104 'hostname': 'build%d-a4' % i, |
| 94 } for i in linux_arm_testers | 105 } for i in linux_arm_testers |
| 95 ) | 106 ) |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 'os': 'linux', | 194 'os': 'linux', |
| 184 'version': 'precise', | 195 'version': 'precise', |
| 185 'bits': '64', | 196 'bits': '64', |
| 186 } for i in range(520, 540) | 197 } for i in range(520, 540) |
| 187 ] | 198 ] |
| 188 | 199 |
| 189 return compile_slaves + test_slaves + aosp_slaves | 200 return compile_slaves + test_slaves + aosp_slaves |
| 190 | 201 |
| 191 | 202 |
| 192 slaves = linux() + android() | 203 slaves = linux() + android() |
| OLD | NEW |