From 0ab95b97c8874b98e424cc596869c73836151636 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Tue, 15 May 2018 08:58:45 +0200 Subject: [PATCH] Remove all baremetal bots, baremetal tests will be part of *_rel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://chromium-review.googlesource.com/c/chromium/tools/build/+/1058799 After the baremetal machines are moved to swarming, that CL will add the tasks that were previously in *_baremetal bots to *_rel bots. *_rel bots will run all the same tasks as before on a pool of generic machines, but also run a few tests on dedicated baremetal machines (pool:WebRTC-baremetal-try). No-Try: True Bug: chromium:755660 Change-Id: I99d62a84aac631b1c127bf661546baecb2a3ae9a Reviewed-on: https://webrtc-review.googlesource.com/76721 Reviewed-by: Patrik Höglund Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#23290} --- infra/config/cq.cfg | 3 --- tools_webrtc/mb/mb_config.pyl | 6 ------ 2 files changed, 9 deletions(-) diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg index b651f3f7fb..9c045bc01b 100644 --- a/infra/config/cq.cfg +++ b/infra/config/cq.cfg @@ -47,7 +47,6 @@ verifiers { builders { name: "linux_arm64_dbg" } builders { name: "linux_arm64_rel" } builders { name: "linux_asan" } - builders { name: "linux_baremetal" } builders { name: "linux_chromium_compile" } builders { name: "linux_compile_dbg" } builders { name: "linux_libfuzzer_rel" } @@ -61,13 +60,11 @@ verifiers { builders { name: "linux_gcc_rel" } builders { name: "linux_more_configs" } builders { name: "mac_asan" } - builders { name: "mac_baremetal" } builders { name: "mac_chromium_compile" } builders { name: "mac_compile_dbg" } builders { name: "mac_rel" } builders { name: "presubmit" } builders { name: "win_asan" } - builders { name: "win_baremetal" } builders { name: "win_chromium_compile" } builders { name: "win_clang_dbg" } builders { name: "win_clang_rel" } diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index 7f5f67539b..f5227c02a4 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -32,7 +32,6 @@ 'Mac64 Debug': 'debug_bot_x64', 'Mac64 Release': 'release_bot_x64', 'Mac Asan': 'mac_asan_clang_release_bot_x64', - 'Mac64 Release [large tests]': 'release_bot_x64', # Linux 'Linux32 Debug': 'no_h264_debug_bot_x86', @@ -50,7 +49,6 @@ 'Linux Tsan v2': 'tsan_clang_release_bot_x64', 'Linux UBSan': 'ubsan_clang_release_bot_x64', 'Linux UBSan vptr': 'ubsan_vptr_clang_release_bot_x64', - 'Linux64 Release [large tests]': 'release_bot_x64', 'Linux64 Release (Libfuzzer)': 'libfuzzer_asan_release_bot_x64', # Android @@ -72,7 +70,6 @@ 'Win64 Debug (Clang)': 'win_clang_debug_bot_x64', 'Win64 Release (Clang)': 'win_clang_release_bot_x64', 'Win32 ASan': 'win_asan_clang_release_bot_x86', - 'Win32 Release [large tests]': 'release_bot_x86', }, 'client.webrtc.branches': { # iOS @@ -154,7 +151,6 @@ 'mac_dbg': 'debug_bot_x64', 'mac_rel': 'release_bot_x64', 'mac_asan': 'mac_asan_clang_release_bot_x64', - 'mac_baremetal': 'release_bot_x64', 'mac_experimental': 'release_bot_x64', # Linux @@ -175,7 +171,6 @@ 'linux_tsan2': 'tsan_clang_release_bot_x64', 'linux_ubsan': 'ubsan_clang_release_bot_x64', 'linux_ubsan_vptr': 'ubsan_vptr_clang_release_bot_x64', - 'linux_baremetal': 'release_bot_x64', 'linux_experimental': 'release_bot_x64', 'linux_libfuzzer_rel': 'libfuzzer_asan_release_bot_x64', @@ -207,7 +202,6 @@ 'win_x64_clang_dbg': 'win_clang_debug_bot_x64', 'win_x64_clang_rel': 'win_clang_release_bot_x64', 'win_asan': 'win_asan_clang_release_bot_x86', - 'win_baremetal': 'release_bot_x86', 'win_experimental': 'release_bot_x86', 'win_x64_win8': 'debug_bot_x64', 'win_x64_win10': 'debug_bot_x64',