Add MB configs for more_configs bots
No-Try: True
Bug: chromium:845135
Change-Id: I3ac4e0dbf2c41c4d33d18d7ef037de5292f06da7
Reviewed-on: https://webrtc-review.googlesource.com/77642
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23344}diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index f5227c0..93cac0d 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -50,6 +50,18 @@
'Linux UBSan': 'ubsan_clang_release_bot_x64',
'Linux UBSan vptr': 'ubsan_vptr_clang_release_bot_x64',
'Linux64 Release (Libfuzzer)': 'libfuzzer_asan_release_bot_x64',
+ # "More configs" bots will build all the following configs in sequence.
+ # This is using MB's "phases" feature.
+ 'Linux (more configs)': {
+ 'intelligibility_enhancer_no_include_tests':
+ 'intelligibility_enhancer_no_include_tests_x64',
+ 'bwe_test_logging':
+ 'bwe_test_logging_x64',
+ 'dummy_audio_file_devices_no_protobuf':
+ 'dummy_audio_file_devices_no_protobuf_x64',
+ 'rtti_no_sctp':
+ 'rtti_no_sctp_x64',
+ },
# Android
'Android32 (M Nexus5X)': 'android_release_bot_arm',
@@ -59,6 +71,16 @@
'Android32 Builder x86': 'android_release_bot_x86',
'Android32 Builder x86 (dbg)': 'android_debug_static_bot_x86',
'Android64 Builder x64 (dbg)': 'android_debug_static_bot_x64',
+ 'Android32 (more configs)': {
+ 'intelligibility_enhancer_no_include_tests':
+ 'intelligibility_enhancer_no_include_tests_android_arm',
+ 'bwe_test_logging':
+ 'bwe_test_logging_android_arm',
+ 'dummy_audio_file_devices_no_protobuf':
+ 'dummy_audio_file_devices_no_protobuf_android_arm',
+ 'rtti_no_sctp':
+ 'rtti_no_sctp_android_arm',
+ },
# Windows
'Win32 Debug': 'win_msvc_debug_bot_x86',
@@ -70,6 +92,16 @@
'Win64 Debug (Clang)': 'win_clang_debug_bot_x64',
'Win64 Release (Clang)': 'win_clang_release_bot_x64',
'Win32 ASan': 'win_asan_clang_release_bot_x86',
+ 'Win (more configs)': {
+ 'intelligibility_enhancer_no_include_tests':
+ 'intelligibility_enhancer_no_include_tests_x86',
+ 'bwe_test_logging':
+ 'bwe_test_logging_x86',
+ 'dummy_audio_file_devices_no_protobuf':
+ 'dummy_audio_file_devices_no_protobuf_x86',
+ 'rtti_no_sctp':
+ 'rtti_no_sctp_x86',
+ },
},
'client.webrtc.branches': {
# iOS
@@ -173,6 +205,16 @@
'linux_ubsan_vptr': 'ubsan_vptr_clang_release_bot_x64',
'linux_experimental': 'release_bot_x64',
'linux_libfuzzer_rel': 'libfuzzer_asan_release_bot_x64',
+ 'linux_more_configs': {
+ 'intelligibility_enhancer_no_include_tests':
+ 'intelligibility_enhancer_no_include_tests_x64',
+ 'bwe_test_logging':
+ 'bwe_test_logging_x64',
+ 'dummy_audio_file_devices_no_protobuf':
+ 'dummy_audio_file_devices_no_protobuf_x64',
+ 'rtti_no_sctp':
+ 'rtti_no_sctp_x64',
+ },
# Android
'android_compile_dbg': 'android_debug_static_bot_arm',
@@ -187,6 +229,16 @@
'android_rel': 'android_release_bot_arm',
'android_arm64_rel': 'android_release_bot_arm64',
'android_experimental': 'android_release_bot_arm',
+ 'android_more_configs': {
+ 'intelligibility_enhancer_no_include_tests':
+ 'intelligibility_enhancer_no_include_tests_android_arm',
+ 'bwe_test_logging':
+ 'bwe_test_logging_android_arm',
+ 'dummy_audio_file_devices_no_protobuf':
+ 'dummy_audio_file_devices_no_protobuf_android_arm',
+ 'rtti_no_sctp':
+ 'rtti_no_sctp_android_arm',
+ },
# Windows
'win_compile_dbg': 'debug_bot_x86',
@@ -205,6 +257,16 @@
'win_experimental': 'release_bot_x86',
'win_x64_win8': 'debug_bot_x64',
'win_x64_win10': 'debug_bot_x64',
+ 'win_more_configs': {
+ 'intelligibility_enhancer_no_include_tests':
+ 'intelligibility_enhancer_no_include_tests_x86',
+ 'bwe_test_logging':
+ 'bwe_test_logging_x86',
+ 'dummy_audio_file_devices_no_protobuf':
+ 'dummy_audio_file_devices_no_protobuf_x86',
+ 'rtti_no_sctp':
+ 'rtti_no_sctp_x86',
+ },
}
},
@@ -355,6 +417,48 @@
'android', 'gn', 'release', 'goma', 'arm64'
],
+ # More configs
+ 'intelligibility_enhancer_no_include_tests_x64': [
+ 'debug_bot', 'x64', 'intelligibility_enhancer', 'no_include_tests'
+ ],
+ 'bwe_test_logging_x64': [
+ 'debug_bot', 'x64', 'bwe_test_logging'
+ ],
+ 'dummy_audio_file_devices_no_protobuf_x64': [
+ 'debug_bot', 'x64', 'dummy_audio_file_devices', 'no_protobuf'
+ ],
+ 'rtti_no_sctp_x64': [
+ 'debug_bot', 'x64', 'rtti', 'no_sctp'
+ ],
+
+ 'intelligibility_enhancer_no_include_tests_x86': [
+ 'debug_bot', 'x86', 'intelligibility_enhancer', 'no_include_tests'
+ ],
+ 'bwe_test_logging_x86': [
+ 'debug_bot', 'x86', 'bwe_test_logging'
+ ],
+ 'dummy_audio_file_devices_no_protobuf_x86': [
+ 'debug_bot', 'x86', 'dummy_audio_file_devices', 'no_protobuf'
+ ],
+ 'rtti_no_sctp_x86': [
+ 'debug_bot', 'x86', 'rtti', 'no_sctp'
+ ],
+
+ 'intelligibility_enhancer_no_include_tests_android_arm': [
+ 'android', 'debug_static_bot', 'arm',
+ 'intelligibility_enhancer', 'no_include_tests'
+ ],
+ 'bwe_test_logging_android_arm': [
+ 'android', 'debug_static_bot', 'arm', 'bwe_test_logging'
+ ],
+ 'dummy_audio_file_devices_no_protobuf_android_arm': [
+ 'android', 'debug_static_bot', 'arm',
+ 'dummy_audio_file_devices', 'no_protobuf'
+ ],
+ 'rtti_no_sctp_android_arm': [
+ 'android', 'debug_static_bot', 'arm', 'rtti', 'no_sctp'
+ ],
+
# This is used for tracking purposes; any bot that uses this config
# should never actually run MB.
'none': [
@@ -512,6 +616,34 @@
'use_default_libcxx': {
'gn_args': 'use_custom_libcxx=false',
- }
+ },
+
+ 'intelligibility_enhancer': {
+ 'gn_args': 'rtc_enable_intelligibility_enhancer=true',
+ },
+
+ 'no_include_tests': {
+ 'gn_args': 'rtc_include_tests=false',
+ },
+
+ 'bwe_test_logging': {
+ 'gn_args': 'rtc_enable_bwe_test_logging=true',
+ },
+
+ 'dummy_audio_file_devices': {
+ 'gn_args': 'rtc_use_dummy_audio_file_devices=true',
+ },
+
+ 'no_protobuf': {
+ 'gn_args': 'rtc_enable_protobuf=false',
+ },
+
+ 'rtti': {
+ 'gn_args': 'use_rtti=true',
+ },
+
+ 'no_sctp': {
+ 'gn_args': 'rtc_enable_sctp=false',
+ },
},
}
