Use Pixel 7 phones to run WebRTC Android tests. Update some test expectations to prevent pixel rounding errors: https://ci.chromium.org/ui/p/webrtc/builders/try/android_arm64_rel/93728/overview Change-Id: I45f8dd06f942ee15ab19f3809ce538d630899048 Bug: webrtc:427152624 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/469560 Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#47598}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 062c395..bb19415 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json
@@ -1293,7 +1293,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1314,7 +1315,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1335,7 +1337,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1356,7 +1359,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1377,7 +1381,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1398,7 +1403,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1419,7 +1425,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1440,7 +1447,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1461,7 +1469,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1483,7 +1492,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1505,7 +1515,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1527,7 +1538,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1548,7 +1560,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1569,7 +1582,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1590,7 +1604,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1611,7 +1626,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1632,7 +1648,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1654,7 +1671,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1675,7 +1693,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "crosshatch", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1697,7 +1716,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1718,7 +1738,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1739,7 +1760,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1760,7 +1782,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1781,7 +1804,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1803,7 +1827,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1824,7 +1849,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1845,7 +1871,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1871,7 +1898,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1892,7 +1920,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1917,7 +1946,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1938,7 +1968,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1959,7 +1990,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1980,7 +2012,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2001,7 +2034,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2022,7 +2056,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2043,7 +2078,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2064,7 +2100,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2085,7 +2122,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -2107,7 +2145,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -2129,7 +2168,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -2151,7 +2191,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2172,7 +2213,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2193,7 +2235,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2214,7 +2257,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2235,7 +2279,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2256,7 +2301,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -2278,7 +2324,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2299,7 +2346,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "crosshatch", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -2321,7 +2369,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2342,7 +2391,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2363,7 +2413,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2384,7 +2435,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2405,7 +2457,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -2427,7 +2480,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2448,7 +2502,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2469,7 +2524,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2495,7 +2551,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2516,7 +2573,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index d69dd1e..cd8b8f0 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl
@@ -131,6 +131,15 @@ 'out_dir_arg': { 'args': ['--out-dir', '${ISOLATED_OUTDIR}'] }, + 'panther_on_14': { + 'swarming': { + 'dimensions': { + 'device_type': 'panther', + 'device_os': 'AP2A.240705.004', + 'os': 'Android' + } + } + }, 'perf-output': { 'args': [ '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb'
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 5ff53a3..eb798e1 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl
@@ -100,6 +100,15 @@ } } }, + 'panther_on_14': { + 'swarming': { + 'dimensions': { + 'device_type': 'panther', + 'device_os': 'AP2A.240705.004', # Android 14 + 'os': 'Android' + } + } + }, 'perf-output': { 'args': [ '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb',
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index a881da4..bef0b52 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json
@@ -16,7 +16,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -37,7 +38,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -58,7 +60,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -79,7 +82,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -100,7 +104,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -121,7 +126,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -142,7 +148,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -163,7 +170,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -184,7 +192,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -206,7 +215,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -228,7 +238,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -250,7 +261,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -271,7 +283,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -292,7 +305,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -313,7 +327,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -334,7 +349,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -355,7 +371,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -377,7 +394,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -398,7 +416,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "crosshatch", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -420,7 +439,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -441,7 +461,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -462,7 +483,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -483,7 +505,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -508,7 +531,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -530,7 +554,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -552,7 +577,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -573,7 +599,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -594,7 +621,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -619,7 +647,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -645,7 +674,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -666,7 +696,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -691,7 +722,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -712,7 +744,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -733,7 +766,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -754,7 +788,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -775,7 +810,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -796,7 +832,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -817,7 +854,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -838,7 +876,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -859,7 +898,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -881,7 +921,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -903,7 +944,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -925,7 +967,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -946,7 +989,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -967,7 +1011,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -988,7 +1033,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1009,7 +1055,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1030,7 +1077,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1052,7 +1100,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1073,7 +1122,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "crosshatch", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1095,7 +1145,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1116,7 +1167,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1137,7 +1189,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1158,7 +1211,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1183,7 +1237,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1205,7 +1260,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1227,7 +1283,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1248,7 +1305,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1269,7 +1327,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1294,7 +1353,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1320,7 +1380,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1341,7 +1402,8 @@ "swarming": { "dimensions": { "android_devices": "1", - "device_type": "walleye", + "device_os": "AP2A.240705.004", + "device_type": "panther", "os": "Android" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index a716f5e..7ed990b 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl
@@ -45,7 +45,7 @@ 'Android32 Builder x86 (dbg)': {}, 'Android64': { 'mixins': [ - 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'panther_on_14', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' ], 'test_suites': { @@ -55,7 +55,7 @@ }, 'Android64 (dbg)': { 'mixins': [ - 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'panther_on_14', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' ], 'test_suites': { @@ -304,7 +304,7 @@ 'machines': { 'android_arm64_dbg': { 'mixins': [ - 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'panther_on_14', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' ], 'test_suites': { @@ -314,7 +314,7 @@ }, 'android_arm64_rel': { 'mixins': [ - 'walleye', 'android-devices', 'has_native_resultdb_integration', + 'panther_on_14', 'android-devices', 'has_native_resultdb_integration', 'chromium-tester-service-account' ], 'test_suites': {
diff --git a/modules/video_coding/codecs/test/video_codec_test.cc b/modules/video_coding/codecs/test/video_codec_test.cc index e020caf..fd45ee4 100644 --- a/modules/video_coding/codecs/test/video_codec_test.cc +++ b/modules/video_coding/codecs/test/video_codec_test.cc
@@ -381,7 +381,7 @@ #endif Values(kFourPeople_1280x720_30), Values(std::make_tuple(320, 180, 30, 32, 26), - std::make_tuple(320, 180, 30, 64, 29), + std::make_tuple(320, 180, 30, 64, 27), std::make_tuple(320, 180, 30, 128, 32), std::make_tuple(320, 180, 30, 256, 36), std::make_tuple(640, 360, 30, 128, 29),
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java index 7a5674a..875ac38 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
@@ -46,7 +46,7 @@ return 255.0f * Math.max(0, Math.min(c, 1)); } - // Assert RGB ByteBuffers are pixel perfect identical. + // Assert RGB ByteBuffers are close enough (allow off-by-one differences). private static void assertByteBufferEquals( int width, int height, ByteBuffer actual, ByteBuffer expected) { actual.rewind(); @@ -61,7 +61,8 @@ final int expectedR = expected.get() & 0xFF; final int expectedG = expected.get() & 0xFF; final int expectedB = expected.get() & 0xFF; - if (actualR != expectedR || actualG != expectedG || actualB != expectedB) { + if (Math.abs(actualR - expectedR) > 1 || Math.abs(actualG - expectedG) > 1 + || Math.abs(actualB - expectedB) > 1) { fail("ByteBuffers of size " + width + "x" + height + " not equal at position " + "(" + x + ", " + y + "). Expected color (R,G,B): " + "(" + expectedR + ", " + expectedG + ", " + expectedB + ")"
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java index 3b8a73c..181dcec 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
@@ -154,10 +154,11 @@ GlUtil.checkNoGLES2Error("glReadPixels"); // Assert rendered image is expected constant color. + // Allow off-by-one differences due to different rounding. while (rgbaData.hasRemaining()) { - assertEquals(red[i], rgbaData.get() & 0xFF); - assertEquals(green[i], rgbaData.get() & 0xFF); - assertEquals(blue[i], rgbaData.get() & 0xFF); + assertClose(1, red[i], rgbaData.get() & 0xFF); + assertClose(1, green[i], rgbaData.get() & 0xFF); + assertClose(1, blue[i], rgbaData.get() & 0xFF); assertEquals(255, rgbaData.get() & 0xFF); } } @@ -226,11 +227,12 @@ eglBase.release(); // Assert rendered image is expected constant color. + // Allow off-by-one differences due to different rounding. while (rgbaData.hasRemaining()) { - assertEquals(red, rgbaData.get() & 0xFF); - assertEquals(green, rgbaData.get() & 0xFF); - assertEquals(blue, rgbaData.get() & 0xFF); - assertEquals(255,rgbaData.get() & 0xFF); + assertClose(1, red, rgbaData.get() & 0xFF); + assertClose(1, green, rgbaData.get() & 0xFF); + assertClose(1, blue, rgbaData.get() & 0xFF); + assertEquals(255, rgbaData.get() & 0xFF); } // Late frame return after everything has been disposed and released. textureBuffer.release();