| 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 ] | 43 ] |
| 44 optional_builders += [ | 44 optional_builders += [ |
| 45 'linux_arm', | 45 'linux_arm', |
| 46 'linux_chromium_asan_variable', | 46 'linux_chromium_asan_variable', |
| 47 'linux_chromium_cast_variable', | 47 'linux_chromium_cast_variable', |
| 48 'linux_chromium_chromeos_asan_variable', | 48 'linux_chromium_chromeos_asan_variable', |
| 49 'linux_chromium_chromeos_compile_rel_ng', | 49 'linux_chromium_chromeos_compile_rel_ng', |
| 50 'linux_chromium_chromeos_dbg_ng', | 50 'linux_chromium_chromeos_dbg_ng', |
| 51 'linux_chromium_chromeos_msan_rel_ng', | 51 'linux_chromium_chromeos_msan_rel_ng', |
| 52 'linux_chromium_chromeos_variable', | 52 'linux_chromium_chromeos_variable', |
| 53 'linux_chromium_chromeos_variable_chrome', |
| 53 'linux_chromium_clang_upload', | 54 'linux_chromium_clang_upload', |
| 54 'linux_chromium_compile_rel_ng', | 55 'linux_chromium_compile_rel_ng', |
| 55 'linux_chromium_dbg_ng', | 56 'linux_chromium_dbg_ng', |
| 56 'linux_chromium_gn_chromeos_variable', | 57 'linux_chromium_gn_chromeos_variable', |
| 57 'linux_chromium_gn_upload', | 58 'linux_chromium_gn_upload', |
| 58 'linux_chromium_msan_rel_ng', | 59 'linux_chromium_msan_rel_ng', |
| 59 'linux_chromium_tsan_rel_ng', | 60 'linux_chromium_tsan_rel_ng', |
| 60 'linux_chromium_practice_rel_ng', | 61 'linux_chromium_practice_rel_ng', |
| 61 'linux_chromium_variable', | 62 'linux_chromium_variable', |
| 63 'linux_chromium_variable_chrome', |
| 62 'linux_chromium_variable_clobber', | 64 'linux_chromium_variable_clobber', |
| 63 'linux_deterministic', | 65 'linux_deterministic', |
| 64 'linux_ecs_ozone', | 66 'linux_ecs_ozone', |
| 65 'linux_nacl_sdk', | 67 'linux_nacl_sdk', |
| 66 'linux_nacl_sdk_build', | 68 'linux_nacl_sdk_build', |
| 67 'linux_optional_gpu_tests_rel', | 69 'linux_optional_gpu_tests_rel', |
| 68 'linux_site_isolation', | 70 'linux_site_isolation', |
| 69 'linux_valgrind', | 71 'linux_valgrind', |
| 70 ] | 72 ] |
| 71 | 73 |
| 72 optional_32_slaves = [897] | 74 optional_32_slaves = [897] |
| 73 optional_32_builders = [ | 75 optional_32_builders = [ |
| 74 'linux_chromium_variable_32', | 76 'linux_chromium_variable_32', |
| 77 'linux_chromium_variable_32_chrome', |
| 75 'linux_chromium_variable_32_clobber', | 78 'linux_chromium_variable_32_clobber', |
| 76 ] | 79 ] |
| 77 | 80 |
| 78 # Set up normal slaves. | 81 # Set up normal slaves. |
| 79 result = [] | 82 result = [] |
| 80 for i, slave in enumerate(cq_slaves): | 83 for i, slave in enumerate(cq_slaves): |
| 81 result.append({ | 84 result.append({ |
| 82 'master': 'TryServerChromiumLinux', | 85 'master': 'TryServerChromiumLinux', |
| 83 'os': 'linux', | 86 'os': 'linux', |
| 84 'version': 'precise', | 87 'version': 'precise', |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 'builder': ['linux_chromium_browser_side_navigation_rel'], | 166 'builder': ['linux_chromium_browser_side_navigation_rel'], |
| 164 'hostname': 'slave914-c4', | 167 'hostname': 'slave914-c4', |
| 165 'pool': 'linux_chromium_browser_side_navigation_rel', | 168 'pool': 'linux_chromium_browser_side_navigation_rel', |
| 166 } | 169 } |
| 167 ]) | 170 ]) |
| 168 | 171 |
| 169 return result | 172 return result |
| 170 | 173 |
| 171 | 174 |
| 172 slaves = linux() | 175 slaves = linux() |
| OLD | NEW |