| 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 | 27 |
| 28 import config | 28 import config |
| 29 import master_site_config |
| 29 | 30 |
| 30 ActiveMaster = config.Master.NativeClientRagel | 31 ActiveMaster = master_site_config.NativeClientRagel |
| 31 | 32 |
| 32 # This is the dictionary that the buildmaster pays attention to. We also use | 33 # This is the dictionary that the buildmaster pays attention to. We also use |
| 33 # a shorter alias to save typing. | 34 # a shorter alias to save typing. |
| 34 c = BuildmasterConfig = {} | 35 c = BuildmasterConfig = {} |
| 35 | 36 |
| 36 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 37 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 37 | 38 |
| 38 ####### CHANGESOURCES | 39 ####### CHANGESOURCES |
| 39 | 40 |
| 40 # the 'change_source' list tells the buildmaster how it should find out about | 41 # the 'change_source' list tells the buildmaster how it should find out about |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 master_utils.AutoSetupMaster(c, ActiveMaster, | 164 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 164 order_console_by_time=True, | 165 order_console_by_time=True, |
| 165 public_html='../master.chromium/public_html', | 166 public_html='../master.chromium/public_html', |
| 166 templates=['./templates', | 167 templates=['./templates', |
| 167 '../master.client.nacl/templates']) | 168 '../master.client.nacl/templates']) |
| 168 | 169 |
| 169 ####### PROJECT IDENTITY | 170 ####### PROJECT IDENTITY |
| 170 | 171 |
| 171 # Buildbot master url: | 172 # Buildbot master url: |
| 172 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl.ragel/' | 173 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl.ragel/' |
| OLD | NEW |