| Index: masters/master.chromium.infra/master.cfg
|
| diff --git a/masters/master.chromium.infra/master.cfg b/masters/master.chromium.infra/master.cfg
|
| index ca3137b1ee5fcc9df7acd9c82aba7aeda23ea550..3d9df8fc6ac656d90810b7ac5019aaf6f53d5a8e 100644
|
| --- a/masters/master.chromium.infra/master.cfg
|
| +++ b/masters/master.chromium.infra/master.cfg
|
| @@ -32,12 +32,15 @@ c['status'] = []
|
| f_annotations = annotator_factory.AnnotatorFactory(ActiveMaster)
|
|
|
| def m_remote_run(recipe, **kwargs):
|
| + props = {'path_config': 'kitchen'}
|
| + props.update(kwargs.pop('properties', {}))
|
| return remote_run_factory.RemoteRunFactory(
|
| - active_master=ActiveMaster,
|
| - repository='https://chromium.googlesource.com/infra/infra.git',
|
| - recipe=recipe,
|
| - factory_properties={'path_config': 'kitchen'},
|
| - **kwargs)
|
| + active_master=ActiveMaster,
|
| + repository=kwargs.pop(
|
| + 'repository', 'https://chromium.googlesource.com/infra/infra.git'),
|
| + recipe=recipe,
|
| + factory_properties=props,
|
| + **kwargs)
|
|
|
| revision_getter = master_utils.ConditionalProperty(
|
| lambda build: build.getProperty('revision'),
|
| @@ -58,6 +61,7 @@ LUCI_GAE_REPO_URL = (
|
| RECIPES_PY_REPO_URL = (
|
| 'https://chromium.googlesource.com/external/github.com/luci/recipes-py')
|
| DEPOT_TOOLS_URL = 'https://chromium.googlesource.com/chromium/tools/depot_tools'
|
| +TOOLS_BUILD_URL = 'https://chromium.googlesource.com/chromium/tools/build'
|
| CHROMIUM_REPO_URL = 'https://chromium.googlesource.com/chromium/src'
|
|
|
| c['change_source'].extend([
|
| @@ -187,6 +191,27 @@ c['builders'].extend([
|
| 'category': 'recipes-py',
|
| },
|
| {
|
| + 'name': 'recipe_engine-recipes-tests',
|
| + 'factory': m_remote_run(
|
| + 'infra/recipe_simulation', repository=TOOLS_BUILD_URL,
|
| + properties={'repo_under_test': 'recipe_engine'}),
|
| + 'category': 'recipes-continuous',
|
| + },
|
| + {
|
| + 'name': 'build-recipes-tests',
|
| + 'factory': m_remote_run(
|
| + 'infra/recipe_simulation', repository=TOOLS_BUILD_URL,
|
| + properties={'repo_under_test': 'build'}),
|
| + 'category': 'recipes-continuous',
|
| + },
|
| + {
|
| + 'name': 'depot_tools-recipes-tests',
|
| + 'factory': m_remote_run(
|
| + 'infra/recipe_simulation', repository=TOOLS_BUILD_URL,
|
| + properties={'repo_under_test': 'depot_tools'}),
|
| + 'category': 'recipes-continuous',
|
| + },
|
| + {
|
| 'name': 'depot_tools zip uploader',
|
| 'slavebuilddir': 'depot_tools_uploader',
|
| 'factory': m_remote_run('depot_tools_builder'),
|
| @@ -254,6 +279,15 @@ c['schedulers'].extend([
|
| treeStableTimer=1,
|
| builderNames=[
|
| 'recipes-py-continuous',
|
| + 'recipe_engine-recipes-tests'
|
| + ]
|
| + ),
|
| + AnyBranchScheduler(
|
| + name='build-scheduler',
|
| + change_filter=ChangeFilter(project=['build']),
|
| + treeStableTimer=1,
|
| + builderNames=[
|
| + 'build-recipes-tests'
|
| ]
|
| ),
|
| AnyBranchScheduler(
|
| @@ -262,6 +296,7 @@ c['schedulers'].extend([
|
| treeStableTimer=1,
|
| builderNames=[
|
| 'depot_tools zip uploader',
|
| + 'depot_tools-recipes-tests'
|
| ]
|
| ),
|
| AnyBranchScheduler(
|
|
|