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

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

Issue 2156443003: tryserver.chromium.win: convert chromium_trybot builders to remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: presubmit 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.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.tryserver.chromium.win/master.cfg
diff --git a/masters/master.tryserver.chromium.win/master.cfg b/masters/master.tryserver.chromium.win/master.cfg
index 0585c233d28aabbebb613a49a69852da1aea6187..0160365122bcf258db08856fa950d708e7d96429 100644
--- a/masters/master.tryserver.chromium.win/master.cfg
+++ b/masters/master.tryserver.chromium.win/master.cfg
@@ -17,6 +17,7 @@ from master import master_utils
from master import slaves_list
from master.builders_pools import BuildersPools
from master.factory import annotator_factory
+from master.factory import remote_run_factory
from master.try_job_http import TryJobHTTP
from master.try_job_svn import TryJobSubversion
@@ -59,61 +60,68 @@ def baseFactory(recipe, factory_properties=None, **kwargs):
})
return m_annotator.BaseFactory(recipe, factory_properties=fp, **kwargs)
+
+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)
+
+
for targ in ('_rel', '_dbg'):
chromium_builders.extend([{
'name': 'win_chromium%s_ng' % targ,
- 'factory': baseFactory(
+ 'factory': m_remote_run(
'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
- # Share build directory with compatible existing builders to save space.
- 'slavebuilddir': 'win'
+ 'slavebuilddir': 'remote_run'
}, {
'name': 'win_chromium_compile%s_ng' % targ,
- 'factory': baseFactory(
+ 'factory': m_remote_run(
'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
- # Share build directory with compatible existing builders to save space.
- 'slavebuilddir': 'win'
+ 'slavebuilddir': 'remote_run'
}])
chromium_builders.append({
'name': 'win10_chromium_x64_rel_ng',
- 'factory': baseFactory('chromium_trybot', timeout=3600),
- # Share build directory with compatible existing builders to save space.
- 'slavebuilddir': 'win',
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win10_chromium_x64_rel_ng_exp',
- 'factory': baseFactory('chromium_trybot', timeout=3600),
- # Share build directory with compatible existing builders to save space.
- 'slavebuilddir': 'win',
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_archive',
- 'factory': baseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_x64_archive',
- 'factory': baseFactory('chromium_trybot', timeout=3600),
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_chromium_x64_rel_ng',
- 'factory': baseFactory(
+ 'factory': m_remote_run(
'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
- # Share build directory with compatible existing builders to save space.
- 'slavebuilddir': 'win'
+ 'slavebuilddir': 'remote_run'
})
chromium_builders.extend([{
'name': 'win8_chromium_gyp_rel',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win_gyp',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
},{
'name': 'win8_chromium_gyp_dbg',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win_gyp',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
},{
'name': 'win8_chromium_gn_upload',
'factory': baseFactory('chromium_gn_upload'),
@@ -135,49 +143,48 @@ chromium_builders.append({
chromium_builders.append({
'name': 'win_chrome_official',
- 'factory': baseFactory('chromium', timeout=4800),
- 'slavebuilddir': 'win_chrome',
+ 'factory': m_remote_run('chromium_trybot', timeout=4800),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_chromium_syzyasan_rel',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
})
# Experimental clang/win bots
chromium_builders.append({
'name': 'win_clang',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win_clang',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_clang_dbg',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win_clang',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_clang_rel',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win_clang',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_clang_x64_dbg',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win_clang',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
})
chromium_builders.append({
'name': 'win_clang_x64_rel',
- 'factory': baseFactory('chromium_trybot'),
- 'slavebuilddir': 'win_clang',
+ 'factory': m_remote_run('chromium_trybot'),
+ 'slavebuilddir': 'remote_run',
})
# Optional GPU tryserver.
chromium_builders.append({
'name': 'win_optional_gpu_tests_rel',
- 'factory': baseFactory('chromium_trybot', timeout=3600),
- # Share build directory with compatible existing builders to save space.
- 'slavebuilddir': 'win'
+ 'factory': m_remote_run('chromium_trybot', timeout=3600),
+ 'slavebuilddir': 'remote_run'
})
# NaCl SDK try bots
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/chromium.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698