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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11365154: Do not build 'all' on all the try builders by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: win_ash -> aura_builder Created 8 years, 1 month 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index 572f5c8985872460d255f6a2407b18c86548db89..4c50dddc4e98bbbd6e45d088ebdde1f46a817312 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -99,9 +99,10 @@ def NextJob(builder, requests):
def CreateBuilder(platform, builder_name, target,
- tests=None, options=None,
+ options, tests,
slavebuilddir=None,
- factory_properties=None, annotation_script=None,
+ factory_properties=None,
+ annotation_script=None,
ninja=True,
goma=False,
clang=False):
@@ -173,10 +174,6 @@ def CreateBuilder(platform, builder_name, target,
'mac_alt', 'mac_rel_alt', 'win',
'win_rel')
- # Ensure that all targets are build when compiling with swarm enabled.
- if enable_swarm_tests:
- options.append('all')
-
compile_timeout = 2400
if annotation_script:
# Note new slave type AnnotatedTrybot; we don't want a compile step added
@@ -341,6 +338,7 @@ b_linux = CreateBuilder(
platform='linux',
target='Debug',
goma=True,
+ options=['chromium_builder_tests'],
tests=linux_tests,
builder_name='linux',
factory_properties={'sharded_tests': linux_sharded})
@@ -349,6 +347,7 @@ b_linux_futura = CreateBuilder(
platform='linux',
target='Release',
goma=True,
+ options=['chromium_builder_tests'],
tests=linux_tests,
builder_name='linux_futura',
factory_properties={
@@ -432,6 +431,7 @@ b_linux_rel = CreateBuilder(
platform='linux',
target='Release',
goma=True,
+ options=['chromium_builder_tests'],
tests=linux_tests + ['sizes'],
builder_name='linux_rel',
slavebuilddir='linux',
@@ -444,6 +444,7 @@ b_linux_rel_naclmore = CreateBuilder(
platform='linux',
target='Release',
goma=True,
+ options=['nacl_integration'],
tests=['nacl_integration'],
builder_name='linux_rel_naclmore',
slavebuilddir='linux',
@@ -453,6 +454,7 @@ b_linux_rel_alt = CreateBuilder(
platform='linux',
target='Release',
goma=True,
+ options=['chromium_builder_tests'],
tests=linux_tests + ['sizes'],
builder_name='linux_rel_alt',
slavebuilddir='linux',
@@ -465,6 +467,7 @@ b_linux_rel_precise = CreateBuilder(
platform='linux',
target='Release',
goma=True,
+ options=['chromium_builder_tests'],
tests=linux_tests + ['sizes'],
builder_name='linux_rel_precise',
slavebuilddir='linux_precise',
@@ -527,6 +530,7 @@ mac_tests = [
b_mac = CreateBuilder(
platform='mac',
target='Debug',
+ options=['chromium_builder_tests'],
tests=mac_tests,
builder_name='mac',
goma=True,
@@ -538,6 +542,7 @@ pools['chrome'].append('mac')
b_mac_alt = CreateBuilder(
platform='mac',
target='Debug',
+ options=['chromium_builder_tests'],
tests=mac_tests,
builder_name='mac_alt',
goma=True,
@@ -547,6 +552,7 @@ b_mac_alt = CreateBuilder(
b_mac_rel = CreateBuilder(
platform='mac',
target='Release',
+ options=['chromium_builder_tests'],
tests=mac_tests + ['sizes'],
builder_name='mac_rel',
slavebuilddir='mac',
@@ -557,6 +563,7 @@ b_mac_rel = CreateBuilder(
b_mac_rel_alt = CreateBuilder(
platform='mac',
target='Release',
+ options=['chromium_builder_tests'],
tests=mac_tests + ['sizes'],
builder_name='mac_rel_alt',
slavebuilddir='mac',
@@ -567,6 +574,7 @@ b_mac_rel_alt = CreateBuilder(
b_mac_rel_naclmore = CreateBuilder(
platform='mac',
target='Release',
+ options=['nacl_integration'],
tests=['nacl_integration'],
builder_name='mac_rel_naclmore',
slavebuilddir='mac',
@@ -576,6 +584,7 @@ b_mac_rel_naclmore = CreateBuilder(
b_mac_rel_naclmore_alt = CreateBuilder(
platform='mac',
target='Release',
+ options=['nacl_integration'],
tests=['nacl_integration'],
builder_name='mac_rel_naclmore_alt',
slavebuilddir='mac',
@@ -640,6 +649,7 @@ win_tests = [
b_win = CreateBuilder(
target='Debug',
platform='win32',
+ options=['chromium_builder_tests'],
tests=win_tests,
builder_name='win',
factory_properties={
@@ -655,6 +665,7 @@ pools['chrome'].append('win')
b_win_rel = CreateBuilder(
target='Release',
platform='win32',
+ options=['chromium_builder_tests'],
tests=win_tests + ['sizes'],
builder_name='win_rel',
slavebuilddir='win',
@@ -669,6 +680,7 @@ b_win_rel = CreateBuilder(
b_win_rel_naclmore = CreateBuilder(
target='Release',
platform='win32',
+ options=['chromium_builder_tests'],
tests=win_tests,
builder_name='win_rel_naclmore',
slavebuilddir='win',
@@ -761,6 +773,8 @@ b_android_dbg = CreateBuilder(
platform='android',
target='Debug',
builder_name='android_dbg',
+ options=[],
+ tests=[],
annotation_script='src/build/android/buildbot/bb_try_builder.sh',
factory_properties={
'trigger': 'android_dbg',
@@ -771,6 +785,8 @@ b_android_dbg_triggered_tests = CreateBuilder(
platform='android',
target='Debug',
builder_name='android_dbg_triggered_tests',
+ options=[],
+ tests=[],
annotation_script='src/build/android/buildbot/bb_try_tester.sh',
factory_properties={
'halt_on_missing_build': True,
@@ -781,6 +797,8 @@ b_android_fyi_dbg = CreateBuilder(
platform='android',
target='Debug',
builder_name='android_fyi_dbg',
+ options=[],
+ tests=[],
annotation_script='src/build/android/buildbot/bb_try_fyi_builder.sh',
factory_properties={
'trigger': 'android_fyi_dbg',
@@ -793,6 +811,8 @@ b_android_fyi_dbg_triggered_tests = CreateBuilder(
platform='android',
target='Debug',
builder_name='android_fyi_dbg_triggered_tests',
+ options=[],
+ tests=[],
annotation_script='src/build/android/buildbot/bb_try_fyi_tester.sh',
factory_properties={
'halt_on_missing_build': True,
@@ -803,6 +823,8 @@ b_android_clang_dbg = CreateBuilder(
platform='android',
target='Debug',
builder_name='android_clang_dbg',
+ options=[],
+ tests=[],
annotation_script='src/build/android/buildbot/bb_try_clang_builder.sh',
clang=True)
@@ -1225,12 +1247,12 @@ b_win_layout_rel = {
b_win_chrome_frame = CreateBuilder(
platform='win32',
target='Debug',
+ builder_name='win_cf',
+ options=['chromium_builder_win_cf'],
tests=[
'chrome_frame_net_tests',
'chrome_frame_tests',
],
- builder_name='win_cf',
- options=['chromium_builder_win_cf'],
slavebuilddir='win',
factory_properties={
'gclient_env': {
@@ -1256,6 +1278,7 @@ b_swarm = {
b_linux_clang = CreateBuilder(
platform='linux',
target='Debug',
+ options=['chromium_builder_tests'],
tests=linux_tests,
builder_name='linux_clang',
goma=True,
@@ -1291,6 +1314,7 @@ b_win_aura = CreateBuilder(
platform='win32',
target='Debug',
builder_name='win_aura',
+ options=['aura_builder'],
tests=[
'ash_unittests',
'aura',
@@ -1303,7 +1327,6 @@ b_win_aura = CreateBuilder(
'unit_unit',
'views',
],
- options=['aura_builder'],
goma=True,
factory_properties={
'sharded_tests': win_sharded,
@@ -1317,6 +1340,7 @@ b_win_ash = CreateBuilder(
platform='win32',
target='Debug',
builder_name='win_ash',
+ options=['aura_builder'],
tests=[
'ash_unittests',
'aura',
@@ -1411,6 +1435,7 @@ b_mac_asan = CreateBuilder(
tests=mac_asan_tests,
options=[
'--disable-aslr',
+ 'chromium_builder_tests',
],
builder_name='mac_asan',
slavebuilddir='mac_asan',
@@ -1430,6 +1455,7 @@ b_mac_asan_alt = CreateBuilder(
tests=mac_asan_tests,
options=[
'--disable-aslr',
+ 'chromium_builder_tests',
],
builder_name='mac_asan_alt',
slavebuilddir='mac_asan',
@@ -1579,6 +1605,7 @@ b_linux_gpu = CreateBuilder(
b_win_gpu = CreateBuilder(
target='Debug',
platform='win32',
+ options=['chromium_gpu_debug_builder'],
tests=[
'gpu_tests',
'gles2_conform_test',
@@ -1589,8 +1616,7 @@ b_win_gpu = CreateBuilder(
'GYP_DEFINES': 'internal_gles2_conform_tests=1',
},
},
- builder_name='win_gpu',
- options=['chromium_gpu_debug_builder'])
+ builder_name='win_gpu')
b_mac_gpu = CreateBuilder(
platform='mac',
@@ -1637,29 +1663,33 @@ nacl_sdk_script = 'nacl_sdk_buildbot_run.py'
b_linux_nacl_sdk = CreateBuilder(
platform='linux',
target='Debug',
+ options=['chromium_builder_qa'],
tests=['annotated_steps'],
- factory_properties={'annotated_script':nacl_sdk_script},
+ factory_properties={'annotated_script': nacl_sdk_script},
builder_name='linux_nacl_sdk',
goma=True)
b_win_nacl_sdk = CreateBuilder(
target='Debug',
platform='win32',
+ options=['chromium_builder_qa'],
tests=['annotated_steps'],
- factory_properties={'annotated_script':nacl_sdk_script},
+ factory_properties={'annotated_script': nacl_sdk_script},
builder_name='win_nacl_sdk',
slavebuilddir='win',
goma=True)
b_mac_nacl_sdk = CreateBuilder(
platform='mac',
target='Debug',
+ options=['chromium_builder_qa'],
tests=['annotated_steps'],
builder_name='mac_nacl_sdk',
- factory_properties={'annotated_script':nacl_sdk_script},
+ factory_properties={'annotated_script': nacl_sdk_script},
goma=True,
clang=True)
b_mac_nacl_sdk_alt = CreateBuilder(
platform='mac',
target='Debug',
+ options=['chromium_builder_qa'],
tests=['annotated_steps'],
builder_name='mac_nacl_sdk_alt',
factory_properties={'annotated_script':nacl_sdk_script},
@@ -1670,6 +1700,7 @@ b_mac_nacl_sdk_alt = CreateBuilder(
b_linux_perf = CreateBuilder(
platform='linux',
target='Release',
+ options=['all'],
tests=[
# From f_cr_rel_linux_lowmem in master.chromium.perf/master.cfg,
'page_cycler_moz',
@@ -1697,6 +1728,7 @@ b_linux_perf = CreateBuilder(
b_win_perf = CreateBuilder(
platform='win32',
target='Release',
+ options=['all'],
tests=[
# From f_cr_rel_perf_win7_jank in master.chromium.perf/master.cfg,
'page_cycler_moz',
@@ -1717,6 +1749,7 @@ b_win_perf = CreateBuilder(
b_mac_perf = CreateBuilder(
platform='mac',
target='Release',
+ options=['all'],
tests=[
# From f_cr_rel_mac6_perf_1 in master.chromium.perf/master.cfg,
'page_cycler_moz',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698