| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 optional_builders += [ | 43 optional_builders += [ |
| 44 'linux_arm', | 44 'linux_arm', |
| 45 'linux_chromium_asan_variable', | 45 'linux_chromium_asan_variable', |
| 46 'linux_chromium_cast_variable', | 46 'linux_chromium_cast_variable', |
| 47 'linux_chromium_chromeos_asan_variable', | 47 'linux_chromium_chromeos_asan_variable', |
| 48 'linux_chromium_chromeos_compile_rel_ng', | 48 'linux_chromium_chromeos_compile_rel_ng', |
| 49 'linux_chromium_chromeos_dbg_ng', | 49 'linux_chromium_chromeos_dbg_ng', |
| 50 'linux_chromium_chromeos_msan_rel_ng', | 50 'linux_chromium_chromeos_msan_rel_ng', |
| 51 'linux_chromium_chromeos_variable', | 51 'linux_chromium_chromeos_variable', |
| 52 'linux_chromium_chromeos_variable_chrome', | 52 'linux_chromium_chromeos_variable_chrome', |
| 53 'linux_chromium_compile_dbg_32_ng', |
| 53 'linux_chromium_compile_rel_ng', | 54 'linux_chromium_compile_rel_ng', |
| 54 'linux_chromium_dbg_ng', | 55 'linux_chromium_dbg_ng', |
| 56 'linux_chromium_dbg_32_ng', |
| 55 'linux_chromium_gn_chromeos_variable', | 57 'linux_chromium_gn_chromeos_variable', |
| 56 'linux_chromium_gn_upload', | 58 'linux_chromium_gn_upload', |
| 57 'linux_chromium_msan_rel_ng', | 59 'linux_chromium_msan_rel_ng', |
| 58 'linux_chromium_tsan_rel_ng', | 60 'linux_chromium_tsan_rel_ng', |
| 59 'linux_chromium_practice_rel_ng', | 61 'linux_chromium_practice_rel_ng', |
| 60 'linux_chromium_variable', | 62 'linux_chromium_variable', |
| 63 'linux_chromium_variable_32', |
| 64 'linux_chromium_variable_32_chrome', |
| 65 'linux_chromium_variable_32_clobber', |
| 61 'linux_chromium_variable_chrome', | 66 'linux_chromium_variable_chrome', |
| 62 'linux_chromium_variable_clobber', | 67 'linux_chromium_variable_clobber', |
| 63 'linux_chromium_webkit_asan_variable', | 68 'linux_chromium_webkit_asan_variable', |
| 64 'linux_chromium_webkit_leak_variable', | 69 'linux_chromium_webkit_leak_variable', |
| 65 'linux_chromium_webkit_msan_variable', | 70 'linux_chromium_webkit_msan_variable', |
| 66 'linux_chromium_webkit_variable', | 71 'linux_chromium_webkit_variable', |
| 67 'linux_ecs_ozone', | 72 'linux_ecs_ozone', |
| 68 'linux_nacl_sdk', | 73 'linux_nacl_sdk', |
| 69 'linux_nacl_sdk_build', | 74 'linux_nacl_sdk_build', |
| 70 'linux_optional_gpu_tests_rel', | 75 'linux_optional_gpu_tests_rel', |
| 71 'linux_site_isolation', | 76 'linux_site_isolation', |
| 72 ] | 77 ] |
| 73 | 78 |
| 74 optional_32_slaves = [897] | |
| 75 optional_32_builders = [ | |
| 76 'linux_chromium_variable_32', | |
| 77 'linux_chromium_variable_32_chrome', | |
| 78 'linux_chromium_variable_32_clobber', | |
| 79 ] | |
| 80 | |
| 81 # Super beefy machines. | 79 # Super beefy machines. |
| 82 optional_highmem_slaves = [904, 905] | 80 optional_highmem_slaves = [904, 905] |
| 83 optional_highmem_builders = [ | 81 optional_highmem_builders = [ |
| 84 'linux_upload_clang', | 82 'linux_upload_clang', |
| 85 'linux_chromium_cfi_rel_ng', | 83 'linux_chromium_cfi_rel_ng', |
| 86 ] | 84 ] |
| 87 | 85 |
| 88 # Set up normal slaves. | 86 # Set up normal slaves. |
| 89 result = [] | 87 result = [] |
| 90 for i, slave in enumerate(cq_slaves): | 88 for i, slave in enumerate(cq_slaves): |
| (...skipping 21 matching lines...) Expand all Loading... |
| 112 result.append({ | 110 result.append({ |
| 113 'master': 'TryServerChromiumLinux', | 111 'master': 'TryServerChromiumLinux', |
| 114 'os': 'linux', | 112 'os': 'linux', |
| 115 'version': 'precise', | 113 'version': 'precise', |
| 116 'bits': '64', | 114 'bits': '64', |
| 117 'builder': optional_highmem_builders, | 115 'builder': optional_highmem_builders, |
| 118 'hostname': 'slave%d-c4' % slave, | 116 'hostname': 'slave%d-c4' % slave, |
| 119 'pool': 'linux_optional_highmem', | 117 'pool': 'linux_optional_highmem', |
| 120 }) | 118 }) |
| 121 | 119 |
| 122 result.extend( | |
| 123 { | |
| 124 'master': 'TryServerChromiumLinux', | |
| 125 'os': 'linux', | |
| 126 'version': 'precise', | |
| 127 'bits': '32', | |
| 128 'builder': optional_32_builders, | |
| 129 'hostname': 'vm%d-m4' % i, | |
| 130 'pool': 'linux_optional_32', | |
| 131 } for i in optional_32_slaves | |
| 132 ) | |
| 133 | |
| 134 linux_full_bisect_builder_slaves = [747, 748] | 120 linux_full_bisect_builder_slaves = [747, 748] |
| 135 result.extend( | 121 result.extend( |
| 136 { | 122 { |
| 137 'master': 'TryServerChromiumLinux', | 123 'master': 'TryServerChromiumLinux', |
| 138 'os': 'linux', | 124 'os': 'linux', |
| 139 'version': 'precise', | 125 'version': 'precise', |
| 140 'bits': '64', | 126 'bits': '64', |
| 141 'builder': 'linux_full_bisect_builder', | 127 'builder': 'linux_full_bisect_builder', |
| 142 'hostname': 'slave%d-c4' % i, | 128 'hostname': 'slave%d-c4' % i, |
| 143 'pool': 'linux_full_bisect_builder', | 129 'pool': 'linux_full_bisect_builder', |
| 144 } for i in linux_full_bisect_builder_slaves | 130 } for i in linux_full_bisect_builder_slaves |
| 145 ) | 131 ) |
| 146 | 132 |
| 147 linux_32_slaves = [117, 162, 163, 188, 193, 196, 198, 201, 203, | |
| 148 211, 227, 260, 338, 786, 787, 788, 804, 822, | |
| 149 824, 825, 826, 827, 828] | |
| 150 result.extend( | |
| 151 { | |
| 152 'master': 'TryServerChromiumLinux', | |
| 153 'os': 'linux', | |
| 154 'version': 'precise', | |
| 155 'bits': '32', | |
| 156 'builder': [ | |
| 157 'linux_chromium_compile_dbg_32_ng', | |
| 158 'linux_chromium_dbg_32_ng', | |
| 159 ], | |
| 160 'hostname': 'vm%d-m4' % i, | |
| 161 'pool': 'linux_32', | |
| 162 } for i in linux_32_slaves | |
| 163 ) | |
| 164 | |
| 165 # Bot for linux_chromium_browser_side_navigation_rel. | 133 # Bot for linux_chromium_browser_side_navigation_rel. |
| 166 result.extend([ | 134 result.extend([ |
| 167 { | 135 { |
| 168 'master': 'TryServerChromiumLinux', | 136 'master': 'TryServerChromiumLinux', |
| 169 'os': 'linux', | 137 'os': 'linux', |
| 170 'version': 'precise', | 138 'version': 'precise', |
| 171 'bits': '64', | 139 'bits': '64', |
| 172 'builder': ['linux_chromium_browser_side_navigation_rel'], | 140 'builder': ['linux_chromium_browser_side_navigation_rel'], |
| 173 'hostname': 'slave914-c4', | 141 'hostname': 'slave914-c4', |
| 174 'pool': 'linux_chromium_browser_side_navigation_rel', | 142 'pool': 'linux_chromium_browser_side_navigation_rel', |
| 175 } | 143 } |
| 176 ]) | 144 ]) |
| 177 | 145 |
| 178 return result | 146 return result |
| 179 | 147 |
| 180 | 148 |
| 181 slaves = linux() | 149 slaves = linux() |
| OLD | NEW |