| 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 |
| 11 # 'mktap buildbot master'). | 11 # 'mktap buildbot master'). |
| 12 | 12 |
| 13 # It has one job: define a dictionary named BuildmasterConfig. This | 13 # It has one job: define a dictionary named BuildmasterConfig. This |
| 14 # dictionary has a variety of keys to control different aspects of the | 14 # dictionary has a variety of keys to control different aspects of the |
| 15 # buildmaster. They are documented in docs/config.xhtml . | 15 # buildmaster. They are documented in docs/config.xhtml . |
| 16 | 16 |
| 17 import posixpath | 17 import posixpath |
| 18 | 18 |
| 19 from buildbot.changes import svnpoller | 19 from buildbot.changes import svnpoller |
| 20 from buildbot.scheduler import Scheduler | 20 from buildbot.scheduler import Scheduler |
| 21 | 21 |
| 22 from master import build_utils | 22 from master import build_utils |
| 23 from master import master_utils | 23 from master import master_utils |
| 24 from master import slaves_list | 24 from master import slaves_list |
| 25 from master.factory import chromium_factory | 25 from master.factory import chromium_factory |
| 26 from master.factory import gclient_factory | 26 from master.factory import gclient_factory |
| 27 from buildbot.status.mail import MailNotifier | 27 from buildbot.status.mail import MailNotifier |
| 28 | 28 |
| 29 import config | 29 import config |
| 30 import master_site_config |
| 30 | 31 |
| 31 ActiveMaster = config.Master.NativeClientSDK | 32 ActiveMaster = master_site_config.NativeClientSDK |
| 32 | 33 |
| 33 TREE_GATE_KEEPER = ActiveMaster.is_production_host | 34 TREE_GATE_KEEPER = ActiveMaster.is_production_host |
| 34 GOOD_REVISIONS = ActiveMaster.is_production_host | 35 GOOD_REVISIONS = ActiveMaster.is_production_host |
| 35 | 36 |
| 36 # This is the dictionary that the buildmaster pays attention to. We also use | 37 # This is the dictionary that the buildmaster pays attention to. We also use |
| 37 # a shorter alias to save typing. | 38 # a shorter alias to save typing. |
| 38 c = BuildmasterConfig = {} | 39 c = BuildmasterConfig = {} |
| 39 | 40 |
| 40 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 41 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 41 | 42 |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 # in any of the steps of any of the builders will mark the revision as failed. | 325 # in any of the steps of any of the builders will mark the revision as failed. |
| 325 c['status'].append(goodrevisions.GoodRevisions( | 326 c['status'].append(goodrevisions.GoodRevisions( |
| 326 good_revision_steps=builder_steps, | 327 good_revision_steps=builder_steps, |
| 327 store_revisions_url=ActiveMaster.store_revisions_url)) | 328 store_revisions_url=ActiveMaster.store_revisions_url)) |
| 328 | 329 |
| 329 | 330 |
| 330 ####### PROJECT IDENTITY | 331 ####### PROJECT IDENTITY |
| 331 | 332 |
| 332 # Buildbot master url: | 333 # Buildbot master url: |
| 333 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl.sdk/' | 334 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl.sdk/' |
| OLD | NEW |