Remove ios internal bots. Change-Id: Ic75d7d5d40fdffec9e90bec986913a1374f8615e Bug: b:487237998 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/451942 Commit-Queue: Jeremy Leconte <jleconte@google.com> Reviewed-by: Christoffer Dewerin <jansson@webrtc.org> Cr-Commit-Position: refs/heads/main@{#46989}
diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json index 772c387..fb25df4 100644 --- a/infra/specs/internal.client.webrtc.json +++ b/infra/specs/internal.client.webrtc.json
@@ -14,130 +14,6 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "module_name": "//common_audio:common_audio_unittests", - "name": "common_audio_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" - } - ], - "dimensions": { - "os": "iOS-18", - "pool": "chrome.tests" - }, - "named_caches": [ - { - "name": "xcode_ios_17a400", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_audio_unittests", - "test_id_prefix": "ninja://common_audio:common_audio_unittests/" - }, - { - "args": [ - "--xctest", - "--xcode-build-version", - "17a400", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//common_video:common_video_unittests", - "name": "common_video_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" - } - ], - "dimensions": { - "os": "iOS-18", - "pool": "chrome.tests" - }, - "named_caches": [ - { - "name": "xcode_ios_17a400", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/" - }, - { - "args": [ - "--readline-timeout=1200", - "--xctest", - "--xcode-build-version", - "17a400", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//modules:modules_tests", - "name": "modules_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" - } - ], - "dimensions": { - "os": "iOS-18", - "pool": "chrome.tests" - }, - "hard_timeout": 7200, - "io_timeout": 7200, - "named_caches": [ - { - "name": "xcode_ios_17a400", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 - }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/" - }, - { - "args": [ - "--xctest", - "--xcode-build-version", - "17a400", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, "module_name": "//modules:modules_unittests", "name": "modules_unittests", "resultdb": { @@ -518,130 +394,6 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "module_name": "//common_audio:common_audio_unittests", - "name": "common_audio_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" - } - ], - "dimensions": { - "os": "iOS-18", - "pool": "chrome.tests" - }, - "named_caches": [ - { - "name": "xcode_ios_17a400", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_audio_unittests", - "test_id_prefix": "ninja://common_audio:common_audio_unittests/" - }, - { - "args": [ - "--xctest", - "--xcode-build-version", - "17a400", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//common_video:common_video_unittests", - "name": "common_video_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" - } - ], - "dimensions": { - "os": "iOS-18", - "pool": "chrome.tests" - }, - "named_caches": [ - { - "name": "xcode_ios_17a400", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/" - }, - { - "args": [ - "--readline-timeout=1200", - "--xctest", - "--xcode-build-version", - "17a400", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//modules:modules_tests", - "name": "modules_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "cipd_packages": [ - { - "cipd_package": "infra/tools/mac_toolchain/${platform}", - "location": ".", - "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" - } - ], - "dimensions": { - "os": "iOS-18", - "pool": "chrome.tests" - }, - "hard_timeout": 7200, - "io_timeout": 7200, - "named_caches": [ - { - "name": "xcode_ios_17a400", - "path": "Xcode.app" - } - ], - "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 - }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/" - }, - { - "args": [ - "--xctest", - "--xcode-build-version", - "17a400", - "--out-dir", - "${ISOLATED_OUTDIR}" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, "module_name": "//modules:modules_unittests", "name": "modules_unittests", "resultdb": {
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index ec75d88..d69dd1e 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl
@@ -18,19 +18,6 @@ } } }, - 'arm64': { - 'swarming': { - 'dimensions': { - 'cpu': 'arm64' - } - } - }, - 'chrome-tester-service-account': { - 'swarming': { - 'service_account': - 'chrome-tester@chops-service-accounts.iam.gserviceaccount.com' - } - }, 'chromium-tester-service-account': { 'fail_if_unused': False, 'swarming': { @@ -66,23 +53,6 @@ 'has_native_resultdb_integration': True } }, - 'ios-device-18': { - 'swarming': { - 'dimensions': { - 'os': 'iOS-18', - 'pool': 'chrome.tests' - } - } - }, - 'ios-device-perf': { - 'swarming': { - 'idempotent': False, - 'dimensions': { - 'os': 'iOS-17.6.1', - 'pool': 'WebRTC' - } - } - }, 'ios_runtime_cache_17_5': { 'swarming': { 'named_caches': [{ @@ -240,12 +210,6 @@ 'shards': 8 } }, - 'timeout-2h': { - 'swarming': { - 'hard_timeout': 7200, - 'io_timeout': 7200 - } - }, 'timeout-3h': { 'swarming': { 'hard_timeout': 10800,
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 064f6fa..5ff53a3 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl
@@ -14,13 +14,6 @@ }, }, }, - 'arm64': { - 'swarming': { - 'dimensions': { - 'cpu': 'arm64' - } - } - }, 'cores-12': { 'swarming': { 'dimensions': { @@ -45,24 +38,6 @@ '--test-arg=--undefok=test_launcher_summary_output' ], }, - 'ios-device-18': { - 'swarming': { - 'dimensions': { - 'os': 'iOS-18', - 'pool': 'chrome.tests', - } - } - }, - 'ios-device-perf': { - 'swarming': { - 'idempotent': False, - 'dimensions': { - 'os': 'iOS-17.6.1', - 'pool': 'WebRTC', - #'device_status': 'available' - }, - }, - }, 'ios_runtime_cache_17_5': { 'swarming': { 'named_caches': [ @@ -212,12 +187,6 @@ 'shards': 8, }, }, - 'timeout-2h': { - 'swarming': { - 'hard_timeout': 7200, - 'io_timeout': 7200, - }, - }, 'timeout-3h': { 'swarming': { 'hard_timeout': 10800,
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 0e827a6..b3645f5 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl
@@ -144,34 +144,6 @@ # 'tools_unittests': {}, # }, - 'ios_device_tests': { - # TODO(bugs.webrtc.org/11362): Real XCTests fail to start on devices. - #'apprtcmobile_tests': {'mixins': ['xcodebuild-device-runner']}, - 'common_audio_unittests': {}, - 'common_video_unittests': {}, - 'modules_tests': { - 'mixins': ['shards-2', 'timeout-2h'], - 'args': [ - # Some tests exceed the default 180 seconds readline timeout. - '--readline-timeout=1200', - ] - }, - 'modules_unittests': { - 'mixins': ['shards-6'], - }, - 'rtc_p2p_unittests': {}, - 'rtc_pc_unittests': {}, - 'rtc_stats_unittests': {}, - # TODO(bugs.webrtc.org/11362): Real XCTests fail to start on devices. - #'sdk_framework_unittests': {'mixins': ['xcodebuild-device-runner']}, - #'sdk_unittests': {'mixins': ['xcodebuild-device-runner']}, - 'system_wrappers_unittests': {}, - 'test_support_unittests': {}, - 'tools_unittests': {}, - 'video_engine_tests': { - 'mixins': ['shards-4'], - }, - }, 'ios_simulator_tests': { 'apprtcmobile_tests': { 'mixins': ['xcodebuild_sim_runner'] @@ -229,11 +201,6 @@ 'mixins': ['perf-webrtc-perf-tests'], }, }, - 'perf_tests_no_video_codec': { - 'webrtc_perf_tests': { - 'mixins': ['perf-webrtc-perf-tests'], - }, - }, 'perf_tests_save_worst_frame': { 'video_codec_perf_tests': { 'mixins': ['perf-video-codec-perf-tests'],
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 48283ff..a716f5e 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl
@@ -299,45 +299,6 @@ }, }, { - 'name': 'internal.client.webrtc', - 'mixins': [], - 'machines': { - 'iOS64 Debug': { - 'mixins': [ - 'ios-device-18', 'webrtc-xctest', 'chrome-tester-service-account', - 'xcode_26_main', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' - ], - 'test_suites': { - 'isolated_scripts': 'ios_device_tests', - }, - }, - 'iOS64 Perf': { - 'mixins': [ - 'arm64', 'ios-device-perf', 'webrtc-xctest', 'timeout-3h', - 'chrome-tester-service-account', 'xcode_26_main', 'mac_toolchain', - 'has_native_resultdb_integration', 'out_dir_arg' - ], - 'test_suites': { - 'isolated_scripts': 'perf_tests_no_video_codec', - }, - 'args': [ - '--write_perf_output_on_ios', - ], - }, - 'iOS64 Release': { - 'mixins': [ - 'ios-device-18', 'webrtc-xctest', 'chrome-tester-service-account', - 'xcode_26_main', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' - ], - 'test_suites': { - 'isolated_scripts': 'ios_device_tests', - }, - }, - }, - }, - { 'name': 'tryserver.webrtc', 'mixins': [], 'machines': {
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index 463b063..a2bff5c 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl
@@ -134,11 +134,6 @@ 'Perf Mac M1 Arm64 12': 'release_bot_x64', 'Perf Win 10': 'release_bot_x64', }, - 'internal.client.webrtc': { - 'iOS64 Debug': 'ios_internal_debug_bot_arm64', - 'iOS64 Perf': 'ios_internal_pure_release_bot_arm64', - 'iOS64 Release': 'ios_internal_release_bot_arm64', - }, 'tryserver.webrtc': { # Android 'android_arm64_dbg': 'android_release_bot_arm64', @@ -353,31 +348,6 @@ 'arm64', 'xctest', ], - 'ios_internal_debug_bot_arm64': [ - 'ios', - 'ios_device', - 'debug_bot', - 'arm64', - 'ios_code_signing_identity_description', - 'xctest', - ], - 'ios_internal_pure_release_bot_arm64': [ - 'ios', - 'ios_device', - 'pure_release_bot', - 'arm64', - 'ios_code_signing_identity_description', - 'xctest', - 'rtc_objc_test_prefix', - ], - 'ios_internal_release_bot_arm64': [ - 'ios', - 'ios_device', - 'release_bot', - 'arm64', - 'ios_code_signing_identity_description', - 'xctest', - ], 'ios_release_bot_arm64': [ 'ios', 'ios_simulator', @@ -569,12 +539,6 @@ 'ios': { 'gn_args': 'target_os="ios"', }, - 'ios_code_signing_identity_description': { - 'gn_args': 'ios_code_signing_identity_description="Apple Development"', - }, - 'ios_device': { - 'gn_args': 'target_environment="device"' - }, 'ios_simulator': { 'gn_args': 'target_environment="simulator"' },