| Index: masters/master.chromium.infra/master.cfg
|
| diff --git a/masters/master.chromium.infra/master.cfg b/masters/master.chromium.infra/master.cfg
|
| index cbff86a9ad80d1667cef70569180b7c8bb2cf1da..134a098df51572be83a1aea13a2e27819311dd45 100644
|
| --- a/masters/master.chromium.infra/master.cfg
|
| +++ b/masters/master.chromium.infra/master.cfg
|
| @@ -15,7 +15,7 @@ from buildbot.status import mail
|
| from master import gitiles_poller
|
| from master import master_utils
|
| from master import slaves_list
|
| -from master.factory import annotator_factory
|
| +from master.factory import remote_run_factory
|
|
|
|
|
| ActiveMaster = master_site_config.Infra
|
| @@ -27,7 +27,13 @@ c['builders'] = []
|
| c['change_source'] = []
|
| c['status'] = []
|
|
|
| -f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster)
|
| +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)
|
|
|
| ####### DATABASE
|
|
|
| @@ -83,139 +89,139 @@ c['builders'].extend([
|
| {
|
| 'name': 'infra-continuous-xenial-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-wily-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-trusty-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-trusty-32',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-precise-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-precise-32',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-mac-10.11-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-mac-10.10-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-mac-10.9-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-mac-10.8-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-mac-10.7-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-mac-10.6-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-win-32',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'infra-continuous-win-64',
|
| 'slavebuilddir': 'infra-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/infra_continuous'),
|
| + 'factory': m_remote_run('infra/infra_continuous'),
|
| 'category': '1continuous',
|
| },
|
| {
|
| 'name': 'luci-gae-trusty64',
|
| - 'factory': f_annotations.BaseFactory('infra/luci_gae'),
|
| + 'factory': m_remote_run('infra/luci_gae'),
|
| 'category': 'luci-gae',
|
| },
|
| {
|
| 'name': 'luci-go-trusty64',
|
| - 'factory': f_annotations.BaseFactory('infra/luci_go'),
|
| + 'factory': m_remote_run('infra/luci_go'),
|
| 'category': 'luci-go',
|
| },
|
| {
|
| 'name': 'luci-go-precise32',
|
| - 'factory': f_annotations.BaseFactory('infra/luci_go'),
|
| + 'factory': m_remote_run('infra/luci_go'),
|
| 'category': 'luci-go',
|
| },
|
| {
|
| 'name': 'luci-go-osx',
|
| - 'factory': f_annotations.BaseFactory('infra/luci_go'),
|
| + 'factory': m_remote_run('infra/luci_go'),
|
| 'category': 'luci-go',
|
| },
|
| {
|
| 'name': 'luci-go-win64',
|
| - 'factory': f_annotations.BaseFactory('infra/luci_go'),
|
| + 'factory': m_remote_run('infra/luci_go'),
|
| 'category': 'luci-go',
|
| },
|
| {
|
| 'name': 'conda-cipd-pkg-trusty-64',
|
| 'slavebuilddir': 'conda-cipd-pkg',
|
| - 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'),
|
| + 'factory': m_remote_run('infra/build_conda_cipd_pkg'),
|
| 'category': 'zconda',
|
| },
|
| {
|
| 'name': 'conda-cipd-pkg-mac-10.9-64',
|
| 'slavebuilddir': 'conda-cipd-pkg',
|
| - 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'),
|
| + 'factory': m_remote_run('infra/build_conda_cipd_pkg'),
|
| 'category': 'zconda',
|
| },
|
| {
|
| 'name': 'conda-cipd-pkg-win-64',
|
| 'slavebuilddir': 'conda-cipd-pkg',
|
| - 'factory': f_annotations.BaseFactory('infra/build_conda_cipd_pkg'),
|
| + 'factory': m_remote_run('infra/build_conda_cipd_pkg'),
|
| 'category': 'zconda',
|
| },
|
| {
|
| 'name': 'recipes-py-continuous',
|
| - 'factory': f_annotations.BaseFactory('infra/recipes_py_continuous'),
|
| + 'factory': m_remote_run('infra/recipes_py_continuous'),
|
| 'category': 'recipes-py',
|
| },
|
| {
|
| 'name': 'depot_tools zip uploader',
|
| 'slavebuilddir': 'depot_tools_uploader',
|
| - 'factory': f_annotations.BaseFactory('infra/depot_tools_builder'),
|
| + 'factory': m_remote_run('infra/depot_tools_builder'),
|
| 'category': 'depot_tools',
|
| },
|
| ])
|
|
|