mb: merge the configs for "pure release bot" and "perf release bot"

because they actually produce exactly the same GN args.

No-Try: True
Bug: None
Change-Id: Ib9315ec6ded28bfa64606cdb14c61ec6479203be
Reviewed-on: https://webrtc-review.googlesource.com/c/115412
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26085}
This commit is contained in:
Oleh Prypin
2018-12-21 13:20:11 +01:00
committed by Commit Bot
parent ea7e7a9753
commit 91085072fa

View File

@ -101,28 +101,28 @@
}, },
'client.webrtc.perf': { 'client.webrtc.perf': {
# Android # Android
'Android32 Builder': 'perf_android_release_bot_arm', 'Android32 Builder': 'android_pure_release_bot_arm',
'Android64 Builder': 'perf_android_release_bot_arm64', 'Android64 Builder': 'android_pure_release_bot_arm64',
'Android32 Tests (J Nexus4)': 'none', 'Android32 Tests (J Nexus4)': 'none',
'Android32 Tests (K Nexus5)': 'none', 'Android32 Tests (K Nexus5)': 'none',
'Android32 Tests (L Nexus5)': 'none', 'Android32 Tests (L Nexus5)': 'none',
'Android32 Tests (L Nexus6)': 'none', 'Android32 Tests (L Nexus6)': 'none',
'Android32 Tests (L Nexus7.2)': 'none', 'Android32 Tests (L Nexus7.2)': 'none',
'Android64 Tests (L Nexus9)': 'none', 'Android64 Tests (L Nexus9)': 'none',
'Linux Trusty': 'perf_release_bot_x64', 'Linux Trusty': 'pure_release_bot_x64',
'Mac 10.11': 'perf_release_bot_x64', 'Mac 10.11': 'pure_release_bot_x64',
'Win7': 'perf_release_bot_x86', 'Win7': 'pure_release_bot_x86',
'Perf Linux Trusty': 'perf_release_bot_x64', 'Perf Linux Trusty': 'pure_release_bot_x64',
'Perf Mac 10.11': 'perf_release_bot_x64', 'Perf Mac 10.11': 'pure_release_bot_x64',
'Perf Win7': 'perf_release_bot_x86', 'Perf Win7': 'pure_release_bot_x86',
}, },
'client.webrtc.fyi': { 'client.webrtc.fyi': {
# Mac # Mac
'Mac (swarming)': 'release_bot_x64', 'Mac (swarming)': 'release_bot_x64',
# Android # Android
'Android Perf (swarming)': 'perf_android_release_bot_arm', 'Android Perf (swarming)': 'android_pure_release_bot_arm',
'Android ASan (swarming)': 'android_asan_shared_release_bot_arm', 'Android ASan (swarming)': 'android_asan_shared_release_bot_arm',
# Windows # Windows
'Win (swarming)': 'release_bot_x86', 'Win (swarming)': 'release_bot_x86',
@ -308,12 +308,6 @@
'pure_release_bot_x64': [ 'pure_release_bot_x64': [
'gn', 'openh264', 'pure_release_bot', 'x64' 'gn', 'openh264', 'pure_release_bot', 'x64'
], ],
'perf_release_bot_x86': [
'gn', 'openh264', 'release', 'goma', 'x86'
],
'perf_release_bot_x64': [
'gn', 'openh264', 'release', 'goma', 'x64'
],
'libfuzzer_asan_release_bot_x64': [ 'libfuzzer_asan_release_bot_x64': [
'libfuzzer', 'asan', 'optimize_for_fuzzing', 'openh264', 'release_bot', 'libfuzzer', 'asan', 'optimize_for_fuzzing', 'openh264', 'release_bot',
'x64', 'no_rtc_tests' 'x64', 'no_rtc_tests'
@ -399,12 +393,6 @@
'android_asan_shared_release_bot_arm': [ 'android_asan_shared_release_bot_arm': [
'android', 'gn', 'asan', 'clang', 'release_bot', 'arm' 'android', 'gn', 'asan', 'clang', 'release_bot', 'arm'
], ],
'perf_android_release_bot_arm': [
'android', 'gn', 'release', 'goma', 'arm'
],
'perf_android_release_bot_arm64': [
'android', 'gn', 'release', 'goma', 'arm64'
],
# More configs # More configs
'bwe_test_logging_x64': [ 'bwe_test_logging_x64': [