| 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 chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy') | 10 chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy') |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 'linux_chromium_variable', | 60 'linux_chromium_variable', |
| 61 'linux_deterministic', | 61 'linux_deterministic', |
| 62 'linux_ecs_ozone', | 62 'linux_ecs_ozone', |
| 63 'linux_nacl_sdk', | 63 'linux_nacl_sdk', |
| 64 'linux_nacl_sdk_build', | 64 'linux_nacl_sdk_build', |
| 65 'linux_optional_gpu_tests_rel', | 65 'linux_optional_gpu_tests_rel', |
| 66 'linux_site_isolation', | 66 'linux_site_isolation', |
| 67 'linux_valgrind', | 67 'linux_valgrind', |
| 68 ] | 68 ] |
| 69 | 69 |
| 70 optional_32_slaves = [897] |
| 71 optional_32_builders = [ |
| 72 'linux_chromium_variable_32', |
| 73 ] |
| 74 |
| 70 # Set up normal slaves. | 75 # Set up normal slaves. |
| 71 result = [] | 76 result = [] |
| 72 for i, slave in enumerate(cq_slaves): | 77 for i, slave in enumerate(cq_slaves): |
| 73 result.append({ | 78 result.append({ |
| 74 'master': 'TryServerChromiumLinux', | 79 'master': 'TryServerChromiumLinux', |
| 75 'os': 'linux', | 80 'os': 'linux', |
| 76 'version': 'precise', | 81 'version': 'precise', |
| 77 'bits': '64', | 82 'bits': '64', |
| 78 'builder': cq_builders, | 83 'builder': cq_builders, |
| 79 'preferred_builder': cq_builders[i % len(cq_builders)], | 84 'preferred_builder': cq_builders[i % len(cq_builders)], |
| (...skipping 14 matching lines...) Expand all Loading... |
| 94 result.append({ | 99 result.append({ |
| 95 'master': 'TryServerChromiumLinux', | 100 'master': 'TryServerChromiumLinux', |
| 96 'os': 'linux', | 101 'os': 'linux', |
| 97 'version': 'precise', | 102 'version': 'precise', |
| 98 'bits': '64', | 103 'bits': '64', |
| 99 'builder': 'linux_chromium_cfi_rel_ng', | 104 'builder': 'linux_chromium_cfi_rel_ng', |
| 100 'hostname': 'slave%d-c4' % slave, # Super beefy machines. | 105 'hostname': 'slave%d-c4' % slave, # Super beefy machines. |
| 101 'pool': 'linux_chromium_cfi_rel_ng', | 106 'pool': 'linux_chromium_cfi_rel_ng', |
| 102 }) | 107 }) |
| 103 | 108 |
| 109 result.extend( |
| 110 { |
| 111 'master': 'TryServerChromiumLinux', |
| 112 'os': 'linux', |
| 113 'version': 'precise', |
| 114 'bits': '32', |
| 115 'builder': optional_32_builders, |
| 116 'hostname': 'vm%d-m4' % i, |
| 117 'pool': 'linux_optional_32', |
| 118 } for i in optional_32_slaves |
| 119 ) |
| 120 |
| 104 linux_full_bisect_builder_slaves = [747, 748] | 121 linux_full_bisect_builder_slaves = [747, 748] |
| 105 result.extend( | 122 result.extend( |
| 106 { | 123 { |
| 107 'master': 'TryServerChromiumLinux', | 124 'master': 'TryServerChromiumLinux', |
| 108 'os': 'linux', | 125 'os': 'linux', |
| 109 'version': 'precise', | 126 'version': 'precise', |
| 110 'bits': '64', | 127 'bits': '64', |
| 111 'builder': 'linux_full_bisect_builder', | 128 'builder': 'linux_full_bisect_builder', |
| 112 'hostname': 'slave%d-c4' % i, | 129 'hostname': 'slave%d-c4' % i, |
| 113 'pool': 'linux_full_bisect_builder', | 130 'pool': 'linux_full_bisect_builder', |
| 114 } for i in linux_full_bisect_builder_slaves | 131 } for i in linux_full_bisect_builder_slaves |
| 115 ) | 132 ) |
| 116 | 133 |
| 117 linux_32_slaves = [117, 162, 163, 188, 193, 196, 198, 201, 203, | 134 linux_32_slaves = [117, 162, 163, 188, 193, 196, 198, 201, 203, |
| 118 211, 227, 260, 338, 786, 787, 788, 804, 822, | 135 211, 227, 260, 338, 786, 787, 788, 804, 822, |
| 119 824, 825, 826, 827, 828, 897] | 136 824, 825, 826, 827, 828] |
| 120 result.extend( | 137 result.extend( |
| 121 { | 138 { |
| 122 'master': 'TryServerChromiumLinux', | 139 'master': 'TryServerChromiumLinux', |
| 123 'os': 'linux', | 140 'os': 'linux', |
| 124 'version': 'precise', | 141 'version': 'precise', |
| 125 'bits': '32', | 142 'bits': '32', |
| 126 'builder': [ | 143 'builder': [ |
| 127 'linux_chromium_archive_rel_32_ng', | 144 'linux_chromium_archive_rel_32_ng', |
| 128 'linux_chromium_compile_dbg_32_ng', | 145 'linux_chromium_compile_dbg_32_ng', |
| 129 'linux_chromium_dbg_32_ng', | 146 'linux_chromium_dbg_32_ng', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 143 'builder': ['linux_chromium_browser_side_navigation_rel'], | 160 'builder': ['linux_chromium_browser_side_navigation_rel'], |
| 144 'hostname': 'slave914-c4', | 161 'hostname': 'slave914-c4', |
| 145 'pool': 'linux_chromium_browser_side_navigation_rel', | 162 'pool': 'linux_chromium_browser_side_navigation_rel', |
| 146 } | 163 } |
| 147 ]) | 164 ]) |
| 148 | 165 |
| 149 return result | 166 return result |
| 150 | 167 |
| 151 | 168 |
| 152 slaves = linux() | 169 slaves = linux() |
| OLD | NEW |