| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 'linux_site_isolation', # linux | 63 'linux_site_isolation', # linux |
| 64 ] | 64 ] |
| 65 # Contains all the optional builders with smaller slavebuilddir not | 65 # Contains all the optional builders with smaller slavebuilddir not |
| 66 # covered by optional_builders1. | 66 # covered by optional_builders1. |
| 67 optional_builders2 = [ | 67 optional_builders2 = [ |
| 68 'chromeos_%s_variable' % (board,) # chromeos_<board> | 68 'chromeos_%s_variable' % (board,) # chromeos_<board> |
| 69 for board in chromeos_boards | 69 for board in chromeos_boards |
| 70 ] | 70 ] |
| 71 optional_builders2 += [ | 71 optional_builders2 += [ |
| 72 'linux_arm', # linux_arm | 72 'linux_arm', # linux_arm |
| 73 'linux_chromium_asan_variable', # linux_asan | |
| 74 'linux_chromium_blimp_variable', # linux_blimp | |
| 75 'linux_chromium_cast_variable', # linux_cast | |
| 76 'linux_chromium_chromeos_asan_variable', # linux_chromeos_asan | 73 'linux_chromium_chromeos_asan_variable', # linux_chromeos_asan |
| 77 'linux_chromium_chromeos_msan_rel_ng', # linux_chromeos_msan | 74 'linux_chromium_chromeos_msan_rel_ng', # linux_chromeos_msan |
| 78 'linux_chromium_chromeos_variable_chrome',# linux_chromeos_chrome | 75 'linux_chromium_chromeos_variable_chrome',# linux_chromeos_chrome |
| 79 'linux_chromium_gn_chromeos_variable', # linux_chromium_gn_chromeos | 76 'linux_chromium_gn_chromeos_variable', # linux_chromium_gn_chromeos |
| 80 'linux_chromium_gn_upload', # build_and_upload_gn | 77 'linux_chromium_gn_upload', # build_and_upload_gn |
| 81 'linux_chromium_tsan_rel_ng', # linux_tsan | 78 'linux_chromium_tsan_rel_ng', # linux_tsan |
| 82 'linux_chromium_variable_32', # linux_32 | |
| 83 'linux_chromium_variable_32_chrome', # linux_chrome_32 | |
| 84 'linux_chromium_variable_32_clobber', # linux_clobber_32 | |
| 85 'linux_chromium_variable_chrome', # linux_chrome | |
| 86 'linux_chromium_variable_clobber', # linux_clobber | |
| 87 'linux_chromium_webkit_asan_variable', # linux_layout_asan | |
| 88 'linux_chromium_webkit_leak_variable', # linux_layout_leak | |
| 89 'linux_chromium_webkit_msan_variable', # linux_layout_msan | |
| 90 'linux_chromium_webkit_variable', # linux_layout | |
| 91 'linux_nacl_sdk', # linux_nacl_sdk | 79 'linux_nacl_sdk', # linux_nacl_sdk |
| 92 'linux_nacl_sdk_build', # linux_nacl_sdk_build | 80 'linux_nacl_sdk_build', # linux_nacl_sdk_build |
| 93 'linux_optional_gpu_tests_rel', # linux_nacl_sdk_build | 81 'linux_optional_gpu_tests_rel', # linux_nacl_sdk_build |
| 94 ] | 82 ] |
| 95 | 83 |
| 96 # Super beefy machines. | 84 # Super beefy machines. |
| 97 optional_highmem_slaves = [904, 905] | 85 optional_highmem_slaves = [904, 905] |
| 98 optional_highmem_builders = [ | 86 optional_highmem_builders = [ |
| 99 'linux_upload_clang', | 87 'linux_upload_clang', |
| 100 'linux_chromium_cfi_rel_ng', | 88 'linux_chromium_cfi_rel_ng', |
| 101 ] | 89 ] |
| 102 | 90 |
| 103 # High-cpu slaves for dedicated use by Findit. | 91 # High-cpu slaves for dedicated use by Findit. |
| 104 optional_highcpu_slaves = [799] | 92 optional_highcpu_slaves = [799] + range(873, 878) |
| 105 optional_highcpu_builders = [ # slavebuilddir | 93 optional_highcpu_builders = [ # slavebuilddir |
| 94 'linux_chromium_asan_variable', # linux_asan |
| 106 'linux_chromium_variable', # linux | 95 'linux_chromium_variable', # linux |
| 96 'linux_chromium_blimp_variable', # linux_blimp |
| 97 'linux_chromium_cast_variable', # linux_cast |
| 98 'linux_chromium_variable_32', # linux_32 |
| 99 'linux_chromium_variable_32_chrome', # linux_chrome_32 |
| 100 'linux_chromium_variable_32_clobber', # linux_clobber_32 |
| 101 'linux_chromium_variable_chrome', # linux_chrome |
| 102 'linux_chromium_variable_clobber', # linux_clobber |
| 103 'linux_chromium_webkit_asan_variable', # linux_layout_asan |
| 104 'linux_chromium_webkit_leak_variable', # linux_layout_leak |
| 105 'linux_chromium_webkit_msan_variable', # linux_layout_msan |
| 106 'linux_chromium_webkit_variable', # linux_layout |
| 107 ] | 107 ] |
| 108 | 108 |
| 109 # Set up normal slaves. | 109 # Set up normal slaves. |
| 110 result = [] | 110 result = [] |
| 111 for i, slave in enumerate(cq_slaves): | 111 for i, slave in enumerate(cq_slaves): |
| 112 result.append({ | 112 result.append({ |
| 113 'master': 'TryServerChromiumLinux', | 113 'master': 'TryServerChromiumLinux', |
| 114 'os': 'linux', | 114 'os': 'linux', |
| 115 'version': 'precise', | 115 'version': 'precise', |
| 116 'bits': '64', | 116 'bits': '64', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 'builder': ['linux_chromium_browser_side_navigation_rel'], | 170 'builder': ['linux_chromium_browser_side_navigation_rel'], |
| 171 'hostname': 'slave914-c4', | 171 'hostname': 'slave914-c4', |
| 172 'pool': 'linux_chromium_browser_side_navigation_rel', | 172 'pool': 'linux_chromium_browser_side_navigation_rel', |
| 173 } | 173 } |
| 174 ]) | 174 ]) |
| 175 | 175 |
| 176 return result | 176 return result |
| 177 | 177 |
| 178 | 178 |
| 179 slaves = linux() | 179 slaves = linux() |
| OLD | NEW |