Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 128 insertions, 0 deletions

diff --git a/third_party/libwebrtc/infra/config/config.star b/third_party/libwebrtc/infra/config/config.star
index eecac11c94..94d2d9ccc6 100755
--- a/third_party/libwebrtc/infra/config/config.star
+++ b/third_party/libwebrtc/infra/config/config.star
@@ -800,6 +800,8 @@ ci_builder("Win64 ASan", "Win Clang|x64|asan")
 try_builder("win_asan")
 ci_builder("Win (more configs)", "Win Clang|x86|more")
 try_builder("win_x86_more_configs")
+try_builder("win11_release", cq = None)
+try_builder("win11_debug", cq = None)
 chromium_try_builder("win_chromium_compile")
 chromium_try_builder("win_chromium_compile_dbg")
 
diff --git a/third_party/libwebrtc/infra/config/cr-buildbucket.cfg b/third_party/libwebrtc/infra/config/cr-buildbucket.cfg
index cc36dc359c..039c580a34 100644
--- a/third_party/libwebrtc/infra/config/cr-buildbucket.cfg
+++ b/third_party/libwebrtc/infra/config/cr-buildbucket.cfg
@@ -4988,6 +4988,100 @@ buckets {
       }
     }
     builders {
+      name: "win11_debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.webrtc.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-try-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: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "win11_release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.webrtc.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/reclient": {'
+        '    "instance": "rbe-webrtc-untrusted",'
+        '    "metrics_project": "chromium-reclient-metrics"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "tryserver.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-try-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: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
       name: "win_asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
diff --git a/third_party/libwebrtc/infra/config/luci-milo.cfg b/third_party/libwebrtc/infra/config/luci-milo.cfg
index cca46cd157..3f3a18832a 100644
--- a/third_party/libwebrtc/infra/config/luci-milo.cfg
+++ b/third_party/libwebrtc/infra/config/luci-milo.cfg
@@ -594,6 +594,12 @@ consoles {
     name: "buildbucket/luci.webrtc.try/win_x86_more_configs"
   }
   builders {
+    name: "buildbucket/luci.webrtc.try/win11_release"
+  }
+  builders {
+    name: "buildbucket/luci.webrtc.try/win11_debug"
+  }
+  builders {
     name: "buildbucket/luci.webrtc.try/win_chromium_compile"
   }
   builders {
diff --git a/third_party/libwebrtc/infra/config/luci-notify.cfg b/third_party/libwebrtc/infra/config/luci-notify.cfg
index 8cae9b3f93..129d0e4268 100644
--- a/third_party/libwebrtc/infra/config/luci-notify.cfg
+++ b/third_party/libwebrtc/infra/config/luci-notify.cfg
@@ -2035,6 +2035,32 @@ notifiers {
   }
   builders {
     bucket: "try"
+    name: "win11_debug"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  builders {
+    bucket: "try"
+    name: "win11_release"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  builders {
+    bucket: "try"
     name: "win_asan"
   }
 }