| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from buildbot.process.properties import WithProperties | 5 from buildbot.process.properties import WithProperties |
| 6 from buildbot.scheduler import Dependent | 6 from buildbot.scheduler import Dependent |
| 7 | 7 |
| 8 from common import chromium_utils | 8 from common import chromium_utils |
| 9 | 9 |
| 10 from master import gitiles_poller | 10 from master import gitiles_poller |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 'master') | 66 'master') |
| 67 | 67 |
| 68 def m_remote_run_chromium_src(recipe, factory_properties=None, **kwargs): | 68 def m_remote_run_chromium_src(recipe, factory_properties=None, **kwargs): |
| 69 if not factory_properties: | 69 if not factory_properties: |
| 70 factory_properties = {} | 70 factory_properties = {} |
| 71 if not factory_properties.get('path_config'): | 71 if not factory_properties.get('path_config'): |
| 72 factory_properties['path_config'] = 'kitchen' | 72 factory_properties['path_config'] = 'kitchen' |
| 73 kwargs.setdefault('revision', revision_getter) | 73 kwargs.setdefault('revision', revision_getter) |
| 74 return remote_run_factory.RemoteRunFactory( | 74 return remote_run_factory.RemoteRunFactory( |
| 75 active_master=ActiveMaster, | 75 active_master=ActiveMaster, |
| 76 repository='https://chromium.googlesource.com/chromium/src.git', | 76 repository='https://chromium.googlesource.com/chromium/tools/build.git', |
| 77 recipe=recipe, | 77 recipe=recipe, |
| 78 factory_properties=factory_properties, | 78 factory_properties=factory_properties, |
| 79 use_gitiles=True, | 79 use_gitiles=True, |
| 80 **kwargs) | 80 **kwargs) |
| 81 | 81 |
| 82 # ---------------------------------------------------------------------------- | 82 # ---------------------------------------------------------------------------- |
| 83 # BUILDER DEFINITIONS | 83 # BUILDER DEFINITIONS |
| 84 | 84 |
| 85 recipe_master_helper.AddRemoteRunBuilders( | 85 recipe_master_helper.AddRemoteRunBuilders( |
| 86 c, slaves, m_remote_run_chromium_src, trigger_name_map) | 86 c, slaves, m_remote_run_chromium_src, trigger_name_map) |
| (...skipping 18 matching lines...) Expand all Loading... |
| 105 # Buildbot master url: | 105 # Buildbot master url: |
| 106 # Must come before AutoSetupMaster(). | 106 # Must come before AutoSetupMaster(). |
| 107 c['buildbotURL'] = ActiveMaster.buildbot_url | 107 c['buildbotURL'] = ActiveMaster.buildbot_url |
| 108 | 108 |
| 109 # Adds common status and tools to this master. | 109 # Adds common status and tools to this master. |
| 110 master_utils.AutoSetupMaster(c, ActiveMaster, | 110 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 111 public_html='../master.chromium/public_html', | 111 public_html='../master.chromium/public_html', |
| 112 templates=['../master.chromium/templates'], | 112 templates=['../master.chromium/templates'], |
| 113 tagComparator=master_poller.comparator, | 113 tagComparator=master_poller.comparator, |
| 114 enable_http_status_push=ActiveMaster.is_production_host) | 114 enable_http_status_push=ActiveMaster.is_production_host) |
| OLD | NEW |