commit a18e7b60ab1a62190d0c6e6776682b999b53e74b parent 1f592a0365b84aa854df299d2445f81d9f59b380 Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 15 Oct 2025 11:13:14 -0500 Bug 1993083 - Vendor libwebrtc from c6c511121d Upstream commit: https://webrtc.googlesource.com/src/+/c6c511121ddc105e8b43b4ee8350116d4b549a91 Make Perf bot run on Jammy since Bionic is obsolete, also remove Trusty reference Bug: b/427119591 Change-Id: I358b142cf12b3292944cd7bab10191cf04454215 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/402620 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Christoffer Dewerin <jansson@webrtc.org> Auto-Submit: Christoffer Dewerin <jansson@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45239} Diffstat:
13 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:12:02.404352+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:13:04.915448+00:00. # base of lastest vendoring -7cba6c495d +c6c511121d diff --git a/third_party/libwebrtc/infra/config/config.star b/third_party/libwebrtc/infra/config/config.star @@ -1,8 +1,11 @@ #!/usr/bin/env lucicfg -# Copyright (c) 2019 The WebRTC project authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright (c) 2019 The WebRTC project authors. All Rights Reserved. +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. # https://chromium.googlesource.com/infra/luci/luci-go/+/main/lucicfg/doc/ @@ -781,7 +784,7 @@ ci_builder("Linux64 Release", "Linux|x64|rel") try_builder("linux_rel") ci_builder("Linux64 Builder", "Linux|x64|size", perf_cat = "Linux|x64|Builder|", prioritized = True) try_builder("linux_compile_rel") -perf_builder("Perf Linux Bionic", "Linux|x64|Tester|Bionic", triggered_by = ["Linux64 Builder"]) +perf_builder("Perf Linux", "Linux|x64|Tester", triggered_by = ["Linux64 Builder"]) ci_builder("Linux32 Debug (ARM)", "Linux|arm|dbg") try_builder("linux_compile_arm_dbg") ci_builder("Linux32 Release (ARM)", "Linux|arm|rel") diff --git a/third_party/libwebrtc/infra/config/cr-buildbucket.cfg b/third_party/libwebrtc/infra/config/cr-buildbucket.cfg @@ -2645,7 +2645,7 @@ buckets { } } builders { - name: "Perf Linux Bionic" + name: "Perf Linux" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "os:Linux" diff --git a/third_party/libwebrtc/infra/config/luci-milo.cfg b/third_party/libwebrtc/infra/config/luci-milo.cfg @@ -301,9 +301,9 @@ consoles { category: "Linux|x64|Builder" } builders { - name: "buildbucket/luci.webrtc.perf/Perf Linux Bionic" - category: "Linux|x64|Tester" - short_name: "Bionic" + name: "buildbucket/luci.webrtc.perf/Perf Linux" + category: "Linux|x64" + short_name: "Tester" } builders { name: "buildbucket/luci.webrtc.perf/Fuchsia Builder" diff --git a/third_party/libwebrtc/infra/config/luci-notify.cfg b/third_party/libwebrtc/infra/config/luci-notify.cfg @@ -1291,7 +1291,7 @@ notifiers { } builders { bucket: "perf" - name: "Perf Linux Bionic" + name: "Perf Linux" repository: "https://webrtc.googlesource.com/src" } } diff --git a/third_party/libwebrtc/infra/config/luci-scheduler.cfg b/third_party/libwebrtc/infra/config/luci-scheduler.cfg @@ -420,7 +420,7 @@ job { } } job { - id: "Perf Linux Bionic" + id: "Perf Linux" realm: "perf" acls { role: TRIGGERER @@ -434,7 +434,7 @@ job { buildbucket { server: "cr-buildbucket.appspot.com" bucket: "perf" - builder: "Perf Linux Bionic" + builder: "Perf Linux" } } job { diff --git a/third_party/libwebrtc/infra/config/project.cfg b/third_party/libwebrtc/infra/config/project.cfg @@ -7,7 +7,7 @@ name: "webrtc" access: "group:all" lucicfg { - version: "1.45.5" + version: "1.45.6" package_dir: "." config_dir: "." entry_point: "config.star" diff --git a/third_party/libwebrtc/infra/config/realms.cfg b/third_party/libwebrtc/infra/config/realms.cfg @@ -122,7 +122,7 @@ realms { values: "Perf Android32 (R Pixel5)" values: "Perf Android64 (R Pixel5)" values: "Perf Fuchsia" - values: "Perf Linux Bionic" + values: "Perf Linux" values: "Perf Mac 11" values: "Perf Mac M1 Arm64 12" values: "Perf Win 10" diff --git a/third_party/libwebrtc/infra/specs/client.webrtc.perf.json b/third_party/libwebrtc/infra/specs/client.webrtc.perf.json @@ -218,7 +218,7 @@ } ] }, - "Perf Linux Bionic": { + "Perf Linux": { "isolated_scripts": [ { "args": [ @@ -239,7 +239,7 @@ "swarming": { "dimensions": { "gce": "0", - "os": "Ubuntu-18.04", + "os": "Ubuntu-22.04", "pool": "WebRTC-perf" }, "expiration": 10800, @@ -272,7 +272,7 @@ "swarming": { "dimensions": { "gce": "0", - "os": "Ubuntu-18.04", + "os": "Ubuntu-22.04", "pool": "WebRTC-perf" }, "expiration": 10800, diff --git a/third_party/libwebrtc/infra/specs/mixins.pyl b/third_party/libwebrtc/infra/specs/mixins.pyl @@ -115,13 +115,6 @@ 'expiration': 10800 } }, - 'linux-bionic': { - 'swarming': { - 'dimensions': { - 'os': 'Ubuntu-18.04' - } - } - }, 'linux-jammy': { 'fail_if_unused': False, 'swarming': { diff --git a/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl b/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl @@ -134,13 +134,6 @@ } } }, - 'linux-bionic': { - 'swarming': { - 'dimensions': { - 'os': 'Ubuntu-18.04', - } - } - }, 'perf-output': { 'args': [ '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb', diff --git a/third_party/libwebrtc/infra/specs/waterfalls.pyl b/third_party/libwebrtc/infra/specs/waterfalls.pyl @@ -272,12 +272,11 @@ 'isolated_scripts': 'perf_tests', } }, - 'Perf Linux Bionic': { + 'Perf Linux': { 'os_type': 'linux', 'mixins': [ - 'linux-bionic', 'perf-pool', 'timeout-3h', - 'resultdb-gtest-json-format' + 'linux-jammy', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format' ], 'test_suites': { 'isolated_scripts': 'perf_tests_save_worst_frame', diff --git a/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl b/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl @@ -127,8 +127,7 @@ 'Perf Android32 (R Pixel5)': 'release_bot_x64', 'Perf Android64 (R Pixel5)': 'release_bot_x64', 'Perf Fuchsia': 'release_bot_x64_fuchsia', - 'Perf Linux Bionic': 'release_bot_x64', - 'Perf Linux Trusty': 'release_bot_x64', + 'Perf Linux': 'release_bot_x64', 'Perf Mac 11': 'release_bot_x64', 'Perf Mac M1 Arm64 12': 'release_bot_x64', 'Perf Win 10': 'release_bot_x64',