From dfb54b57475be29b6ace69ed32622a96fb05e8be Mon Sep 17 00:00:00 2001 From: Christoffer Jansson Date: Mon, 11 Dec 2023 09:53:21 +0000 Subject: [PATCH] Remove video_capture_tests Bug: b/312914606 Change-Id: I449647ba0158d947a6cff401139cf92ec05b23b4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/330562 Reviewed-by: Jeremy Leconte Reviewed-by: Jeremy Leconte Commit-Queue: Christoffer Dewerin Cr-Commit-Position: refs/heads/main@{#41349} --- infra/specs/client.webrtc.json | 201 ---------------------- infra/specs/internal.client.webrtc.json | 80 --------- infra/specs/mixins.pyl | 14 -- infra/specs/mixins_webrtc.pyl | 14 -- infra/specs/test_suites.pyl | 19 -- infra/specs/tryserver.webrtc.json | 220 ------------------------ infra/specs/waterfalls.pyl | 10 +- 7 files changed, 3 insertions(+), 555 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 6f8bfb5ba5..f2dcd96f75 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -5168,24 +5168,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "result_format": "json" - }, - "swarming": { - "dimensions": { - "cpu": "x86-64", - "os": "Ubuntu-18.04", - "pool": "WebRTC-baremetal" - } - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -6226,24 +6208,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "result_format": "json" - }, - "swarming": { - "dimensions": { - "cpu": "x86-64", - "os": "Mac-12", - "pool": "WebRTC-baremetal" - } - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -7934,24 +7898,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "result_format": "json" - }, - "swarming": { - "dimensions": { - "cpu": "x86-64", - "os": "Windows-10-19045", - "pool": "WebRTC-baremetal" - } - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10534,153 +10480,6 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/", "variant_id": "iPhone X 16.2" }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "14.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "13c100" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests iPhone X 14.5", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "caches": "xcode_ios_13c100", - "cpu": "x86-64", - "os": "Mac-12" - }, - "named_caches": [ - { - "name": "xcode_ios_13c100", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_14_5", - "path": "Runtime-ios-14.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/", - "variant_id": "iPhone X 14.5" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "14c18" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests iPhone X 15.5", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "caches": "xcode_ios_14c18", - "cpu": "x86-64", - "os": "Mac-12" - }, - "named_caches": [ - { - "name": "xcode_ios_14c18", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/", - "variant_id": "iPhone X 15.5" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.2", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "14c18" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests iPhone X 16.2", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "caches": "xcode_ios_14c18", - "cpu": "x86-64", - "os": "Mac-12" - }, - "named_caches": [ - { - "name": "xcode_ios_14c18", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_2", - "path": "Runtime-ios-16.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/", - "variant_id": "iPhone X 16.2" - }, { "args": [ "--platform", diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json index 59547fc132..4d4907259f 100644 --- a/infra/specs/internal.client.webrtc.json +++ b/infra/specs/internal.client.webrtc.json @@ -368,46 +368,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "args": [ - "--xctest", - "--xcode-build-version", - "15a507", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "device_status": "available", - "os": "iOS-16.6", - "pool": "chrome.tests" - }, - "named_caches": [ - { - "name": "xcode_ios_15a507", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "args": [ "--xctest", @@ -873,46 +833,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "args": [ - "--xctest", - "--xcode-build-version", - "15a507", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "device_status": "available", - "os": "iOS-16.6", - "pool": "chrome.tests" - }, - "named_caches": [ - { - "name": "xcode_ios_15a507", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "args": [ "--xctest", diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index e436846ef0..fb5fa750d7 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -18,20 +18,6 @@ } } }, - 'baremetal-pool': { - 'swarming': { - 'dimensions': { - 'pool': 'WebRTC-baremetal' - } - } - }, - 'baremetal-try-pool': { - 'swarming': { - 'dimensions': { - 'pool': 'WebRTC-baremetal-try' - } - } - }, 'chrome-tester-service-account': { 'swarming': { 'service_account': diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 443a4450eb..99b6335ea4 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -14,20 +14,6 @@ }, }, }, - 'baremetal-pool': { - 'swarming': { - 'dimensions': { - 'pool': 'WebRTC-baremetal', - }, - }, - }, - 'baremetal-try-pool': { - 'swarming': { - 'dimensions': { - 'pool': 'WebRTC-baremetal-try', - }, - }, - }, 'cores-12': { 'swarming': { 'dimensions': { diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 570314c9bd..3457f9df00 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -95,9 +95,6 @@ 'shared_screencast_stream_test': {}, }, 'desktop_tests_try_server_specific': { - 'video_capture_tests': { - 'mixins': ['baremetal-try-pool'], - }, 'video_codec_perf_tests': { 'mixins': ['quick-perf-tests', 'resultdb-gtest-json-format'], }, @@ -155,7 +152,6 @@ 'system_wrappers_unittests': {}, 'test_support_unittests': {}, 'tools_unittests': {}, - 'video_capture_tests': {}, 'video_engine_tests': { 'mixins': ['shards-4'], }, @@ -192,7 +188,6 @@ 'system_wrappers_unittests': {}, 'test_support_unittests': {}, 'tools_unittests': {}, - 'video_capture_tests': {}, 'video_engine_tests': { 'mixins': ['shards-4'], }, @@ -231,11 +226,6 @@ ], }, }, - 'video_capture_tests': { - 'video_capture_tests': { - 'mixins': ['baremetal-pool'], - } - }, }, ############################################################################## @@ -250,20 +240,11 @@ 'desktop_tests', 'desktop_tests_try_server_specific', ], - 'desktop_tests_with_video_capture': [ - 'desktop_tests', - 'video_capture_tests', - ], 'linux_desktop_tests_tryserver': [ 'desktop_tests', 'desktop_tests_linux_specific', 'desktop_tests_try_server_specific', ], - 'linux_desktop_tests_with_video_capture': [ - 'desktop_tests', - 'desktop_tests_linux_specific', - 'video_capture_tests', - ], 'linux_tests': [ 'desktop_tests', 'desktop_tests_linux_specific', diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 61e47fd0f8..28cf11488a 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -4742,153 +4742,6 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/", "variant_id": "iPhone X 16.2" }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "14.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "13c100" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests iPhone X 14.5", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "caches": "xcode_ios_13c100", - "cpu": "x86-64", - "os": "Mac-12" - }, - "named_caches": [ - { - "name": "xcode_ios_13c100", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_14_5", - "path": "Runtime-ios-14.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/", - "variant_id": "iPhone X 14.5" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "14c18" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests iPhone X 15.5", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "caches": "xcode_ios_14c18", - "cpu": "x86-64", - "os": "Mac-12" - }, - "named_caches": [ - { - "name": "xcode_ios_14c18", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/", - "variant_id": "iPhone X 15.5" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.2", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "14c18" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests iPhone X 16.2", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce" - } - ], - "dimensions": { - "caches": "xcode_ios_14c18", - "cpu": "x86-64", - "os": "Mac-12" - }, - "named_caches": [ - { - "name": "xcode_ios_14c18", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_2", - "path": "Runtime-ios-16.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/", - "variant_id": "iPhone X 16.2" - }, { "args": [ "--platform", @@ -6004,25 +5857,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "isolate_profile_data": true, - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "result_format": "json" - }, - "swarming": { - "dimensions": { - "cpu": "x86-64", - "os": "Ubuntu-18.04", - "pool": "WebRTC-baremetal-try" - } - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "args": [ "--webrtc_quick_perf_test", @@ -7480,24 +7314,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "result_format": "json" - }, - "swarming": { - "dimensions": { - "cpu": "x86-64", - "os": "Ubuntu-18.04", - "pool": "WebRTC-baremetal-try" - } - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "args": [ "--webrtc_quick_perf_test", @@ -10615,24 +10431,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "result_format": "json" - }, - "swarming": { - "dimensions": { - "cpu": "x86-64", - "os": "Mac-12", - "pool": "WebRTC-baremetal-try" - } - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "args": [ "--webrtc_quick_perf_test", @@ -12681,24 +12479,6 @@ "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "video_capture_tests", - "resultdb": { - "result_format": "json" - }, - "swarming": { - "dimensions": { - "cpu": "x86-64", - "os": "Windows-10-19045", - "pool": "WebRTC-baremetal-try" - } - }, - "test": "video_capture_tests", - "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/" - }, { "args": [ "--webrtc_quick_perf_test", diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 76c1760d1d..d1c60ce2c9 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -154,7 +154,7 @@ 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_desktop_tests_with_video_capture', + 'isolated_scripts': 'linux_tests', }, }, 'Linux64 Release (ARM)': {}, @@ -178,14 +178,12 @@ 'os_type': 'mac', 'mixins': ['mac_12_x64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'desktop_tests_with_video_capture', + 'isolated_scripts': 'desktop_tests', }, }, 'MacARM64 M1 Release': { 'os_type': 'mac', 'mixins': ['mac_12_arm64', 'mac-m1-cpu', 'resultdb-json-format'], - # TODO(b/228171565): Replace desktop_tests by desktop_tests_with_video_capture when - # there is a camera available for the baremetal m1 machines. 'test_suites': { 'isolated_scripts': 'desktop_tests', }, @@ -225,7 +223,7 @@ 'os_type': 'win', 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'desktop_tests_with_video_capture', + 'isolated_scripts': 'desktop_tests', }, }, 'iOS Debug (simulator)': { @@ -574,8 +572,6 @@ 'mac_rel_m1': { 'os_type': 'mac', 'mixins': ['mac_12_arm64', 'mac-m1-cpu', 'resultdb-json-format'], - # TODO(b/228171565): Replace desktop_tests by desktop_tests_tryserver when - # there is a camera available for the baremetal-try m1 machines. 'test_suites': { 'isolated_scripts': 'desktop_tests', },