Configure chromium.webrtc on LUCI, flip over Linux builder-tester.

This will switch over to LUCI on the existing buildbot machines.
This waterfall is a non-critical postsubmit waterfall so we
believe we can take a few days of downtime on it if necessary.
The machines in question have webcams and exotic configs, so
standing up a new waterfall is rather expensive.

The plan is
1) take linux bots out of the old master and restart
2) swarm-bootstrap current chromium.webrtc machines
2a) maybe delete old stuff off machines (?)
3) land CL to infradata that makes machines available as
   dimensions:<builder name>
4) Land this CL

Certainly, if the above fails it's going to be hard to go back
but I think it will work :)

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

infra/config/global/cr-buildbucket.cfg

@@ -3397,6 +3397,72 @@ buckets {
   }
 }
 
+buckets {
+  name: "luci.chromium.webrtc"
+  acl_sets: "ci"
+
+  swarming {
+    hostname: "chromium-swarm.appspot.com"
+    url_format: "https://luci-milo.appspot.com/swarming/task/{task_id}"
+    builder_defaults {
+      # Automatically assigns a dimensions:<builder name> to each builder.
+      auto_builder_dimension: YES
+      build_numbers: YES
+      dimensions: "cpu:x86-64"
+      luci_migration_host: "luci-migration.appspot.com"
+      execution_timeout_secs: 7200  # 2h
+      recipe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties: "mastername:chromium.webrtc"
+        name: "chromium"
+      }
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      swarming_tags: "vpython:native-python-wrapper"
+    }
+
+    # Keep builders grouped by OS, then sorted by name.
+
+    # Android
+
+    # builders { mixins: "linux"  name: "WebRTC Chromium Android Builder" }
+    # builders { mixins: "linux"  name: "WebRTC Chromium Android Tester" }
+
+    # Linux
+
+    builders { mixins: "linux"  name: "WebRTC Chromium Linux Builder" }
+    builders { mixins: "linux"  name: "WebRTC Chromium Linux Tester" }
+
+    # Mac
+
+    # 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"
+    # }
+  }
+}
+
 buckets {
   name: "luci.chromium.webrtc.fyi"
   acl_sets: "ci"

infra/config/global/luci-milo.cfg

@@ -3858,73 +3858,73 @@ consoles {
   manifest_name: "REVISION"
   builders {
     name: "buildbot/chromium.webrtc/Android Builder"
-    name: "buildbucket/luci.webrtc.ci/Android Builder"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Android Builder"
     category: "android"
     short_name: "bld"
   }
   builders {
     name: "buildbot/chromium.webrtc/Android Tester"
-    name: "buildbucket/luci.webrtc.ci/Android Tester"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Android Tester"
     category: "android"
     short_name: "tst"
   }
   builders {
     name: "buildbot/chromium.webrtc/Linux Builder"
-    name: "buildbucket/luci.webrtc.ci/Linux Builder"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Builder"
     category: "linux"
     short_name: "bld"
   }
   builders {
     name: "buildbot/chromium.webrtc/Linux Tester"
-    name: "buildbucket/luci.webrtc.ci/Linux Tester"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Linux Tester"
     category: "linux"
     short_name: "tst"
   }
   builders {
     name: "buildbot/chromium.webrtc/Mac Builder"
-    name: "buildbucket/luci.webrtc.ci/Mac Builder"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Mac Builder"
     category: "mac"
     short_name: "bld"
   }
   builders {
     name: "buildbot/chromium.webrtc/Mac Tester"
-    name: "buildbucket/luci.webrtc.ci/Mac Tester"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Mac Tester"
     category: "mac"
     short_name: "tst"
   }
   builders {
     name: "buildbot/chromium.webrtc/Mac Tester (long-running)"
-    name: "buildbucket/luci.webrtc.ci/Mac Tester (long-running)"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Mac Tester (long-running)"
     category: "mac"
     short_name: "lng"
   }
   builders {
     name: "buildbot/chromium.webrtc/Win Builder"
-    name: "buildbucket/luci.webrtc.ci/Win Builder"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win Builder"
     category: "win"
     short_name: "bld"
   }
   builders {
     name: "buildbot/chromium.webrtc/Win10 Tester"
-    name: "buildbucket/luci.webrtc.ci/Win10 Tester"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win10 Tester"
     category: "win"
     short_name: "10"
   }
   builders {
     name: "buildbot/chromium.webrtc/Win7 Tester"
-    name: "buildbucket/luci.webrtc.ci/Win7 Tester"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win7 Tester"
     category: "win"
     short_name: "7"
   }
   builders {
     name: "buildbot/chromium.webrtc/Win7 Tester (long-running)"
-    name: "buildbucket/luci.webrtc.ci/Win7 Tester (long-running)"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win7 Tester (long-running)"
     category: "win"
     short_name: "lng"
   }
   builders {
     name: "buildbot/chromium.webrtc/Win8 Tester"
-    name: "buildbucket/luci.webrtc.ci/Win8 Tester"
+    name: "buildbucket/luci.chromium.webrtc/WebRTC Chromium Win8 Tester"
     category: "win"
     short_name: "8"
   }

infra/config/global/luci-scheduler.cfg

@@ -329,6 +329,10 @@ trigger {
   triggers: "mac-mojo-rel"
   triggers: "mac-rel"
   triggers: "mac-views-rel"
+  # triggers: "WebRTC Chromium Android Builder"
+  triggers: "WebRTC Chromium Linux Builder"
+  # triggers: "WebRTC Chromium Mac Builder"
+  # triggers: "WebRTC Chromium Win Builder"
   triggers: "win-annotator-rel"
   triggers: "win-asan"
   triggers: "win-dbg"
@@ -1034,6 +1038,28 @@ job {
   }
 }
 
+job {
+  id: "WebRTC Chromium Android Builder"
+  acl_sets: "default"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Android Builder"
+  }
+}
+
+job {
+  id: "WebRTC Chromium Android Tester"
+  acl_sets: "triggered-by-parent-builders"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Android Tester"
+  }
+}
+
 ################################################################################
 # ChromeOS Builders. Sorted alphabetically.
 ################################################################################
