| 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 15 matching lines...) Expand all Loading... |
| 26 from buildbot.scheduler import Scheduler | 26 from buildbot.scheduler import Scheduler |
| 27 from buildbot.scheduler import Triggerable | 27 from buildbot.scheduler import Triggerable |
| 28 | 28 |
| 29 from master import build_utils | 29 from master import build_utils |
| 30 from master import slaves_list | 30 from master import slaves_list |
| 31 from master import master_utils | 31 from master import master_utils |
| 32 from master.factory import nacl_factory | 32 from master.factory import nacl_factory |
| 33 | 33 |
| 34 | 34 |
| 35 import config | 35 import config |
| 36 import master_site_config |
| 36 | 37 |
| 37 ActiveMaster = config.Master.NativeClient | 38 ActiveMaster = master_site_config.NativeClient |
| 38 | 39 |
| 39 TREE_GATE_KEEPER = ActiveMaster.is_production_host | 40 TREE_GATE_KEEPER = ActiveMaster.is_production_host |
| 40 GOOD_REVISIONS = ActiveMaster.is_production_host | 41 GOOD_REVISIONS = ActiveMaster.is_production_host |
| 41 | 42 |
| 42 # This is the dictionary that the buildmaster pays attention to. We also use | 43 # This is the dictionary that the buildmaster pays attention to. We also use |
| 43 # a shorter alias to save typing. | 44 # a shorter alias to save typing. |
| 44 c = BuildmasterConfig = {} | 45 c = BuildmasterConfig = {} |
| 45 | 46 |
| 46 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 47 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 47 | 48 |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 from master import goodrevisions | 340 from master import goodrevisions |
| 340 c['status'].append(goodrevisions.GoodRevisions( | 341 c['status'].append(goodrevisions.GoodRevisions( |
| 341 good_revision_steps=builder_steps, | 342 good_revision_steps=builder_steps, |
| 342 store_revisions_url=ActiveMaster.store_revisions_url)) | 343 store_revisions_url=ActiveMaster.store_revisions_url)) |
| 343 | 344 |
| 344 | 345 |
| 345 ####### PROJECT IDENTITY | 346 ####### PROJECT IDENTITY |
| 346 | 347 |
| 347 # Buildbot master url: | 348 # Buildbot master url: |
| 348 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl/' | 349 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl/' |
| OLD | NEW |