From 11d3d6c17de3bf1195339e4158390d7963cb556d Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 30 Nov 2018 15:03:35 +0100 Subject: [PATCH] Rename most tryjobs to avoid implied defaults Explicitly say "_compile_" for ARM and Clang and GCC. Explicitly say "_arm_" for mobiles. Explicitly say "_x86_" for Windows. Fill in some gaps where both tester and compile-only bots are viable. Also remove unused "experimental" tryjobs. No-Try: True Bug: webrtc:10072 Change-Id: Ib22e0518fc1e600b237c3c687994f27c7e88b8b3 Reviewed-on: https://webrtc-review.googlesource.com/c/112585 Reviewed-by: Mirko Bonadei Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#25872} --- infra/config/cq.cfg | 52 ++++++------ ...64_dbg.json => ios_compile_arm64_dbg.json} | 0 ...64_rel.json => ios_compile_arm64_rel.json} | 0 ...{ios_dbg.json => ios_compile_arm_dbg.json} | 0 ...{ios_rel.json => ios_compile_arm_rel.json} | 0 ...10_dbg.json => ios_sim_x64_dbg_ios10.json} | 0 ...11_dbg.json => ios_sim_x64_dbg_ios11.json} | 0 ...os9_dbg.json => ios_sim_x64_dbg_ios9.json} | 0 ...os9_dbg.json => ios_sim_x86_dbg_ios9.json} | 0 tools_webrtc/mb/mb_config.pyl | 80 ++++++++++--------- 10 files changed, 70 insertions(+), 62 deletions(-) rename tools_webrtc/ios/tryserver.webrtc/{ios_arm64_dbg.json => ios_compile_arm64_dbg.json} (100%) rename tools_webrtc/ios/tryserver.webrtc/{ios_arm64_rel.json => ios_compile_arm64_rel.json} (100%) rename tools_webrtc/ios/tryserver.webrtc/{ios_dbg.json => ios_compile_arm_dbg.json} (100%) rename tools_webrtc/ios/tryserver.webrtc/{ios_rel.json => ios_compile_arm_rel.json} (100%) rename tools_webrtc/ios/tryserver.webrtc/{ios64_sim_ios10_dbg.json => ios_sim_x64_dbg_ios10.json} (100%) rename tools_webrtc/ios/tryserver.webrtc/{ios64_sim_ios11_dbg.json => ios_sim_x64_dbg_ios11.json} (100%) rename tools_webrtc/ios/tryserver.webrtc/{ios64_sim_ios9_dbg.json => ios_sim_x64_dbg_ios9.json} (100%) rename tools_webrtc/ios/tryserver.webrtc/{ios32_sim_ios9_dbg.json => ios_sim_x86_dbg_ios9.json} (100%) diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg index 1c0f0228f8..25248d7fc1 100644 --- a/infra/config/cq.cfg +++ b/infra/config/cq.cfg @@ -22,42 +22,42 @@ verifiers { try_job { buckets { name: "luci.webrtc.try" - builders { name: "android_dbg" } - builders { name: "android_rel" } builders { name: "android_arm64_rel" } + builders { name: "android_arm_dbg" } + builders { name: "android_arm_rel" } builders { name: "android_chromium_compile" } builders { name: "android_compile_arm64_rel" } - builders { name: "android_compile_rel" } + builders { name: "android_compile_arm_rel" } + builders { name: "android_compile_x64_dbg" } builders { name: "android_compile_x86_dbg" } builders { name: "android_compile_x86_rel" } - builders { name: "android_compile_x64_dbg" } builders { name: "android_more_configs" } - builders { name: "ios_arm64_dbg" } - builders { name: "ios_arm64_rel" } - builders { name: "ios_dbg" } - builders { name: "ios_rel" } - builders { name: "ios64_sim_ios9_dbg" } - builders { name: "ios64_sim_ios10_dbg" } builders { name: "ios_api_framework" } - # TODO(kjellander): Re-enable when https://bugs.webrtc.org/7413 is fixed. - #builders { name: "linux32_rel" } - builders { name: "linux32_dbg" } - builders { name: "linux32_arm_dbg" } - builders { name: "linux32_arm_rel" } - builders { name: "linux_arm64_dbg" } - builders { name: "linux_arm64_rel" } + builders { name: "ios_compile_arm64_dbg" } + builders { name: "ios_compile_arm64_rel" } + builders { name: "ios_compile_arm_dbg" } + builders { name: "ios_compile_arm_rel" } + builders { name: "ios_sim_x64_dbg_ios10" } + builders { name: "ios_sim_x64_dbg_ios9" } builders { name: "linux_asan" } builders { name: "linux_chromium_compile" } + builders { name: "linux_compile_arm64_dbg" } + builders { name: "linux_compile_arm64_rel" } + builders { name: "linux_compile_arm_dbg" } + builders { name: "linux_compile_arm_rel" } builders { name: "linux_compile_dbg" } + builders { name: "linux_compile_gcc_rel" } builders { name: "linux_compile_rel" } builders { name: "linux_libfuzzer_rel" } + builders { name: "linux_more_configs" } builders { name: "linux_msan" } builders { name: "linux_rel" } builders { name: "linux_tsan2" } builders { name: "linux_ubsan" } builders { name: "linux_ubsan_vptr" } - builders { name: "linux_gcc_rel" } - builders { name: "linux_more_configs" } + builders { name: "linux_x86_dbg" } + # TODO(kjellander): Re-enable when https://bugs.webrtc.org/7413 is fixed. + builders { name: "linux_x86_rel" } builders { name: "mac_asan" } builders { name: "mac_chromium_compile" } builders { name: "mac_compile_dbg" } @@ -70,13 +70,13 @@ verifiers { } builders { name: "win_asan" } builders { name: "win_chromium_compile" } - builders { name: "win_clang_dbg" } - builders { name: "win_clang_rel" } - builders { name: "win_rel" } - builders { name: "win_x64_clang_dbg" } - builders { name: "win_x64_clang_rel" } - builders { name: "win_x64_rel" } - builders { name: "win_more_configs" } + builders { name: "win_compile_x64_clang_dbg" } + builders { name: "win_compile_x64_clang_rel" } + builders { name: "win_compile_x86_clang_dbg" } + builders { name: "win_x64_msvc_rel" } + builders { name: "win_x86_clang_rel" } + builders { name: "win_x86_more_configs" } + builders { name: "win_x86_msvc_rel" } builders { name: "noop" equivalent_to { diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_dbg.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json rename to tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_dbg.json diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_rel.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json rename to tools_webrtc/ios/tryserver.webrtc/ios_compile_arm64_rel.json diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_dbg.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios_dbg.json rename to tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_dbg.json diff --git a/tools_webrtc/ios/tryserver.webrtc/ios_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_rel.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios_rel.json rename to tools_webrtc/ios/tryserver.webrtc/ios_compile_arm_rel.json diff --git a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json rename to tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios10.json diff --git a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json rename to tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios11.json diff --git a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json rename to tools_webrtc/ios/tryserver.webrtc/ios_sim_x64_dbg_ios9.json diff --git a/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json similarity index 100% rename from tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json rename to tools_webrtc/ios/tryserver.webrtc/ios_sim_x86_dbg_ios9.json diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index ac04ba551b..62141dc4fe 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl @@ -148,13 +148,14 @@ }, 'tryserver.webrtc': { # iOS - 'ios_dbg': 'ios', - 'ios_rel': 'ios', - 'ios_arm64_dbg': 'ios', - 'ios_arm64_rel': 'ios', - 'ios32_sim_ios9_dbg': 'ios', - 'ios64_sim_ios9_dbg': 'ios', - 'ios64_sim_ios10_dbg': 'ios', + 'ios_compile_arm_dbg': 'ios', + 'ios_compile_arm_rel': 'ios', + 'ios_compile_arm64_dbg': 'ios', + 'ios_compile_arm64_rel': 'ios', + 'ios_sim_x86_dbg_ios9': 'ios', + 'ios_sim_x64_dbg_ios9': 'ios', + 'ios_sim_x64_dbg_ios10': 'ios', + 'ios_sim_x64_dbg_ios11': 'ios', # Mac 'mac_compile_dbg': 'debug_bot_x64', @@ -162,26 +163,26 @@ 'mac_dbg': 'debug_bot_x64', 'mac_rel': 'release_bot_x64', 'mac_asan': 'mac_asan_clang_release_bot_x64', - 'mac_experimental': 'release_bot_x64', # Linux 'linux_compile_dbg': 'debug_bot_x64', 'linux_compile_rel': 'pure_release_bot_x64', + 'linux_compile_x86_dbg': 'debug_bot_x86', + 'linux_compile_x86_rel': 'pure_release_bot_x86', + 'linux_compile_arm_dbg': 'debug_bot_arm', + 'linux_compile_arm_rel': 'release_bot_arm', + 'linux_compile_arm64_dbg': 'debug_bot_arm64', + 'linux_compile_arm64_rel': 'release_bot_arm64', + 'linux_compile_gcc_rel': 'gcc_release_bot_x64', 'linux_dbg': 'debug_bot_x64', 'linux_rel': 'release_bot_x64', - 'linux_arm64_dbg': 'debug_bot_arm64', - 'linux_arm64_rel': 'release_bot_arm64', - 'linux32_dbg': 'no_h264_debug_bot_x86', - 'linux32_rel': 'release_bot_x86', - 'linux32_arm_dbg': 'debug_bot_arm', - 'linux32_arm_rel': 'release_bot_arm', + 'linux_x86_rel': 'release_bot_x86', + 'linux_x86_dbg': 'no_h264_debug_bot_x86', 'linux_asan': 'asan_lsan_clang_release_bot_x64', - 'linux_gcc_rel': 'gcc_release_bot_x64', 'linux_msan': 'msan_clang_release_bot_x64', 'linux_tsan2': 'tsan_clang_release_bot_x64', 'linux_ubsan': 'ubsan_clang_release_bot_x64', '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': { 'bwe_test_logging': @@ -193,18 +194,19 @@ }, # Android - 'android_compile_dbg': 'android_debug_static_bot_arm', - 'android_compile_rel': 'android_pure_release_bot_arm', + 'android_compile_arm_dbg': 'android_debug_static_bot_arm', + 'android_compile_arm_rel': 'android_pure_release_bot_arm', 'android_compile_arm64_dbg': 'android_debug_static_bot_arm64', 'android_compile_arm64_rel': 'android_pure_release_bot_arm64', 'android_compile_x86_dbg': 'android_debug_static_bot_x86', 'android_compile_x86_rel': 'android_release_bot_x86', 'android_compile_x64_dbg': 'android_debug_static_bot_x64', - 'android_dbg': 'android_debug_static_bot_arm', - 'android_rel': 'android_release_bot_arm', + 'android_compile_x64_rel': 'android_release_bot_x64', + 'android_arm_dbg': 'android_debug_static_bot_arm', + 'android_arm_rel': 'android_release_bot_arm', + 'android_arm64_dbg': 'android_release_bot_arm64', 'android_arm64_rel': 'android_release_bot_arm64', - 'android_experimental': 'android_release_bot_arm', - 'android_more_configs': { + 'android_arm_more_configs': { 'bwe_test_logging': 'bwe_test_logging_android_arm', 'dummy_audio_file_devices_no_protobuf': @@ -214,24 +216,27 @@ }, # Windows - 'win_compile_dbg': 'debug_bot_x86', - 'win_compile_rel': 'pure_release_bot_x86', - 'win_compile_x64_dbg': 'debug_bot_x64', - 'win_compile_x64_rel': 'pure_release_bot_x64', - 'win_dbg': 'win_msvc_debug_bot_x86', - 'win_rel': 'win_msvc_release_bot_x86', - 'win_x64_dbg': 'win_msvc_debug_bot_x64', - 'win_x64_rel': 'win_msvc_release_bot_x64', - 'win_clang_dbg': 'win_clang_debug_bot_x86', - 'win_clang_rel': 'win_clang_release_bot_x86', + 'win_compile_x86_msvc_dbg': 'win_msvc_debug_bot_x86', + 'win_compile_x86_msvc_rel': 'win_msvc_release_bot_x86', + 'win_compile_x64_msvc_dbg': 'win_msvc_debug_bot_x64', + 'win_compile_x64_msvc_rel': 'win_msvc_release_bot_x64', + 'win_compile_x86_clang_dbg': 'win_clang_debug_bot_x86', + 'win_compile_x86_clang_rel': 'win_clang_release_bot_x86', + 'win_compile_x64_clang_dbg': 'win_clang_debug_bot_x64', + 'win_compile_x64_clang_rel': 'win_clang_release_bot_x64', + 'win_x86_msvc_dbg': 'win_msvc_debug_bot_x86', + 'win_x86_msvc_rel': 'win_msvc_release_bot_x86', + 'win_x64_msvc_dbg': 'win_msvc_debug_bot_x64', + 'win_x64_msvc_rel': 'win_msvc_release_bot_x64', + 'win_x86_clang_dbg': 'win_clang_debug_bot_x86', + 'win_x86_clang_rel': 'win_clang_release_bot_x86', '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_experimental': 'release_bot_x86', - 'win_x64_win8': 'debug_bot_x64', - 'win_x64_win10': 'debug_bot_x64', + 'win_x64_clang_dbg_win8': 'win_clang_debug_bot_x64', + 'win_x64_clang_dbg_win10': 'win_clang_debug_bot_x64', 'win_x64_uwp': 'win_uwp_release_bot_x64', - 'win_more_configs': { + 'win_x86_more_configs': { 'bwe_test_logging': 'bwe_test_logging_x86', 'dummy_audio_file_devices_no_protobuf': @@ -388,6 +393,9 @@ 'android_debug_static_bot_x64': [ 'android', 'gn', 'debug_static_bot', 'x64' ], + 'android_release_bot_x64': [ + 'android', 'gn', 'release_bot', 'x86' + ], 'android_asan_shared_release_bot_arm': [ 'android', 'gn', 'asan', 'clang', 'release_bot', 'arm' ],