| 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 19 matching lines...) Expand all Loading... |
| 30 from buildbot.scheduler import Scheduler | 30 from buildbot.scheduler import Scheduler |
| 31 from buildbot.scheduler import Triggerable | 31 from buildbot.scheduler import Triggerable |
| 32 from buildbot.status.web import console | 32 from buildbot.status.web import console |
| 33 | 33 |
| 34 from master import master_utils | 34 from master import master_utils |
| 35 from master import slaves_list | 35 from master import slaves_list |
| 36 from master.factory import nacl_factory | 36 from master.factory import nacl_factory |
| 37 from master.factory import gclient_factory | 37 from master.factory import gclient_factory |
| 38 | 38 |
| 39 import config | 39 import config |
| 40 import master_site_config |
| 40 | 41 |
| 41 ActiveMaster = config.Master.NativeClientLLVM | 42 ActiveMaster = master_site_config.NativeClientLLVM |
| 42 | 43 |
| 43 # This is the dictionary that the buildmaster pays attention to. We also use | 44 # This is the dictionary that the buildmaster pays attention to. We also use |
| 44 # a shorter alias to save typing. | 45 # a shorter alias to save typing. |
| 45 c = BuildmasterConfig = {} | 46 c = BuildmasterConfig = {} |
| 46 | 47 |
| 47 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 48 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 48 | 49 |
| 49 # 'slavePortnum' defines the TCP port to listen on. This must match the value | 50 # 'slavePortnum' defines the TCP port to listen on. This must match the value |
| 50 # configured into the buildslaves (with their --master option) | 51 # configured into the buildslaves (with their --master option) |
| 51 c['slavePortnum'] = ActiveMaster.slave_port | 52 c['slavePortnum'] = ActiveMaster.slave_port |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 c['projectName'] = ActiveMaster.project_name | 188 c['projectName'] = ActiveMaster.project_name |
| 188 c['projectURL'] = config.Master.project_url | 189 c['projectURL'] = config.Master.project_url |
| 189 | 190 |
| 190 # the 'buildbotURL' string should point to the location where the buildbot's | 191 # the 'buildbotURL' string should point to the location where the buildbot's |
| 191 # internal web server (usually the html.Waterfall page) is visible. This | 192 # internal web server (usually the html.Waterfall page) is visible. This |
| 192 # typically uses the port number set in the Waterfall 'status' entry, but | 193 # typically uses the port number set in the Waterfall 'status' entry, but |
| 193 # with an externally-visible host name which the buildbot cannot figure out | 194 # with an externally-visible host name which the buildbot cannot figure out |
| 194 # without some help. | 195 # without some help. |
| 195 | 196 |
| 196 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl.llvm/' | 197 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl.llvm/' |
| OLD | NEW |