From e7c4f906516813252c8fbbff450b771bd6c14e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Thu, 13 Feb 2020 16:06:47 +0100 Subject: [PATCH] Add perf testers to mb_config.pyl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For now I think I have to run mb + ninja on testers in order to generate the proto used by webrtc_dashboard_upload.py. I would prefer a solution where we build on the builder and distribute via isolate, but let's do this for now (it will have to be the solution if isolate doesn't work out). Also remove obsolete entries. I think the previous code used to try to list all bots, but it clearly failed at that. The error one gets when an unlisted bot runs mb is very clear anyway. Bug: chromium:1029452 Change-Id: I2f4dda24ef0fb0337439c30c065b29b0da6bbe16 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168527 Reviewed-by: Mirko Bonadei Commit-Queue: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#30521} --- tools_webrtc/mb/mb_config.pyl | 39 ++++++++++++----------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index 72aa18d50e..fc458ef3e1 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -103,19 +103,20 @@ }, }, 'client.webrtc.perf': { - # Android - 'Android32 Builder': 'android_pure_release_bot_arm', - 'Android64 Builder': 'android_pure_release_bot_arm64', - 'Android32 Tests (J Nexus4)': 'none', - 'Android32 Tests (K Nexus5)': 'none', - 'Android32 Tests (L Nexus5)': 'none', - 'Android32 Tests (L Nexus6)': 'none', - 'Android32 Tests (L Nexus7.2)': 'none', - 'Android64 Tests (L Nexus9)': 'none', - 'Linux Trusty': 'pure_release_bot_x64', - 'Mac 10.11': 'pure_release_bot_x64', - 'Win7': 'win_clang_pure_release_bot_x86', + # These are here because testers need to gn gen + ninja for the + # webrtc_dashboard_upload target (otherwise a tester would not need to + # build anything). + # TODO(http://crbug.com/1029452): Nuke these and isolate on builder + # instead? + 'Perf Android32 (K Nexus5)': 'release_bot_x64', + 'Perf Android32 (M AOSP Nexus6)': 'release_bot_x64', + 'Perf Android64 (M Nexus5X)': 'release_bot_x64', + 'Perf Android64 (O Pixel2)': 'release_bot_x64', + 'Perf Linux Trusty': 'release_bot_x64', + 'Perf Mac 10.11': 'release_bot_x64', + 'Perf Win7': 'release_bot_x64', }, + 'client.webrtc.fyi': { # Mac 'Mac (swarming)': 'release_bot_x64', @@ -446,12 +447,6 @@ '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': [ - 'error', - ], }, # This is a dict mapping a given 'mixin' name to a dict of settings that @@ -498,14 +493,6 @@ 'mixins': ['debug', 'minimal_symbols', 'goma'], }, - # 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 - # that are test-only and should never run MB. - 'error': { - 'gn_args': 'error', - }, - 'full_symbols': { 'gn_args': 'symbol_level=2', },