Enable chromium.webrtc LUCI bots.

Tbr: jbudorick@chromium.org
Bug: 877018
Change-Id: Iefdaaffb9a9e84eb57da37ada1688f8af11ac57a
Reviewed-on: https://chromium-review.googlesource.com/c/1354001Reviewed-by: Patrik Höglund <phoglund@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612129}

infra/config/global/cr-buildbucket.cfg

@@ -3422,8 +3422,8 @@ buckets {
 
     # Android
 
-    # builders { mixins: "linux"  name: "WebRTC Chromium Android Builder" }
-    # builders { mixins: "linux"  name: "WebRTC Chromium Android Tester" }
+    builders { mixins: "linux"  name: "WebRTC Chromium Android Builder" }
+    builders { mixins: "linux"  name: "WebRTC Chromium Android Tester" }
 
     # Linux
 
@@ -3432,31 +3432,31 @@ buckets {
 
     # Mac
 
-    # builders { mixins: "mac"  name: "WebRTC Chromium Mac Builder" }
-    # builders { mixins: "mac"  name: "WebRTC Chromium Mac Tester" }
+    builders { mixins: "mac"  name: "WebRTC Chromium Mac Builder" }
+    builders { mixins: "mac"  name: "WebRTC Chromium Mac Tester" }
 
     # Win
 
-    # builders {
-    #   mixins: "win"
-    #   name: "WebRTC Chromium Win Builder"
-    #   dimensions: "os:Windows-10"
-    # }
-    # builders {
-    #   mixins: "win"
-    #   name: "WebRTC Chromium Win10 Tester"
-    #   dimensions: "os:Windows-10"
-    # }
-    # builders {
-    #   mixins: "win"
-    #   name: "WebRTC Chromium Win7 Tester"
-    #   dimensions: "os:Windows-7"
-    # }
-    # builders {
-    #   mixins: "win"
-    #   name: "WebRTC Chromium Win8 Tester"
-    #   dimensions: "os:Windows-8.1"
-    # }
+    builders {
+      mixins: "win"
+      name: "WebRTC Chromium Win Builder"
+      dimensions: "os:Windows-10"
+    }
+    builders {
+      mixins: "win"
+      name: "WebRTC Chromium Win10 Tester"
+      dimensions: "os:Windows-10"
+    }
+    builders {
+      mixins: "win"
+      name: "WebRTC Chromium Win7 Tester"
+      dimensions: "os:Windows-7"
+    }
+    builders {
+      mixins: "win"
+      name: "WebRTC Chromium Win8 Tester"
+      dimensions: "os:Windows-8.1"
+    }
   }
 }
 

infra/config/global/luci-scheduler.cfg

