| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 | 7 |
| 8 # This is the buildmaster config file for the 'nacl' bot. It must | 8 # This is the buildmaster config file for the 'nacl' bot. It must |
| 9 # be installed as 'master.cfg' in your buildmaster's base directory | 9 # be installed as 'master.cfg' in your buildmaster's base directory |
| 10 # (although the filename can be changed with the --basedir option to | 10 # (although the filename can be changed with the --basedir option to |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 assert False | 116 assert False |
| 117 | 117 |
| 118 m = annotator_factory.AnnotatorFactory().BaseFactory( | 118 m = annotator_factory.AnnotatorFactory().BaseFactory( |
| 119 recipe='client.nacl.sdk.recipe_autogen') | 119 recipe='client.nacl.sdk.recipe_autogen') |
| 120 | 120 |
| 121 # SDKs | 121 # SDKs |
| 122 # Label each factory with a catergory code like: | 122 # Label each factory with a catergory code like: |
| 123 # '1trunk' indicating: category 1, branch trunk. | 123 # '1trunk' indicating: category 1, branch trunk. |
| 124 code = str(branches.index(branch) + 1) + branch | 124 code = str(branches.index(branch) + 1) + branch |
| 125 | 125 |
| 126 if branch == 'multirel': | |
| 127 # TODO(binji) As of March 14, 2014, the chromium_builder_nacl_sdk target | |
| 128 # doesn't exist on all Chrome release branches. When it does, use it. | |
| 129 builder_target = 'chromium_builder_tests' | |
| 130 else: | |
| 131 builder_target = 'chromium_builder_nacl_sdk' | |
| 132 | |
| 133 factories.append(['windows-sdk' + branch_ext, code, m]) | 126 factories.append(['windows-sdk' + branch_ext, code, m]) |
| 134 factories.append(['mac-sdk' + branch_ext, code, m]) | 127 factories.append(['mac-sdk' + branch_ext, code, m]) |
| 135 factories.append(['linux-sdk' + branch_ext, code, m]) | 128 factories.append(['linux-sdk' + branch_ext, code, m]) |
| 136 if branch == 'multi': | 129 if branch == 'multi': |
| 137 factories.append(['linux-sdk-asan' + branch_ext, code, m]) | 130 factories.append(['linux-sdk-asan' + branch_ext, code, m]) |
| 138 s_nacl = Scheduler( | 131 s_nacl = Scheduler( |
| 139 name='nacl-' + branch, | 132 name='nacl-' + branch, |
| 140 branch=branch, | 133 branch=branch, |
| 141 treeStableTimer=0, | 134 treeStableTimer=0, |
| 142 builderNames=[f[0] for f in factories], | 135 builderNames=[f[0] for f in factories], |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 # Must come before AutoSetupMaster(). | 209 # Must come before AutoSetupMaster(). |
| 217 c['buildbotURL'] = ActiveMaster.buildbot_url | 210 c['buildbotURL'] = ActiveMaster.buildbot_url |
| 218 | 211 |
| 219 # Adds common status and tools to this master. | 212 # Adds common status and tools to this master. |
| 220 master_utils.AutoSetupMaster(c, ActiveMaster, | 213 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 221 order_console_by_time=True, | 214 order_console_by_time=True, |
| 222 tagComparator=multi_poller.comparator, | 215 tagComparator=multi_poller.comparator, |
| 223 public_html='../master.chromium/public_html', | 216 public_html='../master.chromium/public_html', |
| 224 templates=['./templates', | 217 templates=['./templates', |
| 225 '../master.client.nacl/templates']) | 218 '../master.client.nacl/templates']) |
| OLD | NEW |