admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MB: Flip Android bots to GN by default.

Browse Source 
Change the previous GN configs to build GYP instead
(since we'll keep GYP around for a while) but exclude tests for
that config from now on, since we're facing errors with GYP.

Add new configs for upcoming rename of those bots to GYP instead
of GN.

BUG=webrtc:5949
NOTRY=True

Review-Url: https://codereview.webrtc.org/2264283003
Cr-Commit-Position: refs/heads/master@{#13875}
This commit is contained in:
kjellander 2016-08-24 00:34:40 -07:00 committed by Commit bot
parent 24ee05016c
commit 4c8adb1ec7
1 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
webrtc/build/mb_config.pyl
View File

@ -54,17 +54,21 @@
'Linux64 Release (GN)': 'gn_release_bot_x64',
# Android
'Android32 Builder': 'android_gyp_release_bot_arm',
'Android32 Builder (dbg)': 'android_gyp_debug_static_bot_arm',
'Android32 Builder x86': 'android_gyp_release_bot_x86',
'Android32 Builder x86 (dbg)': 'android_gyp_debug_static_bot_x86',
'Android32 Builder MIPS (dbg)': 'android_gyp_clang_debug_static_bot_mipsel',
'Android32 Clang (dbg)': 'android_gyp_clang_debug_static_bot_arm',
'Android64 Builder': 'android_gyp_release_bot_arm64',
'Android64 Builder (dbg)': 'android_gyp_debug_static_bot_arm64',
'Android64 Builder x64 (dbg)': 'android_gyp_debug_static_bot_x64',
'Android32 GN': 'android_gn_release_bot_arm',
'Android32 GN (dbg)': 'android_gn_debug_static_bot_arm',
'Android32 Builder': 'android_gn_release_bot_arm',
'Android32 Builder (dbg)': 'android_gn_debug_static_bot_arm',
'Android32 Builder x86': 'android_gn_release_bot_x86',
'Android32 Builder x86 (dbg)': 'android_gn_debug_static_bot_x86',
'Android32 Builder MIPS (dbg)': 'android_gn_clang_debug_static_bot_mipsel',
'Android32 Clang (dbg)': 'android_gn_clang_debug_static_bot_arm',
'Android64 Builder': 'android_gn_release_bot_arm64',
'Android64 Builder (dbg)': 'android_gn_debug_static_bot_arm64',
'Android64 Builder x64 (dbg)': 'android_gn_debug_static_bot_x64',
# TODO(kjellander): Remove the 'Android32 GN' configs as soon we've
# renamed these bots to Android32 GYP in the main waterfall.
'Android32 GN': 'android_gyp_release_bot_arm',
'Android32 GN (dbg)': 'android_gyp_debug_static_bot_arm',
'Android32 GYP': 'android_gyp_release_bot_arm',
'Android32 GYP (dbg)': 'android_gyp_debug_static_bot_arm',
'Android32 Tests (L Nexus5)(dbg)': 'none',
'Android32 Tests (L Nexus5)': 'none',
'Android32 Tests (L Nexus7.2)(dbg)': 'none',
@ -127,21 +131,25 @@
'linux_swarming': 'swarming_gyp_debug_bot_x64',
# Android
'android_compile_dbg': 'android_gyp_debug_static_bot_arm',
'android_compile_rel': 'android_gyp_release_bot_arm',
'android_compile_arm64_dbg': 'android_gyp_debug_static_bot_arm64',
'android_compile_arm64_rel': 'android_gyp_release_bot_arm64',
'android_compile_x86_dbg': 'android_gyp_debug_static_bot_x86',
'android_compile_x86_rel': 'android_gyp_release_bot_x86',
'android_compile_x64_dbg': 'android_gyp_debug_static_bot_x64',
'android_compile_mips_dbg': 'android_gyp_clang_debug_static_bot_mipsel',
'android_dbg': 'android_gyp_debug_static_bot_arm',
'android_rel': 'android_gyp_release_bot_arm',
'android_clang_dbg': 'android_gyp_clang_debug_static_bot_arm',
'android_arm64_rel': 'android_gyp_release_bot_arm64',
'android_n6': 'android_gyp_debug_static_bot_arm',
'android_gn_dbg': 'android_gn_debug_static_bot_arm',
'android_gn_rel': 'android_gn_release_bot_arm',
'android_compile_dbg': 'android_gn_debug_static_bot_arm',
'android_compile_rel': 'android_gn_release_bot_arm',
'android_compile_arm64_dbg': 'android_gn_debug_static_bot_arm64',
'android_compile_arm64_rel': 'android_gn_release_bot_arm64',
'android_compile_x86_dbg': 'android_gn_debug_static_bot_x86',
'android_compile_x86_rel': 'android_gn_release_bot_x86',
'android_compile_x64_dbg': 'android_gn_debug_static_bot_x64',
'android_compile_mips_dbg': 'android_gn_clang_debug_static_bot_mipsel',
'android_dbg': 'android_gn_debug_static_bot_arm',
'android_rel': 'android_gn_release_bot_arm',
'android_clang_dbg': 'android_gn_clang_debug_static_bot_arm',
'android_arm64_rel': 'android_gn_release_bot_arm64',
'android_n6': 'android_gn_debug_static_bot_arm',
# TODO(kjellander): Remove the android_gn_* configs as soon we've renamed
# the bots to the GYP versions at the tryserver.
'android_gn_dbg': 'android_gyp_debug_static_bot_arm',
'android_gn_rel': 'android_gyp_release_bot_arm',
'android_gyp_dbg': 'android_gyp_debug_static_bot_arm',
'android_gyp_rel': 'android_gyp_release_bot_arm',
# Windows
'win_compile_dbg': 'gyp_debug_bot_x86',
@ -271,31 +279,10 @@
# Android
'android_gyp_debug_static_bot_arm': [
'android', 'gyp', 'debug_static_bot', 'arm'
'android', 'gyp', 'debug_static_bot', 'arm', 'exclude_tests'
],
'android_gyp_release_bot_arm': [
'android', 'gyp', 'release_bot', 'arm'
],
'android_gyp_debug_static_bot_x86': [
'android', 'gyp', 'debug_static_bot', 'x86'
],
'android_gyp_release_bot_x86': [
'android', 'gyp', 'release_bot', 'x86'
],
'android_gyp_clang_debug_static_bot_arm': [
'android', 'gyp', 'clang', 'debug_static_bot', 'arm'
],
'android_gyp_clang_debug_static_bot_mipsel': [
'android', 'gyp', 'clang', 'debug_static_bot', 'mipsel'
],
'android_gyp_debug_static_bot_arm64': [
'android', 'gyp', 'debug_static_bot', 'arm64'
],
'android_gyp_release_bot_arm64': [
'android', 'gyp', 'release_bot', 'arm64'
],
'android_gyp_debug_static_bot_x64': [
'android', 'gyp', 'debug_static_bot', 'x64'
'android', 'gyp', 'release_bot', 'arm', 'exclude_tests'
],
'android_gn_debug_static_bot_arm': [
'android', 'gn', 'debug_static_bot', 'arm'
@ -303,6 +290,27 @@
'android_gn_release_bot_arm': [
'android', 'gn', 'release_bot', 'arm'
],
'android_gn_debug_static_bot_x86': [
'android', 'gn', 'debug_static_bot', 'x86'
],
'android_gn_release_bot_x86': [
'android', 'gn', 'release_bot', 'x86'
],
'android_gn_clang_debug_static_bot_arm': [
'android', 'gn', 'clang', 'debug_static_bot', 'arm'
],
'android_gn_clang_debug_static_bot_mipsel': [
'android', 'gn', 'clang', 'debug_static_bot', 'mipsel'
],
'android_gn_debug_static_bot_arm64': [
'android', 'gn', 'debug_static_bot', 'arm64'
],
'android_gn_release_bot_arm64': [
'android', 'gn', 'release_bot', 'arm64'
],
'android_gn_debug_static_bot_x64': [
'android', 'gn', 'debug_static_bot', 'x64'
],
# This is used for tracking purposes; any bot that uses this config
# should never actually run MB.
@ -374,6 +382,11 @@
'gyp_defines': 'component=shared_library build_for_tool=drmemory',
},
'exclude_tests': {
'gn_args': 'rtc_include_tests=false',
'gyp_defines': 'include_tests=0',
},
# This mixin is used to force configs that use it to fail. It
# is used in two cases: when we have bots that we haven't looked
# at yet and don't know whether they need MB or not, and for bots