@@ -328,10 +328,10 @@ trigger {
   triggers: "mac-mojo-rel"
   triggers: "mac-rel"
   triggers: "mac-views-rel"
-  # triggers: "WebRTC Chromium Android Builder"
+  triggers: "WebRTC Chromium Android Builder"
   triggers: "WebRTC Chromium Linux Builder"
-  # triggers: "WebRTC Chromium Mac Builder"
-  # triggers: "WebRTC Chromium Win Builder"
+  triggers: "WebRTC Chromium Mac Builder"
+  triggers: "WebRTC Chromium Win Builder"
   triggers: "win-annotator-rel"
   triggers: "win-asan"
   triggers: "win-dbg"

testing/buildbot/chromium.webrtc.json

 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
-  "Android Builder": {},
-  "Android Tester": {
+  "WebRTC Chromium Android Builder": {},
+  "WebRTC Chromium Android Tester": {
     "gtest_tests": [
       {
         "args": [
@@ -27,14 +27,14 @@
       }
     ]
   },
-  "Mac Builder": {
+  "WebRTC Chromium Linux Builder": {
     "additional_compile_targets": [
       "frame_analyzer",
       "jingle_unittests",
       "remoting_unittests"
     ]
   },
-  "Mac Tester": {
+  "WebRTC Chromium Linux Tester": {
     "gtest_tests": [
       {
         "args": [
@@ -131,15 +131,14 @@
       }
     ]
   },
-  "Mac Tester (long-running)": {},
-  "WebRTC Chromium Linux Builder": {
+  "WebRTC Chromium Mac Builder": {
     "additional_compile_targets": [
       "frame_analyzer",
       "jingle_unittests",
       "remoting_unittests"
     ]
   },
-  "WebRTC Chromium Linux Tester": {
+  "WebRTC Chromium Mac Tester": {
     "gtest_tests": [
       {
         "args": [
@@ -236,14 +235,14 @@
       }
     ]
   },
-  "Win Builder": {
+  "WebRTC Chromium Win Builder": {
     "additional_compile_targets": [
       "frame_analyzer",
       "jingle_unittests",
       "remoting_unittests"
     ]
   },
-  "Win10 Tester": {
+  "WebRTC Chromium Win10 Tester": {
     "gtest_tests": [
       {
         "args": [
@@ -340,7 +339,7 @@
       }
     ]
   },
-  "Win7 Tester": {
+  "WebRTC Chromium Win7 Tester": {
     "gtest_tests": [
       {
         "args": [
@@ -437,8 +436,7 @@
       }
     ]
   },
-  "Win7 Tester (long-running)": {},
-  "Win8 Tester": {
+  "WebRTC Chromium Win8 Tester": {
     "gtest_tests": [
       {
         "args": [

testing/buildbot/waterfalls.pyl

@@ -3326,57 +3326,54 @@
   {
     'name': 'chromium.webrtc',
     'machines': {
-      'Android Builder': {},
-      'Android Tester': {
+      'WebRTC Chromium Android Builder': {},
+      'WebRTC Chromium Android Tester': {
         'test_suites': {
           'gtest_tests': 'webrtc_android_tests_with_baremetal_tests',
         },
       },
-      'Mac Builder': {
+      'WebRTC Chromium Linux Builder': {
         'additional_compile_targets': [
           'frame_analyzer',
           'jingle_unittests',
           'remoting_unittests',
         ],
       },
-      'Mac Tester': {
+      'WebRTC Chromium Linux Tester': {
         'test_suites': {
           'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
         },
       },
-      'Mac Tester (long-running)': {},
-      'WebRTC Chromium Linux Builder': {
+      'WebRTC Chromium Mac Builder': {
         'additional_compile_targets': [
           'frame_analyzer',
           'jingle_unittests',
           'remoting_unittests',
         ],
       },
-      'WebRTC Chromium Linux Tester': {
+      'WebRTC Chromium Mac Tester': {
         'test_suites': {
           'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
         },
       },
-      'Win Builder': {
+      'WebRTC Chromium Win Builder': {
         'additional_compile_targets': [
           'frame_analyzer',
           'jingle_unittests',
           'remoting_unittests',
         ],
       },
-      'Win10 Tester': {
+      'WebRTC Chromium Win10 Tester': {
         'test_suites': {
           'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
         },
       },
-      'Win7 Tester': {
+      'WebRTC Chromium Win7 Tester': {
         'test_suites': {
           'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
         },
       },
-      # TODO(crbug.com/877018): delete long-running bots.
-      'Win7 Tester (long-running)': {},
-      'Win8 Tester': {
+      'WebRTC Chromium Win8 Tester': {
         'test_suites': {
           'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
         },

tools/mb/mb_config.pyl

@@ -492,10 +492,10 @@
     },
 
     'chromium.webrtc': {
-      'Android Builder': 'android_debug_static_bot_arm64',
+      'WebRTC Chromium Android Builder': 'android_debug_static_bot_arm64',
       'WebRTC Chromium Linux Builder': 'gpu_tests_release_bot',
-      'Mac Builder': 'gpu_tests_release_bot',
-      'Win Builder': 'release_bot_x86_minimal_symbols_no_com_init_hooks_with_codecs',
+      'WebRTC Chromium Mac Builder': 'gpu_tests_release_bot',
+      'WebRTC Chromium Win Builder': 'release_bot_x86_minimal_symbols_no_com_init_hooks_with_codecs',
     },
 
     'chromium.webrtc.fyi': {