Commit 15cc4d66 authored by dpranke's avatar dpranke Committed by Commit bot

Re-land "Flip linux blink bots to GN."

This reverts #364362 and re-lands #364236, now that the
underlying issue w/ webkit_unit_tests has been addressed.

TBR=thakis@chromium.org
BUG=432959
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel,linux_blink_oilpan_rel

Review URL: https://codereview.chromium.org/1506333004

Cr-Commit-Position: refs/heads/master@{#364506}
parent 49be2673
......@@ -82,9 +82,17 @@
'swarming_gpu_tests_gyp_debug_trybot': ['swarming', 'gpu_tests', 'gyp', 'debug_trybot'],
'swarming_gpu_tests_gyp_release_trybot': ['swarming', 'gpu_tests', 'gyp', 'release_trybot'],
'swarming_gn_debug_bot': ['swarming', 'gn', 'debug_bot'],
'swarming_gn_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'debug_bot_minimal_symbols', 'x64'],
'swarming_gn_debug_bot_x64': ['swarming', 'gn', 'debug_bot', 'x64'],
'swarming_gn_debug_trybot': ['swarming', 'gn', 'debug_trybot'],
'swarming_gn_oilpan_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'oilpan', 'debug_bot', 'minimal_symbols', 'x64'],
'swarming_gn_oilpan_debug_bot_x64': ['swarming', 'gn', 'oilpan', 'debug_bot', 'minimal_symbols', 'x64'],
'swarming_gn_oilpan_release_bot_x64': ['swarming', 'gn', 'oilpan', 'release_bot', 'x64'],
'swarming_gn_oilpan_release_trybot_minimal_symbols_x64': ['swarming', 'gn', 'oilpan', 'release_trybot', 'minimal_symbols', 'x64'],
'swarming_gn_release_bot': ['swarming', 'gn', 'release_bot'],
'swarming_gn_release_bot_x64': ['swarming', 'gn', 'release_bot', 'x64'],
'swarming_gn_release_trybot': ['swarming', 'gn', 'release_bot'],
'swarming_gn_release_trybot_minimal_symbols_x64': ['swarming', 'gn', 'release_trybot', 'minimal_symbols', 'x64'],
'swarming_gyp_asan_lsan_release_bot_x64': ['swarming', 'gyp', 'asan', 'lsan', 'release_bot', 'x64'],
'swarming_gyp_debug_bot_minimal_symbols_x64': ['swarming', 'gyp', 'debug_bot_minimal_symbols', 'x64'],
'swarming_gyp_debug_bot_minimal_symbols_x86': ['swarming', 'gyp', 'debug_bot_minimal_symbols', 'x86'],
......@@ -492,17 +500,17 @@
'WebKit Mac Builder (dbg)': 'swarming_gyp_debug_bot_x64',
'WebKit Mac10.7 (dbg)': 'none',
'WebKit Mac Oilpan (dbg)': 'swarming_gyp_oilpan_debug_bot_x64',
'WebKit Linux': 'swarming_gyp_release_bot_x64',
'WebKit Linux Trusty': 'swarming_gyp_release_bot_x64',
'WebKit Linux': 'swarming_gn_release_bot_x64',
'WebKit Linux Trusty': 'swarming_gn_release_bot_x64',
'WebKit Linux 32': 'swarming_gyp_release_bot_x86',
'WebKit Linux Oilpan': 'swarming_gyp_oilpan_release_bot_x64',
'WebKit Linux Oilpan': 'swarming_gn_oilpan_release_bot_x64',
'WebKit Linux ASAN': 'swarming_gyp_asan_lsan_release_bot_x64',
'WebKit Linux Oilpan ASAN': 'swarming_gyp_oilpan_asan_lsan_release_bot_x64',
'WebKit Linux MSAN': 'swarming_gyp_msan_release_bot_x64',
'WebKit Linux Leak': 'swarming_gyp_release_bot_x64',
'WebKit Linux Oilpan Leak': 'swarming_gyp_oilpan_release_bot_x64',
'WebKit Linux (dbg)': 'swarming_gyp_debug_bot_x64',
'WebKit Linux Oilpan (dbg)': 'swarming_gyp_oilpan_debug_bot_x64',
'WebKit Linux Leak': 'swarming_gn_release_bot_x64',
'WebKit Linux Oilpan Leak': 'swarming_gn_oilpan_release_bot_x64',
'WebKit Linux (dbg)': 'swarming_gn_debug_bot_x64',
'WebKit Linux Oilpan (dbg)': 'swarming_gn_oilpan_debug_bot_x64',
'Android Builder': 'gyp_release_bot_android',
'WebKit Android (Nexus4)': 'gyp_release_bot_android',
},
......@@ -541,10 +549,10 @@
'precise64 trunk': 'gn_official',
},
'tryserver.blink': {
'linux_blink_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
'linux_blink_compile_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
'linux_blink_compile_rel': 'swarming_gyp_release_trybot_minimal_symbols_x64',
'linux_blink_rel': 'swarming_gyp_release_trybot_minimal_symbols_x64',
'linux_blink_dbg': 'swarming_gn_debug_bot_minimal_symbols_x64',
'linux_blink_compile_dbg': 'swarming_gn_debug_bot_minimal_symbols_x64',
'linux_blink_compile_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
'linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
'mac_blink_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
'mac_blink_compile_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x64',
'mac_blink_compile_rel': 'swarming_gyp_release_bot_minimal_symbols_x64',
......@@ -553,16 +561,16 @@
'win_blink_compile_dbg': 'swarming_gyp_debug_bot_minimal_symbols_x86',
'win_blink_compile_rel': 'swarming_gyp_release_trybot_minimal_symbols_x86',
'win_blink_rel': 'swarming_gyp_release_trybot_minimal_symbols_x86',
'linux_blink_oilpan_dbg': 'swarming_gyp_oilpan_debug_bot_minimal_symbols_x64',
'linux_blink_oilpan_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
'linux_blink_oilpan_compile_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
'linux_blink_oilpan_dbg': 'swarming_gn_oilpan_debug_bot_minimal_symbols_x64',
'linux_blink_oilpan_rel': 'swarming_gn_oilpan_release_trybot_minimal_symbols_x64',
'linux_blink_oilpan_compile_rel': 'swarming_gn_oilpan_release_trybot_minimal_symbols_x64',
'mac_blink_oilpan_dbg': 'swarming_gyp_oilpan_debug_bot_minimal_symbols_x64',
'mac_blink_oilpan_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
'mac_blink_oilpan_compile_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x64',
'win_blink_oilpan_dbg': 'swarming_gyp_oilpan_debug_bot_minimal_symbols_x86',
'win_blink_oilpan_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x86',
'win_blink_oilpan_compile_rel': 'swarming_gyp_oilpan_release_trybot_minimal_symbols_x86',
'linux_blink_rel_ng': 'swarming_gyp_release_trybot_minimal_symbols_x64',
'linux_blink_rel_ng': 'swarming_gn_release_trybot_minimal_symbols_x64',
'blink_presubmit': 'none',
},
'tryserver.chromium.android': {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment