| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 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 # READ THIS: | 7 # READ THIS: |
| 8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure | 8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure |
| 9 | 9 |
| 10 import os | 10 import os |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 'remoting_br', | 95 'remoting_br', |
| 96 'sync_integration_br', | 96 'sync_integration_br', |
| 97 'telemetry_perf_unittests_br', | 97 'telemetry_perf_unittests_br', |
| 98 'telemetry_unittests_br', | 98 'telemetry_unittests_br', |
| 99 'unit_br', | 99 'unit_br', |
| 100 'url_unittests_br', | 100 'url_unittests_br', |
| 101 ] + chromium_factory.blink_tests_for_chromium_tryjobs | 101 ] + chromium_factory.blink_tests_for_chromium_tryjobs |
| 102 | 102 |
| 103 b_ios_dbg_simulator = { | 103 b_ios_dbg_simulator = { |
| 104 'name': 'ios_dbg_simulator', | 104 'name': 'ios_dbg_simulator', |
| 105 'factory': m_annotator.BaseFactory('chromium'), | 105 'factory': m_annotator.BaseFactory('ios/try'), |
| 106 } |
| 107 |
| 108 b_ios_dbg_simulator_ninja = { |
| 109 'name': 'ios_dbg_simulator_ninja', |
| 110 'factory': m_annotator.BaseFactory('ios/try'), |
| 111 } |
| 112 |
| 113 b_ios_rel_device = { |
| 114 'name': 'ios_rel_device', |
| 115 'factory': m_annotator.BaseFactory('ios/try'), |
| 116 } |
| 117 |
| 118 b_ios_rel_device_ninja = { |
| 119 'name': 'ios_rel_device_ninja', |
| 120 'factory': m_annotator.BaseFactory('ios/try'), |
| 106 } | 121 } |
| 107 | 122 |
| 108 chromium_builders = [] | 123 chromium_builders = [] |
| 109 | 124 |
| 110 for targ in ('_rel', '_dbg'): | 125 for targ in ('_rel', '_dbg'): |
| 111 chromium_builders.extend([{ | 126 chromium_builders.extend([{ |
| 112 'name': 'mac_chromium_compile%s_ng' % targ, | 127 'name': 'mac_chromium_compile%s_ng' % targ, |
| 113 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600), | 128 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600), |
| 114 # Share build directory with compatible existing builders to save space. | 129 # Share build directory with compatible existing builders to save space. |
| 115 'slavebuilddir': 'mac' | 130 'slavebuilddir': 'mac' |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 target='Release', | 194 target='Release', |
| 180 options=[], | 195 options=[], |
| 181 tests=[], | 196 tests=[], |
| 182 builder_name='mac_nacl_sdk_build', | 197 builder_name='mac_nacl_sdk_build', |
| 183 annotation_script=master_config_tryserver.nacl_sdk_script_build, | 198 annotation_script=master_config_tryserver.nacl_sdk_script_build, |
| 184 goma=True, | 199 goma=True, |
| 185 clang=True) | 200 clang=True) |
| 186 | 201 |
| 187 c['builders'] = [ | 202 c['builders'] = [ |
| 188 b_ios_dbg_simulator, | 203 b_ios_dbg_simulator, |
| 204 b_ios_dbg_simulator_ninja, |
| 205 b_ios_rel_device, |
| 206 b_ios_rel_device_ninja, |
| 189 b_mac_nacl_sdk, | 207 b_mac_nacl_sdk, |
| 190 b_mac_nacl_sdk_build, | 208 b_mac_nacl_sdk_build, |
| 191 ] + chromium_builders | 209 ] + chromium_builders |
| 192 | 210 |
| 193 | 211 |
| 194 # Slaves are loaded from slaves.cfg. | 212 # Slaves are loaded from slaves.cfg. |
| 195 slaves = slaves_list.SlavesList('slaves.cfg', 'TryServerChromiumMac') | 213 slaves = slaves_list.SlavesList('slaves.cfg', 'TryServerChromiumMac') |
| 196 | 214 |
| 197 for builder in c['builders']: | 215 for builder in c['builders']: |
| 198 # Associate the slaves to the builders. The configuration is in slaves.cfg. | 216 # Associate the slaves to the builders. The configuration is in slaves.cfg. |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 ) | 366 ) |
| 349 | 367 |
| 350 | 368 |
| 351 ####### PROJECT IDENTITY | 369 ####### PROJECT IDENTITY |
| 352 | 370 |
| 353 # The 'projectURL' string will be used to provide a link | 371 # The 'projectURL' string will be used to provide a link |
| 354 # from buildbot HTML pages to your project's home page. | 372 # from buildbot HTML pages to your project's home page. |
| 355 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage' | 373 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage' |
| 356 | 374 |
| 357 # vi: set ts=4 sts=2 sw=2 et: | 375 # vi: set ts=4 sts=2 sw=2 et: |
| OLD | NEW |