From 525037f258d2ae74933281ca0dcc5ff34674b7c0 Mon Sep 17 00:00:00 2001 From: Michael Froman Date: Fri, 21 Apr 2023 13:23:37 -0500 Subject: [PATCH] Bug 1828517 - Vendor libwebrtc from 5683a12728 Upstream commit: https://webrtc.googlesource.com/src/+/5683a127284ef541f2dc73768431d0490aaf8eab Increase expiration timeout for Perf bots Bug: b/266386195 Change-Id: Ia9ba87680f81643e299a8cf242cbf3bf34359b10 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291329 Commit-Queue: Andrey Logvin Reviewed-by: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#39194} --- third_party/libwebrtc/README.moz-ff-commit | 3 +++ third_party/libwebrtc/README.mozilla | 2 ++ .../infra/specs/client.webrtc.perf.json | 16 ++++++++++++++++ third_party/libwebrtc/infra/specs/mixins.pyl | 5 +++++ .../libwebrtc/infra/specs/mixins_webrtc.pyl | 8 ++++++++ third_party/libwebrtc/infra/specs/waterfalls.pyl | 2 +- 6 files changed, 35 insertions(+), 1 deletion(-) diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index 4ed193d81e87..5ba2207dcddb 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -21198,3 +21198,6 @@ f2a083f262 # MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh # base of lastest vendoring 5671c64103 +# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh +# base of lastest vendoring +5683a12728 diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index 8662ad780fb1..8b73caf29d60 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -14154,3 +14154,5 @@ libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-l libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T18:21:35.200398. # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T18:22:31.204747. +# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc +libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T18:23:26.200341. diff --git a/third_party/libwebrtc/infra/specs/client.webrtc.perf.json b/third_party/libwebrtc/infra/specs/client.webrtc.perf.json index 8044a91264f0..680556a3b9a0 100644 --- a/third_party/libwebrtc/infra/specs/client.webrtc.perf.json +++ b/third_party/libwebrtc/infra/specs/client.webrtc.perf.json @@ -34,6 +34,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -69,6 +70,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -112,6 +114,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -147,6 +150,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -190,6 +194,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -225,6 +230,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -268,6 +274,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -303,6 +310,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -346,6 +354,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800, @@ -385,6 +394,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800 @@ -420,6 +430,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800 @@ -459,6 +470,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800 @@ -495,6 +507,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800 @@ -533,6 +546,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800 @@ -571,6 +585,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800 @@ -606,6 +621,7 @@ "pool": "WebRTC-perf" } ], + "expiration": 10800, "hard_timeout": 10800, "idempotent": false, "io_timeout": 10800 diff --git a/third_party/libwebrtc/infra/specs/mixins.pyl b/third_party/libwebrtc/infra/specs/mixins.pyl index 81582da0a993..d803419b22af 100644 --- a/third_party/libwebrtc/infra/specs/mixins.pyl +++ b/third_party/libwebrtc/infra/specs/mixins.pyl @@ -117,6 +117,11 @@ 'isolate_profile_data': { 'isolate_profile_data': True }, + 'limited-capacity': { + 'swarming': { + 'expiration': 10800 + } + }, 'linux-bionic': { 'swarming': { 'dimensions': { diff --git a/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl b/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl index 4af7b551b048..47004f276c9f 100644 --- a/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl +++ b/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl @@ -64,6 +64,14 @@ }, }, }, + 'limited-capacity': { + # Sometimes there are multiple tests that can be run only on one machine. + # We need to increase timeouts so the tests dont expire before the machine is freed. + # Using 3h expiration timeout to align with `timeout-3h` mixin used for per tests. + 'swarming': { + 'expiration': 10800, + }, + }, 'mac-m1-cpu': { 'swarming': { 'dimensions': { diff --git a/third_party/libwebrtc/infra/specs/waterfalls.pyl b/third_party/libwebrtc/infra/specs/waterfalls.pyl index ad2265d8aa0a..aac6d08c31d6 100644 --- a/third_party/libwebrtc/infra/specs/waterfalls.pyl +++ b/third_party/libwebrtc/infra/specs/waterfalls.pyl @@ -239,7 +239,7 @@ }, { 'name': 'client.webrtc.perf', - 'mixins': [], + 'mixins': ['limited-capacity'], 'machines': { 'Perf Android32 (O Pixel2)': { 'mixins': [