From e085366aca99110763544cfdbbf239002428b4dc Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Wed, 16 Nov 2022 08:26:53 +0100 Subject: [PATCH] Fix some minor issues with the android bots. * Use the same logdog_butler as Chromium instead of redefining one. * Use luci-auth to prevent "local auth - HTTP 400" errors. Change-Id: I2a0d1393f9f0e1e41b2bcc9a9fec2c50c19675f3 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283520 Reviewed-by: Mirko Bonadei Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#38637} --- infra/specs/client.webrtc.json | 800 ++++++---------------------- infra/specs/mixins.pyl | 12 - infra/specs/mixins_webrtc.pyl | 11 - infra/specs/tryserver.webrtc.json | 840 ++++++------------------------ infra/specs/waterfalls.pyl | 40 +- tools_webrtc/mb/mb.py | 9 +- tools_webrtc/mb/mb_unittest.py | 10 +- 7 files changed, 331 insertions(+), 1391 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index d41339b371..757476b28c 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -14,20 +14,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -43,20 +37,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -72,20 +60,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -101,20 +83,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -130,20 +106,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -159,20 +129,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -188,13 +152,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -202,6 +159,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -218,13 +176,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -232,6 +183,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -248,13 +200,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -262,6 +207,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -278,20 +224,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -307,20 +247,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -336,20 +270,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -365,13 +293,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -379,6 +300,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -395,20 +317,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -424,13 +340,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -438,6 +347,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -454,20 +364,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -483,20 +387,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -512,20 +410,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -541,13 +433,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -555,6 +440,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -571,20 +457,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -600,20 +480,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" @@ -655,20 +529,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -684,20 +552,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -713,20 +575,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -742,20 +598,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -771,20 +621,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -800,20 +644,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -829,13 +667,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -843,6 +674,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -859,13 +691,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -873,6 +698,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -889,13 +715,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -903,6 +722,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -919,20 +739,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -948,20 +762,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -977,20 +785,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -1006,13 +808,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1020,6 +815,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -1036,20 +832,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1065,13 +855,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1079,6 +862,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -1095,20 +879,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1124,20 +902,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -1153,20 +925,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -1182,13 +948,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1196,6 +955,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -1212,20 +972,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -1241,20 +995,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" @@ -1296,13 +1044,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1310,6 +1051,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -1333,20 +1075,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -1362,20 +1098,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1391,20 +1121,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1420,20 +1144,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1449,20 +1167,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1478,20 +1190,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -1507,13 +1213,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1521,6 +1220,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -1537,13 +1237,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1551,6 +1244,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -1567,13 +1261,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1581,6 +1268,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -1597,20 +1285,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -1626,20 +1308,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -1655,20 +1331,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -1684,13 +1354,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1698,6 +1361,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -1714,20 +1378,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1743,13 +1401,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1757,6 +1408,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -1773,20 +1425,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1802,20 +1448,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -1831,20 +1471,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -1860,13 +1494,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1874,6 +1501,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -1890,20 +1518,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -1919,20 +1541,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" @@ -1974,20 +1590,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -2003,20 +1613,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2032,20 +1636,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2061,20 +1659,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2090,20 +1682,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2119,20 +1705,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -2148,13 +1728,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2162,6 +1735,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -2178,13 +1752,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2192,6 +1759,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -2208,13 +1776,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2222,6 +1783,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -2238,20 +1800,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -2267,20 +1823,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -2296,20 +1846,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -2325,13 +1869,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2339,6 +1876,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -2355,20 +1893,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2384,13 +1916,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2398,6 +1923,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -2414,20 +1940,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2443,20 +1963,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -2472,20 +1986,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -2501,13 +2009,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2515,6 +2016,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -2531,20 +2033,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -2560,20 +2056,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 3e3c9b716e..47e4be5dda 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -145,18 +145,6 @@ } } }, - 'logdog-butler': { - 'swarming': { - 'cipd_packages': [{ - 'cipd_package': - 'infra/tools/luci/logdog/butler/${platform}', - 'location': - 'bin', - 'revision': - 'git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c' - }] - } - }, 'mac-m1-cpu': { 'swarming': { 'dimensions': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 9b442c85bb..4700c2c4dd 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -118,17 +118,6 @@ }, } }, - 'logdog-butler': { - 'swarming': { - 'cipd_packages': [ - { - "cipd_package": 'infra/tools/luci/logdog/butler/${platform}', - 'location': 'bin', - 'revision': 'git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c', - }, - ], - }, - }, 'mac-m1-cpu': { 'swarming': { 'dimensions': { diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 4fce72e92c..297a1682ac 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -14,20 +14,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -43,20 +37,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -72,20 +60,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -101,20 +83,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -130,20 +106,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -159,20 +129,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -188,13 +152,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -202,6 +159,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -218,13 +176,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -232,6 +183,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -248,13 +200,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -262,6 +207,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -278,20 +224,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -307,20 +247,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -336,20 +270,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -365,13 +293,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -379,6 +300,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -395,20 +317,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -424,13 +340,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -438,6 +347,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -454,20 +364,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -483,20 +387,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -512,20 +410,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -541,13 +433,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -555,6 +440,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -571,20 +457,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -600,20 +480,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" @@ -633,20 +507,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_perf_tests", "test_id_prefix": "ninja://:webrtc_perf_tests/" @@ -688,20 +556,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -717,20 +579,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -746,20 +602,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -775,20 +625,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -804,20 +648,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -833,20 +671,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -862,13 +694,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -876,6 +701,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -892,13 +718,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -906,6 +725,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -922,13 +742,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -936,6 +749,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -952,20 +766,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -981,20 +789,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -1010,20 +812,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -1039,13 +835,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1053,6 +842,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -1069,20 +859,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1098,13 +882,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1112,6 +889,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -1128,20 +906,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1157,20 +929,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -1186,20 +952,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -1215,13 +975,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1229,6 +982,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -1245,20 +999,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -1274,20 +1022,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" @@ -1307,20 +1049,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_perf_tests", "test_id_prefix": "ninja://:webrtc_perf_tests/" @@ -1362,20 +1098,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -1391,20 +1121,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1420,20 +1144,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1449,20 +1167,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1478,20 +1190,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1507,20 +1213,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -1536,13 +1236,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1550,6 +1243,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -1566,13 +1260,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1580,6 +1267,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -1596,13 +1284,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1610,6 +1291,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -1626,20 +1308,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -1655,20 +1331,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -1684,20 +1354,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -1713,13 +1377,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1727,6 +1384,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -1743,20 +1401,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1772,13 +1424,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1786,6 +1431,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -1802,20 +1448,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -1831,20 +1471,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -1860,20 +1494,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -1889,13 +1517,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -1903,6 +1524,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -1919,20 +1541,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -1948,20 +1564,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" @@ -1981,20 +1591,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_perf_tests", "test_id_prefix": "ninja://:webrtc_perf_tests/" @@ -2036,13 +1640,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2050,6 +1647,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -2070,20 +1668,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "AppRTCMobile_test_apk", "test_id_prefix": "ninja://examples:AppRTCMobile_test_apk/" @@ -2099,20 +1691,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2128,20 +1714,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2157,20 +1737,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2186,20 +1760,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2215,20 +1783,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" @@ -2244,13 +1806,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2258,6 +1813,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 }, "test": "modules_tests", @@ -2274,13 +1830,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2288,6 +1837,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "modules_unittests", @@ -2304,13 +1854,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2318,6 +1861,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "peerconnection_unittests", @@ -2334,20 +1878,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/" @@ -2363,20 +1901,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/" @@ -2392,20 +1924,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/" @@ -2421,13 +1947,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2435,6 +1954,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 6 }, "test": "rtc_unittests", @@ -2451,20 +1971,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2480,13 +1994,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2494,6 +2001,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "svc_tests", @@ -2510,20 +2018,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "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/" @@ -2539,20 +2041,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/" @@ -2568,20 +2064,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/" @@ -2597,13 +2087,6 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", @@ -2611,6 +2094,7 @@ "os": "Android" } ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 4 }, "test": "video_engine_tests", @@ -2627,20 +2111,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/" @@ -2656,20 +2134,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/" @@ -2689,20 +2161,14 @@ }, "swarming": { "can_use_on_swarming_builders": true, - "cipd_packages": [ - { - "cipd_package": "infra/tools/luci/logdog/butler/${platform}", - "location": "bin", - "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" - } - ], "dimension_sets": [ { "android_devices": "1", "device_type": "walleye", "os": "Android" } - ] + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_perf_tests", "test_id_prefix": "ninja://:webrtc_perf_tests/" diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 7cdeef456d..6b21e861b5 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -13,8 +13,8 @@ 'machines': { 'Android32 (M Nexus5X)': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests', @@ -23,8 +23,8 @@ }, 'Android32 (M Nexus5X)(dbg)': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests', @@ -33,8 +33,8 @@ }, 'Android32 (more configs)': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'more_configs_tests', @@ -45,8 +45,8 @@ 'Android32 Builder x86 (dbg)': {}, 'Android64 (M Nexus5X)': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests', @@ -55,8 +55,8 @@ }, 'Android64 (M Nexus5X)(dbg)': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests', @@ -402,8 +402,8 @@ 'machines': { 'android_arm64_dbg': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests_tryserver', @@ -412,8 +412,8 @@ }, 'android_arm64_rel': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests_tryserver', @@ -422,8 +422,8 @@ }, 'android_arm_dbg': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests_tryserver', @@ -432,8 +432,8 @@ }, 'android_arm_more_configs': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'more_configs_tests', @@ -441,8 +441,8 @@ }, 'android_arm_rel': { 'mixins': [ - 'walleye', 'android-devices', 'logdog-butler', - 'has_native_resultdb_integration' + 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'chromium-tester-service-account' ], 'test_suites': { 'gtest_tests': 'android_tests_tryserver', diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index 07cb14c016..ada97df55c 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -81,10 +81,11 @@ class WebRTCMetaBuildWrapper(mb.MetaBuildWrapper): ] elif is_android: cmdline += [ - vpython_exe, '../../build/android/test_wrapper/logdog_wrapper.py', - '--target', target, '--logdog-bin-cmd', '../../bin/logdog_butler', - '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', - '--store-tombstones' + 'luci-auth', 'context', '--', vpython_exe, + '../../build/android/test_wrapper/logdog_wrapper.py', '--target', + target, '--logdog-bin-cmd', + '../../.task_template_packages/logdog_butler', '--logcat-output-file', + '${ISOLATED_OUTDIR}/logcats', '--store-tombstones' ] elif is_ios or is_fuchsia: cmdline += [ diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py index 109d2bcb2d..f7faa95dac 100755 --- a/tools_webrtc/mb/mb_unittest.py +++ b/tools_webrtc/mb/mb_unittest.py @@ -324,12 +324,15 @@ class UnitTest(unittest.TestCase): files, ['../../.vpython3', '../../testing/test_env.py', 'foo_unittests']) self.assertEqual(command, [ + 'luci-auth', + 'context', + '--', 'vpython3', '../../build/android/test_wrapper/logdog_wrapper.py', '--target', 'foo_unittests', '--logdog-bin-cmd', - '../../bin/logdog_butler', + '../../.task_template_packages/logdog_butler', '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones', @@ -363,12 +366,15 @@ class UnitTest(unittest.TestCase): files, ['../../.vpython3', '../../testing/test_env.py', 'foo_unittests']) self.assertEqual(command, [ + 'luci-auth', + 'context', + '--', 'vpython3', '../../build/android/test_wrapper/logdog_wrapper.py', '--target', 'foo_unittests', '--logdog-bin-cmd', - '../../bin/logdog_butler', + '../../.task_template_packages/logdog_butler', '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones',