From cba0128ee0f8f009f96801cb27bb3368fe20f5d4 Mon Sep 17 00:00:00 2001 From: Michael Froman Date: Thu, 14 Jul 2022 21:58:39 -0500 Subject: [PATCH] Bug 1766646 - Vendor libwebrtc from 9e73e2e430 Upstream commit: https://webrtc.googlesource.com/src/+/9e73e2e4305808a4c1a15e5526cd762b0a7fd88c Add MacArm64 builder and perf config Bug: b/230719743 Change-Id: Ib735a4a22a40053b816b4d1481aa1820de210f39 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261727 Reviewed-by: Jeremy Leconte Commit-Queue: Christoffer Jansson Cr-Commit-Position: refs/heads/main@{#36830} --- third_party/libwebrtc/README.moz-ff-commit | 3 + third_party/libwebrtc/README.mozilla | 2 + .../libwebrtc/infra/config/config.star | 3 + .../libwebrtc/infra/config/cr-buildbucket.cfg | 97 +++++++++++++++++++ .../libwebrtc/infra/config/luci-milo.cfg | 10 ++ .../libwebrtc/infra/config/luci-notify.cfg | 49 ++++++++++ .../libwebrtc/infra/config/luci-scheduler.cfg | 29 ++++++ third_party/libwebrtc/infra/config/realms.cfg | 1 + 8 files changed, 194 insertions(+) diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index d2f3bff836a4..ce762bae47d2 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -14028,3 +14028,6 @@ adaf511221 # MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh # base of lastest vendoring 598044f9ee +# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh +# base of lastest vendoring +9e73e2e430 diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index d39f84c620c3..6c4dbe849652 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -9364,3 +9364,5 @@ libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwe libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-15T02:50:40.529686. # python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-15T02:57:47.960438. +# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc +libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-15T02:58:34.625806. diff --git a/third_party/libwebrtc/infra/config/config.star b/third_party/libwebrtc/infra/config/config.star index 5be2222eb869..e8e753ff68dc 100755 --- a/third_party/libwebrtc/infra/config/config.star +++ b/third_party/libwebrtc/infra/config/config.star @@ -755,7 +755,10 @@ mac_builder("Mac64 Release", "Mac|x64|rel") mac_try_job("mac_rel") mac_try_job("mac_compile_rel", cq = None) mac_builder("Mac64 Builder", ci_cat = None, perf_cat = "Mac|x64|Builder|") +mac_builder("MacArm64 Builder", ci_cat = None, perf_cat = "Mac|arm64|Builder") perf_builder("Perf Mac 11", "Mac|x64|Tester|11", triggered_by = ["Mac64 Builder"]) +perf_builder("Perf Mac M1 Arm64 12", "Mac|arm64|Tester|12", triggered_by = ["MacArm64 Builder"]) + mac_builder("Mac Asan", "Mac|x64|asan") mac_try_job("mac_asan") mac_try_job("mac_chromium_compile", recipe = "chromium_trybot", branch_cq = False) diff --git a/third_party/libwebrtc/infra/config/cr-buildbucket.cfg b/third_party/libwebrtc/infra/config/cr-buildbucket.cfg index cb1ab3553d92..68b8432b42ab 100644 --- a/third_party/libwebrtc/infra/config/cr-buildbucket.cfg +++ b/third_party/libwebrtc/infra/config/cr-buildbucket.cfg @@ -2350,6 +2350,55 @@ buckets { } } } + builders { + name: "MacArm64 Builder" + swarming_host: "chromium-swarm.appspot.com" + swarming_tags: "vpython:native-python-wrapper" + dimensions: "cpu:x86-64" + dimensions: "os:Mac" + dimensions: "pool:luci.webrtc.ci" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "$build/goma": {' + ' "server_host": "goma.chromium.org",' + ' "use_luci_auth": true' + ' },' + ' "$recipe_engine/isolated": {' + ' "server": "https://isolateserver.appspot.com"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "client.webrtc",' + ' "recipe": "webrtc/standalone"' + '}' + priority: 30 + execution_timeout_secs: 7200 + build_numbers: YES + service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + resultdb { + enable: true + bq_exports { + project: "webrtc-ci" + dataset: "resultdb" + table: "perf_test_results" + test_results {} + } + } + } builders { name: "Perf Android32 (M AOSP Nexus6)" swarming_host: "chromium-swarm.appspot.com" @@ -2638,6 +2687,54 @@ buckets { } } } + builders { + name: "Perf Mac M1 Arm64 12" + swarming_host: "chromium-swarm.appspot.com" + swarming_tags: "vpython:native-python-wrapper" + dimensions: "os:Linux" + dimensions: "pool:luci.webrtc.perf" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "$build/goma": {' + ' "server_host": "goma.chromium.org",' + ' "use_luci_auth": true' + ' },' + ' "$recipe_engine/isolated": {' + ' "server": "https://isolateserver.appspot.com"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "client.webrtc.perf",' + ' "recipe": "webrtc/standalone"' + '}' + priority: 30 + execution_timeout_secs: 10800 + build_numbers: YES + service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + resultdb { + enable: true + bq_exports { + project: "webrtc-ci" + dataset: "resultdb" + table: "perf_test_results" + test_results {} + } + } + } builders { name: "Perf Win7" swarming_host: "chromium-swarm.appspot.com" diff --git a/third_party/libwebrtc/infra/config/luci-milo.cfg b/third_party/libwebrtc/infra/config/luci-milo.cfg index bc82dadfec74..3683845edb2d 100644 --- a/third_party/libwebrtc/infra/config/luci-milo.cfg +++ b/third_party/libwebrtc/infra/config/luci-milo.cfg @@ -326,11 +326,21 @@ consoles { name: "buildbucket/luci.webrtc.perf/Mac64 Builder" category: "Mac|x64|Builder" } + builders { + name: "buildbucket/luci.webrtc.perf/MacArm64 Builder" + category: "Mac|arm64" + short_name: "Builder" + } builders { name: "buildbucket/luci.webrtc.perf/Perf Mac 11" category: "Mac|x64|Tester" short_name: "11" } + builders { + name: "buildbucket/luci.webrtc.perf/Perf Mac M1 Arm64 12" + category: "Mac|arm64|Tester" + short_name: "12" + } builders { name: "buildbucket/luci.webrtc.perf/Win32 Builder (Clang)" category: "Win|x86|Builder" diff --git a/third_party/libwebrtc/infra/config/luci-notify.cfg b/third_party/libwebrtc/infra/config/luci-notify.cfg index 51f7cf996e76..6a0e70b9624b 100644 --- a/third_party/libwebrtc/infra/config/luci-notify.cfg +++ b/third_party/libwebrtc/infra/config/luci-notify.cfg @@ -1180,6 +1180,33 @@ notifiers { failed_step_regexp_exclude: ".*\\(experimental\\).*" } } +notifiers { + notifications { + on_new_status: INFRA_FAILURE + email { + recipients: "webrtc-troopers-robots@google.com" + } + template: "infra_failure" + } + notifications { + on_new_status: FAILURE + email { + recipients: "webrtc-troopers-robots@google.com" + } + template: "build_failure" + notify_blamelist {} + } + builders { + bucket: "perf" + name: "MacArm64 Builder" + repository: "https://webrtc.googlesource.com/src" + } + tree_closers { + tree_status_host: "webrtc-status.appspot.com" + failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn" + failed_step_regexp_exclude: ".*\\(experimental\\).*" + } +} notifiers { notifications { on_new_status: INFRA_FAILURE @@ -1312,6 +1339,28 @@ notifiers { repository: "https://webrtc.googlesource.com/src" } } +notifiers { + notifications { + on_new_status: INFRA_FAILURE + email { + recipients: "webrtc-troopers-robots@google.com" + } + template: "infra_failure" + } + notifications { + on_new_status: FAILURE + email { + recipients: "webrtc-troopers-robots@google.com" + } + template: "build_failure" + notify_blamelist {} + } + builders { + bucket: "perf" + name: "Perf Mac M1 Arm64 12" + repository: "https://webrtc.googlesource.com/src" + } +} notifiers { notifications { on_new_status: INFRA_FAILURE diff --git a/third_party/libwebrtc/infra/config/luci-scheduler.cfg b/third_party/libwebrtc/infra/config/luci-scheduler.cfg index a546da562207..4670f07e116c 100644 --- a/third_party/libwebrtc/infra/config/luci-scheduler.cfg +++ b/third_party/libwebrtc/infra/config/luci-scheduler.cfg @@ -330,6 +330,16 @@ job { builder: "MacARM64 M1 Release" } } +job { + id: "MacArm64 Builder" + realm: "perf" + acl_sets: "perf" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "perf" + builder: "MacArm64 Builder" + } +} job { id: "Perf Android32 (M AOSP Nexus6)" realm: "perf" @@ -438,6 +448,24 @@ job { builder: "Perf Mac 11" } } +job { + id: "Perf Mac M1 Arm64 12" + realm: "perf" + acls { + role: TRIGGERER + granted_to: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + acl_sets: "perf" + triggering_policy { + kind: LOGARITHMIC_BATCHING + log_base: 1.7 + } + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "perf" + builder: "Perf Mac M1 Arm64 12" + } +} job { id: "Perf Win7" realm: "perf" @@ -659,6 +687,7 @@ trigger { triggers: "Android64 Builder arm64" triggers: "Linux64 Builder" triggers: "Mac64 Builder" + triggers: "MacArm64 Builder" triggers: "Win32 Builder (Clang)" gitiles { repo: "https://webrtc.googlesource.com/src" diff --git a/third_party/libwebrtc/infra/config/realms.cfg b/third_party/libwebrtc/infra/config/realms.cfg index 98aac077916c..c88f5a147e69 100644 --- a/third_party/libwebrtc/infra/config/realms.cfg +++ b/third_party/libwebrtc/infra/config/realms.cfg @@ -105,6 +105,7 @@ realms { values: "Perf Android64 (O Pixel2)" values: "Perf Linux Bionic" values: "Perf Mac 11" + values: "Perf Mac M1 Arm64 12" values: "Perf Win7" } }