@@ -1771,6 +1797,28 @@ job {
   }
 }
 
+job {
+  id: "WebRTC Chromium Linux Builder"
+  acl_sets: "default"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Linux Builder"
+  }
+}
+
+job {
+  id: "WebRTC Chromium Linux Tester"
+  acl_sets: "triggered-by-parent-builders"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Linux Tester"
+  }
+}
+
 ################################################################################
 # Mac Builders. Sorted alphabetically.
 ################################################################################
@@ -2184,6 +2232,28 @@ job {
   }
 }
 
+job {
+  id: "WebRTC Chromium Mac Builder"
+  acl_sets: "default"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Mac Builder"
+  }
+}
+
+job {
+  id: "WebRTC Chromium Mac Tester"
+  acl_sets: "triggered-by-parent-builders"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Mac Tester"
+  }
+}
+
 ################################################################################
 # Windows Builders. Sorted alphabetically.
 ################################################################################
@@ -2414,6 +2484,50 @@ job {
   }
 }
 
+job {
+  id: "WebRTC Chromium Win Builder"
+  acl_sets: "default"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win Builder"
+  }
+}
+
+job {
+  id: "WebRTC Chromium Win7 Tester"
+  acl_sets: "triggered-by-parent-builders"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win7 Tester"
+  }
+}
+
+job {
+  id: "WebRTC Chromium Win8 Tester"
+  acl_sets: "triggered-by-parent-builders"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win8 Tester"
+  }
+}
+
+job {
+  id: "WebRTC Chromium Win10 Tester"
+  acl_sets: "triggered-by-parent-builders"
+  acl_sets: "webrtc"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.webrtc"
+    builder: "WebRTC Chromium Win10 Tester"
+  }
+}
+
 job {
   id: "Win7 FYI x64 dEQP Release (NVIDIA)"
   # Triggered by "GPU FYI Win x64 dEQP Builder"

testing/buildbot/chromium.webrtc.json

@@ -27,14 +27,14 @@
       }
     ]
   },
-  "Linux Builder": {
+  "Mac Builder": {
     "additional_compile_targets": [
       "frame_analyzer",
       "jingle_unittests",
       "remoting_unittests"
     ]
   },
-  "Linux Tester": {
+  "Mac Tester": {
     "gtest_tests": [
       {
         "args": [
@@ -131,14 +131,15 @@
       }
     ]
   },
-  "Mac Builder": {
+  "Mac Tester (long-running)": {},
+  "WebRTC Chromium Linux Builder": {
     "additional_compile_targets": [
       "frame_analyzer",
       "jingle_unittests",
       "remoting_unittests"
     ]
   },
-  "Mac Tester": {
+  "WebRTC Chromium Linux Tester": {
     "gtest_tests": [
       {
         "args": [
@@ -235,7 +236,6 @@
       }
     ]
   },
-  "Mac Tester (long-running)": {},
   "Win Builder": {
     "additional_compile_targets": [
       "frame_analyzer",

testing/buildbot/waterfalls.pyl

@@ -3269,31 +3269,31 @@
           'gtest_tests': 'webrtc_android_tests_with_baremetal_tests',
         },
       },
-      'Linux Builder': {
+      'Mac Builder': {
         'additional_compile_targets': [
           'frame_analyzer',
           'jingle_unittests',
           'remoting_unittests',
         ],
       },
-      'Linux Tester': {
+      'Mac Tester': {
         'test_suites': {
           'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
         },
       },
-      'Mac Builder': {
+      'Mac Tester (long-running)': {},
+      '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)': {},
       'Win Builder': {
         'additional_compile_targets': [
           'frame_analyzer',