Remove perf tests from the builders.

Also fix wrong iOS bot definition in waterfalls.pyl.

Bug: webrtc:13899
Change-Id: I3146751a49d359cdb17324b53065757b0e93e402
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258661
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36521}
This commit is contained in:
Jeremy Leconte
2022-04-11 13:22:21 +02:00
committed by WebRTC LUCI CQ
parent 4bc12200b6
commit ed1bc59a6e
2 changed files with 12 additions and 266 deletions

View File

@ -1238,46 +1238,7 @@
} }
] ]
}, },
"Android32 Builder arm": { "Android32 Builder arm": {},
"gtest_tests": [
{
"args": [
"--android",
"--adb-path",
"../../third_party/android_sdk/public/platform-tools/adb"
],
"merge": {
"args": [
"--test-suite",
"low_bandwidth_audio_perf_test"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "low_bandwidth_audio_perf_test",
"test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
},
{
"args": [
"--nologs"
],
"merge": {
"args": [
"--test-suite",
"webrtc_perf_tests"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "webrtc_perf_tests",
"test_id_prefix": "ninja://:webrtc_perf_tests/"
}
]
},
"Android32 Builder x86": {}, "Android32 Builder x86": {},
"Android32 Builder x86 (dbg)": {}, "Android32 Builder x86 (dbg)": {},
"Android64 (M Nexus5X)": { "Android64 (M Nexus5X)": {
@ -2482,46 +2443,7 @@
} }
] ]
}, },
"Android64 Builder arm64": { "Android64 Builder arm64": {},
"gtest_tests": [
{
"args": [
"--android",
"--adb-path",
"../../third_party/android_sdk/public/platform-tools/adb"
],
"merge": {
"args": [
"--test-suite",
"low_bandwidth_audio_perf_test"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "low_bandwidth_audio_perf_test",
"test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
},
{
"args": [
"--nologs"
],
"merge": {
"args": [
"--test-suite",
"webrtc_perf_tests"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "webrtc_perf_tests",
"test_id_prefix": "ninja://:webrtc_perf_tests/"
}
]
},
"Android64 Builder x64 (dbg)": {}, "Android64 Builder x64 (dbg)": {},
"Linux (more configs)": { "Linux (more configs)": {
"isolated_scripts": [ "isolated_scripts": [
@ -5260,45 +5182,7 @@
] ]
}, },
"Linux32 Release (ARM)": {}, "Linux32 Release (ARM)": {},
"Linux64 Builder": { "Linux64 Builder": {},
"isolated_scripts": [
{
"isolate_name": "low_bandwidth_audio_perf_test",
"merge": {
"args": [
"--test-suite",
"low_bandwidth_audio_perf_test"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"name": "low_bandwidth_audio_perf_test",
"swarming": {
"can_use_on_swarming_builders": true
},
"test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
},
{
"args": [
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
"--save_worst_frame",
"--nologs"
],
"isolate_name": "webrtc_perf_tests",
"merge": {
"args": [
"--test-suite",
"webrtc_perf_tests"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"name": "webrtc_perf_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test_id_prefix": "ninja://:webrtc_perf_tests/"
}
]
},
"Linux64 Debug": { "Linux64 Debug": {
"isolated_scripts": [ "isolated_scripts": [
{ {
@ -6503,57 +6387,7 @@
} }
] ]
}, },
"Mac64 Builder": { "Mac64 Builder": {},
"isolated_scripts": [
{
"isolate_name": "low_bandwidth_audio_perf_test",
"merge": {
"args": [
"--test-suite",
"low_bandwidth_audio_perf_test"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"name": "low_bandwidth_audio_perf_test",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Mac"
}
]
},
"test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
},
{
"args": [
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
"--save_worst_frame",
"--nologs"
],
"isolate_name": "webrtc_perf_tests",
"merge": {
"args": [
"--test-suite",
"webrtc_perf_tests"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"name": "webrtc_perf_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Mac"
}
]
},
"test_id_prefix": "ninja://:webrtc_perf_tests/"
}
]
},
"Mac64 Debug": { "Mac64 Debug": {
"isolated_scripts": [ "isolated_scripts": [
{ {
@ -7799,45 +7633,7 @@
} }
] ]
}, },
"Win32 Builder (Clang)": { "Win32 Builder (Clang)": {},
"isolated_scripts": [
{
"isolate_name": "low_bandwidth_audio_perf_test",
"merge": {
"args": [
"--test-suite",
"low_bandwidth_audio_perf_test"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"name": "low_bandwidth_audio_perf_test",
"swarming": {
"can_use_on_swarming_builders": true
},
"test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
},
{
"args": [
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
"--save_worst_frame",
"--nologs"
],
"isolate_name": "webrtc_perf_tests",
"merge": {
"args": [
"--test-suite",
"webrtc_perf_tests"
],
"script": "//tools_webrtc/perf/process_perf_results_py2.py"
},
"name": "webrtc_perf_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test_id_prefix": "ninja://:webrtc_perf_tests/"
}
]
},
"Win32 Debug (Clang)": {}, "Win32 Debug (Clang)": {},
"Win32 Release (Clang)": { "Win32 Release (Clang)": {
"isolated_scripts": [ "isolated_scripts": [

View File

@ -40,11 +40,7 @@
'gtest_tests': 'more_configs_tests', 'gtest_tests': 'more_configs_tests',
}, },
}, },
'Android32 Builder arm': { 'Android32 Builder arm': {},
'test_suites': {
'gtest_tests': 'android_perf_tests',
},
},
'Android32 Builder x86': {}, 'Android32 Builder x86': {},
'Android32 Builder x86 (dbg)': {}, 'Android32 Builder x86 (dbg)': {},
'Android64 (M Nexus5X)': { 'Android64 (M Nexus5X)': {
@ -67,11 +63,7 @@
'junit_tests': 'android_junit_tests', 'junit_tests': 'android_junit_tests',
}, },
}, },
'Android64 Builder arm64': { 'Android64 Builder arm64': {},
'test_suites': {
'gtest_tests': 'android_perf_tests',
},
},
'Android64 Builder x64 (dbg)': {}, 'Android64 Builder x64 (dbg)': {},
'Linux (more configs)': { 'Linux (more configs)': {
'os_type': 'linux', 'os_type': 'linux',
@ -131,12 +123,7 @@
}, },
}, },
'Linux32 Release (ARM)': {}, 'Linux32 Release (ARM)': {},
'Linux64 Builder': { 'Linux64 Builder': {},
'os_type': 'linux',
'test_suites': {
'isolated_scripts': 'desktop_perf_tests',
},
},
'Linux64 Debug': { 'Linux64 Debug': {
'os_type': 'linux', 'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
@ -161,13 +148,7 @@
'isolated_scripts': 'desktop_tests', 'isolated_scripts': 'desktop_tests',
}, },
}, },
'Mac64 Builder': { 'Mac64 Builder': {},
'os_type': 'mac',
'mixins': ['mac', 'x86-64'],
'test_suites': {
'isolated_scripts': 'desktop_perf_tests',
},
},
'Mac64 Debug': { 'Mac64 Debug': {
'os_type': 'mac', 'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'], 'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'],
@ -196,12 +177,7 @@
'isolated_scripts': 'more_configs_tests', 'isolated_scripts': 'more_configs_tests',
}, },
}, },
'Win32 Builder (Clang)': { 'Win32 Builder (Clang)': {},
'os_type': 'win',
'test_suites': {
'isolated_scripts': 'desktop_perf_tests',
},
},
'Win32 Debug (Clang)': {}, 'Win32 Debug (Clang)': {},
'Win32 Release (Clang)': { 'Win32 Release (Clang)': {
'os_type': 'win', 'os_type': 'win',
@ -451,34 +427,8 @@
'android_compile_x64_rel': {}, 'android_compile_x64_rel': {},
'android_compile_x86_dbg': {}, 'android_compile_x86_dbg': {},
'android_compile_x86_rel': {}, 'android_compile_x86_rel': {},
'ios_compile_arm64_dbg': { 'ios_compile_arm64_dbg': {},
'recipe_config': 'webrtc_ios', 'ios_compile_arm64_rel': {},
'chromium_apply_config': ['mac_toolchain'],
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Debug',
'TARGET_PLATFORM': 'ios',
'TARGET_ARCH': 'arm',
'TARGET_BITS': 64,
},
'bot_type': 'builder',
'testing': {
'platform': 'mac'
},
},
'ios_compile_arm64_rel': {
'recipe_config': 'webrtc_ios',
'chromium_apply_config': ['mac_toolchain'],
'chromium_config_kwargs': {
'BUILD_CONFIG': 'Release',
'TARGET_PLATFORM': 'ios',
'TARGET_ARCH': 'arm',
'TARGET_BITS': 64,
},
'bot_type': 'builder',
'testing': {
'platform': 'mac'
},
},
'ios_sim_x64_dbg_ios12': { 'ios_sim_x64_dbg_ios12': {
'mixins': [ 'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4', 'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',