Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1148)

Unified Diff: masters/master.tryserver.chromium.angle/master.cfg

Issue 2164543003: tryserver.chromium.angle: convert to remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.tryserver.chromium.angle/master.cfg
diff --git a/masters/master.tryserver.chromium.angle/master.cfg b/masters/master.tryserver.chromium.angle/master.cfg
index 0941a052009d6f64ceeaa266fccf5bb14f940841..c4e72272aa7f38ae981d237c8a4072064e71a331 100644
--- a/masters/master.tryserver.chromium.angle/master.cfg
+++ b/masters/master.tryserver.chromium.angle/master.cfg
@@ -13,7 +13,7 @@ import socket
# These modules come from scripts, which must be in the PYTHONPATH.
from master import master_utils
from master import slaves_list
-from master.factory import annotator_factory
+from master.factory import remote_run_factory
from master.try_job_gerrit import TryJobGerritScheduler
from master.try_job_gerrit import TryJobGerritStatus
@@ -22,7 +22,13 @@ import master_site_config
ActiveMaster = master_site_config.TryServerANGLE
-m_annotator = 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)
# This is the dictionary that the buildmaster pays attention to. We also use
# a shorter alias to save typing.
@@ -44,7 +50,7 @@ c['builders'] = []
# ANGLE Android bots
c['builders'].append({
'name': 'android_angle_rel_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'android',
})
@@ -52,19 +58,19 @@ c['builders'].append({
# ANGLE linux bots
c['builders'].append({
'name': 'linux_angle_rel_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'linux',
})
c['builders'].append({
'name': 'linux_angle_dbg_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'linux',
})
c['builders'].append({
'name': 'linux_angle_chromeos_rel_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'linux_chromeos',
})
@@ -72,13 +78,13 @@ c['builders'].append({
# ANGLE mac bots
c['builders'].append({
'name': 'mac_angle_rel_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'mac',
})
c['builders'].append({
'name': 'mac_angle_dbg_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'mac',
})
@@ -86,25 +92,25 @@ c['builders'].append({
# ANGLE win bots
c['builders'].append({
'name': 'win_angle_rel_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'win',
})
c['builders'].append({
'name': 'win_angle_dbg_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'win',
})
c['builders'].append({
'name': 'win_angle_x64_rel_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'win',
})
c['builders'].append({
'name': 'win_angle_x64_dbg_ng',
- 'factory': m_annotator.BaseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
# Share build directory with compatible existing builders to save space.
'slavebuilddir': 'win',
})
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698