| Index: masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py
|
| diff --git a/masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py b/masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py
|
| index f88ce7ccf4d383b4cb1a65e1207273bdf8d01203..1df3ca2a7d7897b0f124864f73a23653099a311f 100644
|
| --- a/masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py
|
| +++ b/masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py
|
| @@ -19,7 +19,7 @@
|
| # If you have questions about this, you can ask nsylvain.
|
|
|
| from master import master_config
|
| -from master.factory import annotator_factory
|
| +from master.factory import remote_run_factory
|
|
|
| import master_site_config
|
|
|
| @@ -33,7 +33,13 @@ F = helper.Factory
|
| T = helper.Triggerable
|
|
|
|
|
| -m_annotator = annotator_factory.AnnotatorFactory()
|
| +def m_remote_run(recipe, **kwargs):
|
| + return remote_run_factory.RemoteRunFactory(
|
| + active_master=ActiveMaster,
|
| + repository='https://chromium.googlesource.com/chromium/tools/build.git',
|
| + recipe=recipe,
|
| + factory_properties={'path_config': 'kitchen'},
|
| + **kwargs)
|
|
|
| defaults['category'] = 'layout'
|
|
|
| @@ -52,7 +58,7 @@ T('s5_webkit_rel_trigger')
|
| B('WebKit Mac Builder', 'f_webkit_mac_rel',
|
| auto_reboot=False, scheduler='global_scheduler',
|
| builddir='webkit-mac-latest-rel')
|
| -F('f_webkit_mac_rel', m_annotator.BaseFactory(
|
| +F('f_webkit_mac_rel', m_remote_run(
|
| 'chromium', triggers=['s5_webkit_rel_trigger']))
|
|
|
| #
|
| @@ -61,19 +67,19 @@ F('f_webkit_mac_rel', m_annotator.BaseFactory(
|
|
|
| B('WebKit Mac10.9', 'f_webkit_rel_tests_109',
|
| scheduler='s5_webkit_rel_trigger')
|
| -F('f_webkit_rel_tests_109', m_annotator.BaseFactory('chromium'))
|
| +F('f_webkit_rel_tests_109', m_remote_run('chromium'))
|
|
|
| B('WebKit Mac10.10', 'f_webkit_rel_tests_1010',
|
| scheduler='s5_webkit_rel_trigger')
|
| -F('f_webkit_rel_tests_1010', m_annotator.BaseFactory('chromium'))
|
| +F('f_webkit_rel_tests_1010', m_remote_run('chromium'))
|
|
|
| B('WebKit Mac10.11', 'f_webkit_rel_tests_1011',
|
| scheduler='s5_webkit_rel_trigger')
|
| -F('f_webkit_rel_tests_1011', m_annotator.BaseFactory('chromium'))
|
| +F('f_webkit_rel_tests_1011', m_remote_run('chromium'))
|
|
|
| B('WebKit Mac10.11 (retina)', 'f_webkit_rel_tests_1011_retina',
|
| scheduler='s5_webkit_rel_trigger')
|
| -F('f_webkit_rel_tests_1011_retina', m_annotator.BaseFactory('chromium'))
|
| +F('f_webkit_rel_tests_1011_retina', m_remote_run('chromium'))
|
|
|
|
|
| ################################################################################
|
| @@ -94,7 +100,7 @@ T('s5_webkit_dbg_trigger')
|
| #
|
| B('WebKit Mac Builder (dbg)', 'f_webkit_mac_dbg', auto_reboot=False,
|
| scheduler='global_scheduler', builddir='webkit-mac-latest-dbg')
|
| -F('f_webkit_mac_dbg', m_annotator.BaseFactory(
|
| +F('f_webkit_mac_dbg', m_remote_run(
|
| 'chromium', triggers=['s5_webkit_dbg_trigger']))
|
|
|
| #
|
| @@ -103,7 +109,7 @@ F('f_webkit_mac_dbg', m_annotator.BaseFactory(
|
|
|
| B('WebKit Mac10.11 (dbg)', 'f_webkit_dbg_tests',
|
| scheduler='s5_webkit_dbg_trigger')
|
| -F('f_webkit_dbg_tests', m_annotator.BaseFactory('chromium'))
|
| +F('f_webkit_dbg_tests', m_remote_run('chromium'))
|
|
|
|
|
| ################################################################################
|
|
|