Remove arm32 bots and redundant arm64 bots Also remove old unused config from mb_config.pyl. Change-Id: I0150005c60d077e92c4f987fb4eede2c082a102d Bug: webrtc:427152624 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/470220 Commit-Queue: Jeremy Leconte <jleconte@google.com> Reviewed-by: Christoffer Dewerin <jansson@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47634}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index ed71da2..76ff4d9 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json
@@ -1,8 +1,6 @@ { "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {}, - "Android32": {}, - "Android32 (dbg)": {}, "Android32 Builder arm": {}, "Android32 Builder x86": {}, "Android32 Builder x86 (dbg)": {},
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 7d24ab5..a955091 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json
@@ -1,1418 +1,6 @@ { "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {}, - "android_arm64_dbg": { - "gtest_tests": [ - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//examples:AppRTCMobile_test_apk", - "name": "AppRTCMobile_test_apk", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "AppRTCMobile_test_apk", - "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//sdk/android:android_instrumentation_test_apk", - "name": "android_instrumentation_test_apk", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "android_instrumentation_test_apk", - "test_id_prefix": "ninja://sdk/android:android_instrumentation_test_apk/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules/audio_coding:audio_decoder_unittests", - "name": "audio_decoder_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "audio_decoder_unittests", - "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:audio_engine_tests", - "name": "audio_engine_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "audio_engine_tests", - "test_id_prefix": "ninja://:audio_engine_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//call:call_tests", - "name": "call_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "call_tests", - "test_id_prefix": "ninja://call:call_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//common_audio:common_audio_unittests", - "name": "common_audio_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_audio_unittests", - "test_id_prefix": "ninja://common_audio:common_audio_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//common_video:common_video_unittests", - "name": "common_video_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//net/dcsctp:dcsctp_unittests", - "name": "dcsctp_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules:modules_tests", - "name": "modules_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 - }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules:modules_unittests", - "name": "modules_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 - }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:peerconnection_unittests", - "name": "peerconnection_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 - }, - "test": "peerconnection_unittests", - "test_id_prefix": "ninja://pc:peerconnection_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//call/adaptation:resource_adaptation_tests", - "name": "resource_adaptation_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "resource_adaptation_tests", - "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//media:rtc_media_unittests", - "name": "rtc_media_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:rtc_p2p_unittests", - "name": "rtc_p2p_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:rtc_pc_unittests", - "name": "rtc_pc_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//stats:rtc_stats_unittests", - "name": "rtc_stats_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:rtc_unittests", - "name": "rtc_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 - }, - "test": "rtc_unittests", - "test_id_prefix": "ninja://:rtc_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:slow_peer_connection_unittests", - "name": "slow_peer_connection_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "slow_peer_connection_unittests", - "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:svc_tests", - "name": "svc_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 8 - }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//system_wrappers:system_wrappers_unittests", - "name": "system_wrappers_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//test:test_support_unittests", - "name": "test_support_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//rtc_tools:tools_unittests", - "name": "tools_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//video/adaptation:video_adaptation_tests", - "name": "video_adaptation_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_adaptation_tests", - "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" - }, - { - "args": [ - "--webrtc_quick_perf_test", - "--nologs" - ], - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules/video_coding:video_codec_perf_tests", - "name": "video_codec_perf_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 - }, - "test": "video_codec_perf_tests", - "test_id_prefix": "ninja://modules/video_coding:video_codec_perf_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//video:video_tests", - "name": "video_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 - }, - "test": "video_tests", - "test_id_prefix": "ninja://video:video_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//video/timing:video_timing_tests", - "name": "video_timing_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_timing_tests", - "test_id_prefix": "ninja://video/timing:video_timing_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:voip_unittests", - "name": "voip_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "voip_unittests", - "test_id_prefix": "ninja://:voip_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:webrtc_nonparallel_tests", - "name": "webrtc_nonparallel_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "webrtc_nonparallel_tests", - "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" - }, - { - "args": [ - "--webrtc_quick_perf_test", - "--nologs" - ], - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:webrtc_perf_tests", - "name": "webrtc_perf_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "webrtc_perf_tests", - "test_id_prefix": "ninja://:webrtc_perf_tests/" - } - ], - "isolated_scripts": [ - { - "args": [ - "--shards=1" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//examples:android_examples_junit_tests", - "name": "android_examples_junit_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "android_examples_junit_tests", - "test_id_prefix": "ninja://examples:android_examples_junit_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//sdk/android:android_sdk_junit_tests", - "name": "android_sdk_junit_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "android_sdk_junit_tests", - "test_id_prefix": "ninja://sdk/android:android_sdk_junit_tests/" - } - ] - }, - "android_arm64_rel": { - "gtest_tests": [ - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//examples:AppRTCMobile_test_apk", - "name": "AppRTCMobile_test_apk", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "AppRTCMobile_test_apk", - "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//sdk/android:android_instrumentation_test_apk", - "name": "android_instrumentation_test_apk", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "android_instrumentation_test_apk", - "test_id_prefix": "ninja://sdk/android:android_instrumentation_test_apk/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules/audio_coding:audio_decoder_unittests", - "name": "audio_decoder_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "audio_decoder_unittests", - "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:audio_engine_tests", - "name": "audio_engine_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "audio_engine_tests", - "test_id_prefix": "ninja://:audio_engine_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//call:call_tests", - "name": "call_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "call_tests", - "test_id_prefix": "ninja://call:call_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//common_audio:common_audio_unittests", - "name": "common_audio_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_audio_unittests", - "test_id_prefix": "ninja://common_audio:common_audio_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//common_video:common_video_unittests", - "name": "common_video_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//net/dcsctp:dcsctp_unittests", - "name": "dcsctp_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules:modules_tests", - "name": "modules_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 - }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules:modules_unittests", - "name": "modules_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 - }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:peerconnection_unittests", - "name": "peerconnection_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 - }, - "test": "peerconnection_unittests", - "test_id_prefix": "ninja://pc:peerconnection_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//call/adaptation:resource_adaptation_tests", - "name": "resource_adaptation_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "resource_adaptation_tests", - "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//media:rtc_media_unittests", - "name": "rtc_media_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:rtc_p2p_unittests", - "name": "rtc_p2p_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:rtc_pc_unittests", - "name": "rtc_pc_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//stats:rtc_stats_unittests", - "name": "rtc_stats_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:rtc_unittests", - "name": "rtc_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 - }, - "test": "rtc_unittests", - "test_id_prefix": "ninja://:rtc_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:slow_peer_connection_unittests", - "name": "slow_peer_connection_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "slow_peer_connection_unittests", - "test_id_prefix": "ninja://pc:slow_peer_connection_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//pc:svc_tests", - "name": "svc_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 8 - }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//system_wrappers:system_wrappers_unittests", - "name": "system_wrappers_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//test:test_support_unittests", - "name": "test_support_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//rtc_tools:tools_unittests", - "name": "tools_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//video/adaptation:video_adaptation_tests", - "name": "video_adaptation_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_adaptation_tests", - "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" - }, - { - "args": [ - "--webrtc_quick_perf_test", - "--nologs" - ], - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//modules/video_coding:video_codec_perf_tests", - "name": "video_codec_perf_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 - }, - "test": "video_codec_perf_tests", - "test_id_prefix": "ninja://modules/video_coding:video_codec_perf_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//video:video_tests", - "name": "video_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 - }, - "test": "video_tests", - "test_id_prefix": "ninja://video:video_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//video/timing:video_timing_tests", - "name": "video_timing_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "video_timing_tests", - "test_id_prefix": "ninja://video/timing:video_timing_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:voip_unittests", - "name": "voip_unittests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "voip_unittests", - "test_id_prefix": "ninja://:voip_unittests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:webrtc_nonparallel_tests", - "name": "webrtc_nonparallel_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "webrtc_nonparallel_tests", - "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" - }, - { - "args": [ - "--webrtc_quick_perf_test", - "--nologs" - ], - "merge": { - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "module_name": "//:webrtc_perf_tests", - "name": "webrtc_perf_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "webrtc_perf_tests", - "test_id_prefix": "ninja://:webrtc_perf_tests/" - } - ], - "isolated_scripts": [ - { - "args": [ - "--shards=1" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//examples:android_examples_junit_tests", - "name": "android_examples_junit_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "android_examples_junit_tests", - "test_id_prefix": "ninja://examples:android_examples_junit_tests/" - }, - { - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "module_name": "//sdk/android:android_sdk_junit_tests", - "name": "android_sdk_junit_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "swarming": { - "dimensions": { - "android_devices": "1", - "device_os": "AP2A.240705.004", - "device_type": "panther", - "os": "Android" - }, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "android_sdk_junit_tests", - "test_id_prefix": "ninja://sdk/android:android_sdk_junit_tests/" - } - ] - }, "android_arm_dbg": { "gtest_tests": [ { @@ -2852,8 +1440,6 @@ } ] }, - "android_compile_arm64_dbg": {}, - "android_compile_arm64_rel": {}, "android_compile_arm_dbg": {}, "android_compile_arm_rel": {}, "android_compile_x64_dbg": {},
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 5ca99f8..103120f 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl
@@ -11,8 +11,6 @@ 'name': 'client.webrtc', 'mixins': [], 'machines': { - 'Android32': {}, - 'Android32 (dbg)': {}, 'Android32 Builder arm': {}, 'Android32 Builder x86': {}, 'Android32 Builder x86 (dbg)': {}, @@ -284,26 +282,6 @@ 'name': 'tryserver.webrtc', 'mixins': [], 'machines': { - 'android_arm64_dbg': { - 'mixins': [ - 'panther_on_14', 'android-devices', 'has_native_resultdb_integration', - 'chromium-tester-service-account' - ], - 'test_suites': { - 'gtest_tests': 'android_tests_tryserver', - 'isolated_scripts': 'android_junit_tests', - }, - }, - 'android_arm64_rel': { - 'mixins': [ - 'panther_on_14', 'android-devices', 'has_native_resultdb_integration', - 'chromium-tester-service-account' - ], - 'test_suites': { - 'gtest_tests': 'android_tests_tryserver', - 'isolated_scripts': 'android_junit_tests', - }, - }, 'android_arm_dbg': { 'mixins': [ 'panther_on_14', 'android-devices', 'has_native_resultdb_integration', @@ -333,8 +311,6 @@ 'isolated_scripts': 'android_junit_tests', }, }, - 'android_compile_arm64_dbg': {}, - 'android_compile_arm64_rel': {}, 'android_compile_arm_dbg': {}, 'android_compile_arm_rel': {}, 'android_compile_x64_dbg': {},
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl index 92c572e..445d98b 100644 --- a/tools_webrtc/mb/mb_config.pyl +++ b/tools_webrtc/mb/mb_config.pyl
@@ -21,18 +21,8 @@ # This is required because WebRTC mb.py overwrites the default configs # and Chromium's mb.py checks the default config contains 'chromium'. 'chromium': {}, - 'chromium.infra.codesearch': { - 'codesearch-gen-webrtc-android': { - 'android': 'android_debug_static_bot_arm', - }, - 'codesearch-gen-webrtc-linux': { - 'linux': 'codesearch_gen_linux_bot', - } - }, 'client.webrtc': { # Android - 'Android32': 'android_release_bot_arm', - 'Android32 (dbg)': 'android_debug_static_bot_arm', 'Android32 Builder arm': 'android_pure_release_bot_arm', 'Android32 Builder x86': 'android_release_bot_x86', 'Android32 Builder x86 (dbg)': 'android_debug_static_bot_x86', @@ -108,19 +98,6 @@ 'iOS64 Debug': 'ios_debug_bot_arm64', 'iOS64 Release': 'ios_release_bot_arm64', }, - 'client.webrtc.fyi': { - # Android - 'Android ASan (swarming)': 'android_asan_shared_release_bot_arm', - 'Android Perf (swarming)': 'android_pure_release_bot_arm', - - # Mac - 'Mac (swarming)': 'release_bot_x64', - - # Windows - 'Win (swarming)': 'release_bot_x86', - 'Win64 Debug (Win10)': 'debug_bot_x64', - 'Win64 Debug (Win8)': 'debug_bot_x64', - }, 'client.webrtc.perf': { # These are here because testers need to gn gen + ninja for the # webrtc_dashboard_upload target (otherwise a tester would not need to @@ -136,8 +113,6 @@ }, 'tryserver.webrtc': { # Android - 'android_arm64_dbg': 'android_release_bot_arm64', - 'android_arm64_rel': 'android_release_bot_arm64', 'android_arm_dbg': 'android_debug_static_bot_arm64', 'android_arm_more_configs': { 'dummy_audio_file_devices_no_protobuf': @@ -148,8 +123,6 @@ 'cxx23': 'use_cxx23_android_arm64', }, 'android_arm_rel': 'android_release_bot_arm64', - 'android_compile_arm64_dbg': 'android_debug_static_bot_arm64', - 'android_compile_arm64_rel': 'android_pure_release_bot_arm64', 'android_compile_arm_dbg': 'android_debug_static_bot_arm64', 'android_compile_arm_rel': 'android_pure_release_bot_arm64', 'android_compile_x64_dbg': 'android_debug_static_bot_x64', @@ -238,19 +211,6 @@ # A given config *may* be platform-specific but is not necessarily so (i.e., # we might have mac, win, and linux bots all using the 'release_bot' config). 'configs': { - 'android_asan_shared_release_bot_arm': [ - 'android', - 'asan', - 'clang', - 'pure_release_bot', - 'arm', - ], - 'android_debug_static_bot_arm': [ - 'android', - 'debug_static_bot', - 'arm', - 'h265', - ], 'android_debug_static_bot_arm64': [ 'android', 'debug_static_bot', @@ -279,12 +239,6 @@ 'pure_release_bot', 'arm64', ], - 'android_release_bot_arm': [ - 'android', - 'release_bot', - 'arm', - 'h265', - ], 'android_release_bot_arm64': [ 'android', 'release_bot', @@ -316,8 +270,6 @@ 'openh264', 'release_bot', 'x64', 'code_coverage', 'partial_code_coverage_instrumentation', 'h265' ], - 'codesearch_gen_linux_bot': - ['openh264', 'debug_bot', 'minimal_symbols', 'h265'], 'debug_bot_arm': ['openh264', 'debug_bot', 'arm', 'h265'], 'debug_bot_arm64': ['openh264', 'debug_bot', 'arm64', 'h265'], 'debug_bot_x64': ['openh264', 'debug_bot', 'x64', 'h265'],