| 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 | 5 |
| 6 from master import master_config | 6 from master import master_config |
| 7 from master.factory import annotator_factory | 7 from master.factory import remote_run_factory |
| 8 | 8 |
| 9 import master_site_config | 9 import master_site_config |
| 10 | 10 |
| 11 ActiveMaster = master_site_config.ChromiumWebkit | 11 ActiveMaster = master_site_config.ChromiumWebkit |
| 12 | 12 |
| 13 defaults = {} | 13 defaults = {} |
| 14 | 14 |
| 15 helper = master_config.Helper(defaults) | 15 helper = master_config.Helper(defaults) |
| 16 B = helper.Builder | 16 B = helper.Builder |
| 17 F = helper.Factory | 17 F = helper.Factory |
| 18 T = helper.Triggerable | 18 T = helper.Triggerable |
| 19 | 19 |
| 20 m_annotator = annotator_factory.AnnotatorFactory() | 20 def m_remote_run(recipe, **kwargs): |
| 21 return remote_run_factory.RemoteRunFactory( |
| 22 active_master=ActiveMaster, |
| 23 repository='https://chromium.googlesource.com/chromium/tools/build.git', |
| 24 recipe=recipe, |
| 25 factory_properties={'path_config': 'kitchen'}, |
| 26 **kwargs) |
| 21 | 27 |
| 22 | 28 |
| 23 ################################################################################ | 29 ################################################################################ |
| 24 ## Release | 30 ## Release |
| 25 ################################################################################ | 31 ################################################################################ |
| 26 | 32 |
| 27 defaults['category'] = 'layout' | 33 defaults['category'] = 'layout' |
| 28 | 34 |
| 29 # | 35 # |
| 30 # Triggerable scheduler for the builder | 36 # Triggerable scheduler for the builder |
| 31 # | 37 # |
| 32 T('android_rel_trigger') | 38 T('android_rel_trigger') |
| 33 | 39 |
| 34 # | 40 # |
| 35 # Android Rel Builder | 41 # Android Rel Builder |
| 36 # | 42 # |
| 37 B('Android Builder', 'f_android_rel', scheduler='global_scheduler') | 43 B('Android Builder', 'f_android_rel', scheduler='global_scheduler') |
| 38 F('f_android_rel', m_annotator.BaseFactory( | 44 F('f_android_rel', m_remote_run('chromium', triggers=['android_rel_trigger'])) |
| 39 'chromium', triggers=['android_rel_trigger'])) | |
| 40 | 45 |
| 41 B('WebKit Android (Nexus4)', 'f_webkit_android_tests', None, | 46 B('WebKit Android (Nexus4)', 'f_webkit_android_tests', None, |
| 42 'android_rel_trigger') | 47 'android_rel_trigger') |
| 43 F('f_webkit_android_tests', m_annotator.BaseFactory('chromium')) | 48 F('f_webkit_android_tests', m_remote_run('chromium')) |
| 44 | 49 |
| 45 def Update(_config, _active_master, c): | 50 def Update(_config, _active_master, c): |
| 46 return helper.Update(c) | 51 return helper.Update(c) |
| OLD | NEW |