| 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 # READ THIS: | 8 # READ THIS: |
| 9 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure | 9 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure |
| 10 | 10 |
| 11 # These modules come from scripts, which must be in the PYTHONPATH. | 11 # These modules come from scripts, which must be in the PYTHONPATH. |
| 12 from master import master_utils | 12 from master import master_utils |
| 13 from master import slaves_list | 13 from master import slaves_list |
| 14 from master.builders_pools import BuildersPools | 14 from master.builders_pools import BuildersPools |
| 15 from master.factory import annotator_factory | 15 from master.factory import annotator_factory |
| 16 from master.factory import gyp_factory | 16 from master.factory import gyp_factory |
| 17 from master.factory import nacl_factory | 17 from master.factory import nacl_factory |
| 18 from master.try_job_http import TryJobHTTP | 18 from master.try_job_http import TryJobHTTP |
| 19 from master.try_job_svn import TryJobSubversion | 19 from master.try_job_svn import TryJobSubversion |
| 20 | 20 |
| 21 from buildbot.scheduler import Triggerable | 21 from buildbot.scheduler import Triggerable |
| 22 | 22 |
| 23 import config | 23 import config |
| 24 import master_site_config |
| 24 | 25 |
| 25 ActiveMaster = config.Master.NativeClientTryServer | 26 ActiveMaster = master_site_config.NativeClientTryServer |
| 26 | 27 |
| 27 MAIL_NOTIFIER = True | 28 MAIL_NOTIFIER = True |
| 28 UPDATE_CODEREVIEW = ActiveMaster.is_production_host | 29 UPDATE_CODEREVIEW = ActiveMaster.is_production_host |
| 29 | 30 |
| 30 # This is the dictionary that the buildmaster pays attention to. We also use | 31 # This is the dictionary that the buildmaster pays attention to. We also use |
| 31 # a shorter alias to save typing. | 32 # a shorter alias to save typing. |
| 32 c = BuildmasterConfig = {} | 33 c = BuildmasterConfig = {} |
| 33 | 34 |
| 34 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) | 35 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host) |
| 35 | 36 |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 config.Master.GetBotPassword()) | 614 config.Master.GetBotPassword()) |
| 614 | 615 |
| 615 | 616 |
| 616 ####### SCHEDULERS | 617 ####### SCHEDULERS |
| 617 | 618 |
| 618 # Configure the Schedulers; | 619 # Configure the Schedulers; |
| 619 # Main Tryscheduler for the try queue. groups is defined in the loop above. | 620 # Main Tryscheduler for the try queue. groups is defined in the loop above. |
| 620 c['schedulers'] = [] | 621 c['schedulers'] = [] |
| 621 | 622 |
| 622 code_review_sites = { | 623 code_review_sites = { |
| 623 'nacl': config.Master.NativeClientTryServer.code_review_site, | 624 'nacl': ActiveMaster.code_review_site, |
| 624 'nacl-toolchain': config.Master.NativeClientTryServer.code_review_site, | 625 'nacl-toolchain': ActiveMaster.code_review_site, |
| 625 'gyp': config.Master.NativeClientTryServer.code_review_site, | 626 'gyp': ActiveMaster.code_review_site, |
| 626 } | 627 } |
| 627 c['schedulers'].append(TryJobHTTP( | 628 c['schedulers'].append(TryJobHTTP( |
| 628 name='try_job_http', | 629 name='try_job_http', |
| 629 port=ActiveMaster.try_job_port, | 630 port=ActiveMaster.try_job_port, |
| 630 code_review_sites=code_review_sites, | 631 code_review_sites=code_review_sites, |
| 631 pools=pools)) | 632 pools=pools)) |
| 632 | 633 |
| 633 if ActiveMaster.svn_url: | 634 if ActiveMaster.svn_url: |
| 634 c['schedulers'].append(TryJobSubversion( | 635 c['schedulers'].append(TryJobSubversion( |
| 635 name='try_job_svn', | 636 name='try_job_svn', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 | 690 |
| 690 | 691 |
| 691 ####### PROJECT IDENTITY | 692 ####### PROJECT IDENTITY |
| 692 | 693 |
| 693 # The 'projectURL' string will be used to provide a link | 694 # The 'projectURL' string will be used to provide a link |
| 694 # from buildbot HTML pages to your project's home page. | 695 # from buildbot HTML pages to your project's home page. |
| 695 c['projectURL'] = 'http://go/ChromeTryServer' | 696 c['projectURL'] = 'http://go/ChromeTryServer' |
| 696 | 697 |
| 697 # Buildbot master url: | 698 # Buildbot master url: |
| 698 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.nacl/' | 699 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.nacl/' |
| OLD | NEW |