Chromium Code Reviews| Index: masters/master.tryserver.chromium.perf/master.cfg |
| diff --git a/masters/master.tryserver.chromium.perf/master.cfg b/masters/master.tryserver.chromium.perf/master.cfg |
| index 389082fe021525d44640f5d3275107d80bcfb8ca..cdc3a9e9de381c55f803dbdcc7a5a3e899043a26 100644 |
| --- a/masters/master.tryserver.chromium.perf/master.cfg |
| +++ b/masters/master.tryserver.chromium.perf/master.cfg |
| @@ -15,6 +15,7 @@ from master import master_utils |
| from master import slaves_list |
| from master.builders_pools import BuildersPools |
| from master.factory import annotator_factory |
| +from master.factory import remote_run_factory |
| from master.try_job_http import TryJobHTTP |
| from master.try_job_svn import TryJobSubversion |
| @@ -23,6 +24,18 @@ import master_site_config |
| ActiveMaster = master_site_config.ChromiumPerfTryServer |
| +def m_remote_run(recipe, factory_properties=None, **kwargs): |
| + if not factory_properties: |
|
tandrii(chromium)
2016/07/19 12:44:32
why do you need this and below condition if it's n
Paweł Hajdan Jr.
2016/07/19 12:49:30
It's reasonably generic and uniform with e.g. chro
tandrii(chromium)
2016/07/19 12:58:29
fair enough.
|
| + factory_properties = {} |
| + if not factory_properties.get('path_config'): |
| + factory_properties['path_config'] = 'kitchen' |
| + return remote_run_factory.RemoteRunFactory( |
| + active_master=ActiveMaster, |
| + repository='https://chromium.googlesource.com/chromium/tools/build.git', |
| + recipe=recipe, |
| + factory_properties=factory_properties, |
| + **kwargs) |
| + |
| MAIL_NOTIFIER = ActiveMaster.is_production_host |
| LISTEN_TO_SVN = ActiveMaster.svn_url and ActiveMaster.is_production_host |
| @@ -50,14 +63,16 @@ def _CategoryIndex(category): |
| def _AddBisectBuilder(name, platform, category, upload_dir, timeout=2400): |
| if platform == 'android': |
| recipe = 'android/builder' |
| + factory = annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory |
| else: |
| recipe = 'chromium' |
| + factory = m_remote_run |
| properties = { |
| 'append_deps_patch_sha': True, |
| 'build_url': master_config.GetGSUtilUrl('chrome-perf', upload_dir)} |
|
tandrii(chromium)
2016/07/19 12:44:32
because of this... (see other comment)
|
| c['builders'].append({ |
| 'name': '%s_bisect_builder' % name, |
| - 'factory': annotator_factory.AnnotatorFactory(ActiveMaster).BaseFactory( |
| + 'factory': factory( |
| factory_properties=properties, |
| recipe=recipe, |
| timeout=timeout), |