| 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 master import master_config | 5 from master import master_config |
| 6 from master.factory import annotator_factory | 6 from master.factory import remote_run_factory |
| 7 | 7 |
| 8 import master_site_config | 8 import master_site_config |
| 9 | 9 |
| 10 ActiveMaster = master_site_config.ChromiumWebkit | 10 ActiveMaster = master_site_config.ChromiumWebkit |
| 11 | 11 |
| 12 defaults = {} | 12 defaults = {} |
| 13 | 13 |
| 14 helper = master_config.Helper(defaults) | 14 helper = master_config.Helper(defaults) |
| 15 B = helper.Builder | 15 B = helper.Builder |
| 16 F = helper.Factory | 16 F = helper.Factory |
| 17 T = helper.Triggerable | 17 T = helper.Triggerable |
| 18 | 18 |
| 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 defaults['category'] = 'layout' | 28 defaults['category'] = 'layout' |
| 23 | 29 |
| 24 | 30 |
| 25 ################################################################################ | 31 ################################################################################ |
| 26 ## Release | 32 ## Release |
| 27 ################################################################################ | 33 ################################################################################ |
| 28 | 34 |
| 29 # | 35 # |
| 30 # Linux Rel Builder/Tester | 36 # Linux Rel Builder/Tester |
| 31 # | 37 # |
| 32 # FIXME: Rename this builder to indicate that it is running precise. | 38 # FIXME: Rename this builder to indicate that it is running precise. |
| 33 B('WebKit Linux', 'f_webkit_linux_rel', scheduler='global_scheduler') | 39 B('WebKit Linux', 'f_webkit_linux_rel', scheduler='global_scheduler') |
| 34 F('f_webkit_linux_rel', m_annotator.BaseFactory('chromium')) | 40 F('f_webkit_linux_rel', m_remote_run('chromium')) |
| 35 | 41 |
| 36 B('WebKit Linux Trusty', 'f_webkit_linux_rel_trusty', | 42 B('WebKit Linux Trusty', 'f_webkit_linux_rel_trusty', |
| 37 scheduler='global_scheduler') | 43 scheduler='global_scheduler') |
| 38 F('f_webkit_linux_rel_trusty', m_annotator.BaseFactory('chromium')) | 44 F('f_webkit_linux_rel_trusty', m_remote_run('chromium')) |
| 39 | 45 |
| 40 B('WebKit Linux ASAN', 'f_webkit_linux_rel_asan', scheduler='global_scheduler', | 46 B('WebKit Linux ASAN', 'f_webkit_linux_rel_asan', scheduler='global_scheduler', |
| 41 auto_reboot=True) | 47 auto_reboot=True) |
| 42 F('f_webkit_linux_rel_asan', m_annotator.BaseFactory('chromium')) | 48 F('f_webkit_linux_rel_asan', m_remote_run('chromium')) |
| 43 | 49 |
| 44 B('WebKit Linux MSAN', 'f_webkit_linux_rel_msan', scheduler='global_scheduler', | 50 B('WebKit Linux MSAN', 'f_webkit_linux_rel_msan', scheduler='global_scheduler', |
| 45 auto_reboot=True) | 51 auto_reboot=True) |
| 46 F('f_webkit_linux_rel_msan', m_annotator.BaseFactory('chromium')) | 52 F('f_webkit_linux_rel_msan', m_remote_run('chromium')) |
| 47 | 53 |
| 48 B('WebKit Linux Leak', 'f_webkit_linux_leak_rel', scheduler='global_scheduler', | 54 B('WebKit Linux Leak', 'f_webkit_linux_leak_rel', scheduler='global_scheduler', |
| 49 category='layout') | 55 category='layout') |
| 50 F('f_webkit_linux_leak_rel', m_annotator.BaseFactory('chromium')) | 56 F('f_webkit_linux_leak_rel', m_remote_run('chromium')) |
| 51 | 57 |
| 52 | 58 |
| 53 ################################################################################ | 59 ################################################################################ |
| 54 ## Debug | 60 ## Debug |
| 55 ################################################################################ | 61 ################################################################################ |
| 56 | 62 |
| 57 # | 63 # |
| 58 # Linux Dbg Webkit builders/testers | 64 # Linux Dbg Webkit builders/testers |
| 59 # | 65 # |
| 60 | 66 |
| 61 B('WebKit Linux (dbg)', 'f_webkit_dbg_tests', scheduler='global_scheduler', | 67 B('WebKit Linux (dbg)', 'f_webkit_dbg_tests', scheduler='global_scheduler', |
| 62 auto_reboot=True) | 68 auto_reboot=True) |
| 63 F('f_webkit_dbg_tests', m_annotator.BaseFactory('chromium')) | 69 F('f_webkit_dbg_tests', m_remote_run('chromium')) |
| 64 | 70 |
| 65 | 71 |
| 66 def Update(_config, _active_master, c): | 72 def Update(_config, _active_master, c): |
| 67 return helper.Update(c) | 73 return helper.Update(c) |
| OLD | NEW |