| 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 ## Release | 31 ## Release |
| 26 ################################################################################ | 32 ################################################################################ |
| 27 | 33 |
| 28 # Archive location | 34 # Archive location |
| 29 rel_archive = master_config.GetGSUtilUrl('chromium-build-transfer', | 35 rel_archive = master_config.GetGSUtilUrl('chromium-build-transfer', |
| 30 'WebKit Win Builder') | 36 'WebKit Win Builder') |
| 31 | 37 |
| 32 # | 38 # |
| 33 # Triggerable scheduler for testers | 39 # Triggerable scheduler for testers |
| 34 # | 40 # |
| 35 T('s4_webkit_rel_trigger') | 41 T('s4_webkit_rel_trigger') |
| 36 | 42 |
| 37 # | 43 # |
| 38 # Win Rel Builder | 44 # Win Rel Builder |
| 39 # | 45 # |
| 40 B('WebKit Win Builder', 'f_webkit_win_rel', | 46 B('WebKit Win Builder', 'f_webkit_win_rel', |
| 41 scheduler='global_scheduler', builddir='webkit-win-latest-rel', | 47 scheduler='global_scheduler', builddir='webkit-win-latest-rel', |
| 42 auto_reboot=False) | 48 auto_reboot=False) |
| 43 F('f_webkit_win_rel', m_annotator.BaseFactory( | 49 F('f_webkit_win_rel', m_remote_run( |
| 44 'chromium', triggers=['s4_webkit_rel_trigger'])) | 50 'chromium', triggers=['s4_webkit_rel_trigger'])) |
| 45 | 51 |
| 46 # | 52 # |
| 47 # Win Rel WebKit testers | 53 # Win Rel WebKit testers |
| 48 # | 54 # |
| 49 B('WebKit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger') | 55 B('WebKit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger') |
| 50 B('WebKit Win10', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger') | 56 B('WebKit Win10', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger') |
| 51 F('f_webkit_rel_tests', m_annotator.BaseFactory('chromium')) | 57 F('f_webkit_rel_tests', m_remote_run('chromium')) |
| 52 | 58 |
| 53 # | 59 # |
| 54 # Win x64 Rel Builder (note: currently no x64 testers) | 60 # Win x64 Rel Builder (note: currently no x64 testers) |
| 55 # | 61 # |
| 56 B('WebKit Win x64 Builder', 'f_webkit_win_rel_x64', | 62 B('WebKit Win x64 Builder', 'f_webkit_win_rel_x64', |
| 57 scheduler='global_scheduler', builddir='webkit-win-latest-rel-x64', | 63 scheduler='global_scheduler', builddir='webkit-win-latest-rel-x64', |
| 58 auto_reboot=False) | 64 auto_reboot=False) |
| 59 F('f_webkit_win_rel_x64', m_annotator.BaseFactory('chromium')) | 65 F('f_webkit_win_rel_x64', m_remote_run('chromium')) |
| 60 | 66 |
| 61 | 67 |
| 62 ################################################################################ | 68 ################################################################################ |
| 63 ## Debug | 69 ## Debug |
| 64 ################################################################################ | 70 ################################################################################ |
| 65 | 71 |
| 66 # | 72 # |
| 67 # Triggerable scheduler for testers | 73 # Triggerable scheduler for testers |
| 68 # | 74 # |
| 69 T('s4_webkit_dbg_trigger') | 75 T('s4_webkit_dbg_trigger') |
| 70 | 76 |
| 71 # | 77 # |
| 72 # Win Dbg Builder | 78 # Win Dbg Builder |
| 73 # | 79 # |
| 74 B('WebKit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='global_scheduler', | 80 B('WebKit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='global_scheduler', |
| 75 builddir='webkit-win-latest-dbg', auto_reboot=False) | 81 builddir='webkit-win-latest-dbg', auto_reboot=False) |
| 76 F('f_webkit_win_dbg', m_annotator.BaseFactory('chromium', | 82 F('f_webkit_win_dbg', m_remote_run('chromium', |
| 77 triggers=['s4_webkit_dbg_trigger'])) | 83 triggers=['s4_webkit_dbg_trigger'])) |
| 78 | 84 |
| 79 # | 85 # |
| 80 # Win Dbg WebKit testers | 86 # Win Dbg WebKit testers |
| 81 # | 87 # |
| 82 | 88 |
| 83 B('WebKit Win7 (dbg)', 'f_webkit_dbg_tests', | 89 B('WebKit Win7 (dbg)', 'f_webkit_dbg_tests', |
| 84 scheduler='s4_webkit_dbg_trigger') | 90 scheduler='s4_webkit_dbg_trigger') |
| 85 F('f_webkit_dbg_tests', m_annotator.BaseFactory('chromium')) | 91 F('f_webkit_dbg_tests', m_remote_run('chromium')) |
| 86 | 92 |
| 87 # | 93 # |
| 88 # Win x64 Dbg Builder (note: currently no x64 testers) | 94 # Win x64 Dbg Builder (note: currently no x64 testers) |
| 89 # | 95 # |
| 90 B('WebKit Win x64 Builder (dbg)', 'f_webkit_win_dbg_x64', | 96 B('WebKit Win x64 Builder (dbg)', 'f_webkit_win_dbg_x64', |
| 91 scheduler='global_scheduler', builddir='webkit-win-latest-dbg-x64', | 97 scheduler='global_scheduler', builddir='webkit-win-latest-dbg-x64', |
| 92 auto_reboot=False) | 98 auto_reboot=False) |
| 93 F('f_webkit_win_dbg_x64', m_annotator.BaseFactory('chromium')) | 99 F('f_webkit_win_dbg_x64', m_remote_run('chromium')) |
| 94 | 100 |
| 95 def Update(_config, _active_master, c): | 101 def Update(_config, _active_master, c): |
| 96 return helper.Update(c) | 102 return helper.Update(c) |
| OLD | NEW |