BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

7 files changed, 2857 insertions, 459 deletions

diff --git a/chromium/infra/config/branch/cq.cfg b/chromium/infra/config/branch/cq.cfg
index ec77beb2b57..0c3f2eb62a3 100644
--- a/chromium/infra/config/branch/cq.cfg
+++ b/chromium/infra/config/branch/cq.cfg
@@ -30,10 +30,27 @@ verifiers {
 # https://sites.google.com/a/chromium.org/dev/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot?pli=1#TOC-Adding-new-build-configurations-and-tests-to-the-main-Chromium-waterfall-Commit-Queue
   try_job {
     buckets {
+      name: "luci.chromium.try"
+      builders { name: "cast_shell_linux" }
+      builders { name: "chromium_presubmit" }
+      builders { name: "fuchsia_arm64" }
+      builders { name: "linux_chromium_compile_dbg_ng" }
+      builders { name: "linux_chromium_rel_ng" }
+      builders { name: "mac_chromium_compile_dbg_ng" }
+      builders { name: "mac_chromium_rel_ng" }
+      builders { name: "win_chromium_compile_dbg_ng" }
+
+      # TODO(ehmaldonado): remove this fake builder.
+      builders {
+        name: "linux_chromium_compile_rel_ng_patch_on_gclient"
+        experiment_percentage: 5
+      }
+    }
+    buckets {
       name: "master.tryserver.chromium.android"
       builders {
         name: "android_arm64_dbg_recipe"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
+        equivalent_to { bucket: "luci.chromium.try" percentage: 50 }
       }
       builders {
         name: "android_clang_dbg_recipe"
@@ -78,20 +95,8 @@ verifiers {
     buckets {
       name: "master.tryserver.chromium.linux"
       builders {
-        name: "cast_shell_linux"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
-      }
-      builders {
-        name: "chromium_presubmit"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
-      builders {
-        name: "fuchsia_arm64"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
-      }
-      builders {
         name: "fuchsia_x64"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
+        equivalent_to { bucket: "luci.chromium.try" percentage: 10 }
       }
       builders {
         name: "linux_chromium_asan_rel_ng"
@@ -102,10 +107,6 @@ verifiers {
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
       builders {
-        name: "linux_chromium_compile_dbg_ng"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
-      builders {
         name: "linux_chromium_headless_rel"
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
@@ -114,8 +115,16 @@ verifiers {
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
       builders {
-        name: "linux_chromium_rel_ng"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
+        # Temporary addition to gather data for LUCI migration.
+        # https://crbug.com/783000
+        name: "fuchsia_arm64_cast_audio"
+        experiment_percentage: 1
+      }
+      builders {
+        # Temporary addition to gather data for LUCI migration.
+        # https://crbug.com/783001
+        name: "fuchsia_x64_cast_audio"
+        experiment_percentage: 1
       }
     }
     buckets {
@@ -139,24 +148,6 @@ verifiers {
         name: "ios-simulator-xcode-clang"
         experiment_percentage: 10
       }
-      builders {
-        name: "mac_chromium_compile_dbg_ng"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
-      }
-      builders {
-        name: "mac_chromium_rel_ng"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
-      }
-      builders {
-        # The only purpose of this builder here is get data for migrating this
-        # builder to LUCI, see https://crbug.com/731476.
-        # 1% of ~90 cq runs/peak hour => builds per peak hour, which currently
-        # is fine given shared 5 VMs with another optional CQ builder.
-        # TODO(tandrii): remove this builder once enough data has been
-        # collected.
-        name: "mac_chromium_dbg_ng"
-        experiment_percentage: 3
-      }
     }
     buckets {
       name: "master.tryserver.chromium.win"
@@ -173,18 +164,6 @@ verifiers {
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
       builders {
-        name: "win_chromium_compile_dbg_ng"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
-      }
-      builders {
-        # The only purpose of this builder here is get data for migrating this
-        # builder to LUCI, see https://crbug.com/731384.
-        # TODO(jchinlee): remove this builder once enough data has been
-        # collected.
-        name: "win_chromium_dbg_ng"
-        experiment_percentage: 5
-      }
-      builders {
         name: "win7_chromium_rel_loc_exp"
         experiment_percentage: 20
       }
diff --git a/chromium/infra/config/global/OWNERS b/chromium/infra/config/global/OWNERS
index 57bc30a3f17..510579d4e99 100644
--- a/chromium/infra/config/global/OWNERS
+++ b/chromium/infra/config/global/OWNERS
@@ -1,3 +1,9 @@
 dpranke@chromium.org
 estaab@chromium.org
+hinoka@chromium.org
+iannucci@chromium.org
+jchinlee@chromium.org
 nodir@chromium.org
+smut@google.com
+tandrii@chromium.org
+vadimsh@chromium.org
diff --git a/chromium/infra/config/global/cr-buildbucket-dev.cfg b/chromium/infra/config/global/cr-buildbucket-dev.cfg
index b445b5bb901..2326736272f 100644
--- a/chromium/infra/config/global/cr-buildbucket-dev.cfg
+++ b/chromium/infra/config/global/cr-buildbucket-dev.cfg
@@ -82,7 +82,9 @@ buckets {
       execution_timeout_secs: 10800  # 3h
       build_numbers: YES
       recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+
         properties: "mastername:luci.chromium.try"
         name: "chromium_trybot"
       }
@@ -92,7 +94,6 @@ buckets {
     builders { mixins: "linux" name: "LUCI cast_shell_audio_linux" }
     builders { mixins: "linux" name: "LUCI cast_shell_linux" }
     builders { mixins: "linux" name: "LUCI chromeos_amd64-generic_chromium_compile_only_ng" }
-    builders { mixins: "linux" name: "LUCI chromeos_amd64-generic_chromium_compile_only_ng" }
     builders { mixins: "linux" name: "LUCI chromeos_amd64-generic_variable" }
     builders { mixins: "linux" name: "LUCI chromeos_daisy_chromium_compile_only_ng" }
     builders { mixins: "linux" name: "LUCI chromeos_daisy_variable" }
@@ -168,8 +169,7 @@ buckets {
     builders { mixins: "mac" name: "LUCI ios-simulator-cronet" }
     builders { mixins: "mac" name: "LUCI ios-simulator-eg" }
     builders { mixins: "mac" name: "LUCI ios-simulator-xcode-clang" }
-    builders { mixins: "mac" name: "LUCI mac_chromium_10.10_macviews" }
-    builders { mixins: "mac" name: "LUCI mac_chromium_10.10_rel_ng" }
+    builders { mixins: "mac" name: "LUCI mac_chromium_10.10" }
     builders { mixins: "mac" name: "LUCI mac_chromium_10.12_rel_ng" }
     builders { mixins: "mac" name: "LUCI mac_chromium_archive_rel_ng" }
     builders { mixins: "mac" name: "LUCI mac_chromium_asan_rel_ng" }
@@ -193,6 +193,7 @@ buckets {
     builders { mixins: "mac" name: "LUCI mac_nacl_sdk_build" }
     builders { mixins: "mac" name: "LUCI mac_optional_gpu_tests_rel" }
     builders { mixins: "mac" name: "LUCI mac_upload_clang" }
+    builders { mixins: "mac" name: "LUCI mac-views-rel" }
 
     builders { mixins: "win" name: "LUCI win10_chromium_x64_rel_ng" }
     builders { mixins: "win" name: "LUCI win10_chromium_x64_rel_ng_exp" }
diff --git a/chromium/infra/config/global/cr-buildbucket.cfg b/chromium/infra/config/global/cr-buildbucket.cfg
index abfd93e6bcc..09ef134e32a 100644
--- a/chromium/infra/config/global/cr-buildbucket.cfg
+++ b/chromium/infra/config/global/cr-buildbucket.cfg
@@ -38,6 +38,11 @@ acl_sets {
     # Support builder triggering other builders in the same bucket.
     identity: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
   }
+  acls {
+    # Allow task force to bump next build number.
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
 }
 
 acl_sets {
@@ -77,6 +82,17 @@ builder_mixins {
   }
 }
 
+# This is for tryservers becoming slow and critical path of patch landing.
+builder_mixins {
+  name: "goma-j150"
+  recipe {
+    properties_j: <<END
+    $build/goma: {
+      "jobs": 150
+    }
+    END
+  }
+}
 
 builder_mixins {
   name: "android"
@@ -104,6 +120,53 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "android-angle-try"
+  dimensions: "os:Ubuntu-14.04"
+  mixins: "angle-try"
+}
+
+builder_mixins {
+  name: "android-gpu-fyi-ci"
+  dimensions: "os:Ubuntu-14.04"
+  mixins: "gpu-fyi-ci"
+}
+
+builder_mixins {
+  name: "android-optional-gpu-try"
+  dimensions: "os:Ubuntu-14.04"
+  mixins: "gpu-optional-try"
+  mixins: "android-try"
+}
+
+builder_mixins {
+  name: "angle-try"
+  service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  recipe {
+    properties: "mastername:tryserver.chromium.angle"
+  }
+}
+
+builder_mixins {
+  name: "chromeos-ci"
+  # All CrOS building is done via cross-compilation on linux hosts, so use the
+  # linux mixin.
+  mixins: "linux"
+  recipe {
+    properties: "mastername:chromium.chromiumos"
+  }
+}
+
+builder_mixins {
+  name: "chromeos-try"
+  # All CrOS building is done via cross-compilation on linux hosts, so use the
+  # linux mixin.
+  mixins: "linux"
+  recipe {
+    properties: "mastername:tryserver.chromium.chromiumos"
+  }
+}
+
+builder_mixins {
   name: "fyi-ci"
   recipe {
     properties: "mastername:chromium.fyi"
@@ -111,11 +174,39 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "gpu-fyi-ci"
+  service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  recipe {
+    properties: "mastername:chromium.gpu.fyi"
+  }
+}
+
+builder_mixins {
+  name: "gpu-optional-try"
+  service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+}
+
+builder_mixins {
   name: "linux"
   dimensions: "os:Ubuntu-14.04"
 }
 
 builder_mixins {
+  name: "linux-angle-try"
+  mixins: "linux"
+  mixins: "angle-try"
+}
+
+builder_mixins {
+  name: "linux-optional-gpu-try"
+  mixins: "linux"
+  mixins: "gpu-optional-try"
+  recipe {
+    properties: "mastername:tryserver.chromium.linux"
+  }
+}
+
+builder_mixins {
   name: "linux-try"
   mixins: "linux"
   recipe {
@@ -124,6 +215,14 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "memory-ci"
+  mixins: "goma-many-jobs-for-ci"
+  recipe {
+    properties: "mastername:chromium.memory"
+  }
+}
+
+builder_mixins {
   name: "linux-ci"
   mixins: "linux"
   mixins: "goma-many-jobs-for-ci"
@@ -141,11 +240,33 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "linux-gpu-fyi-ci"
+  mixins: "linux"
+  mixins: "gpu-fyi-ci"
+}
+
+builder_mixins {
   name: "mac"
   dimensions: "os:Mac"
 }
 
 builder_mixins {
+  name: "mac-angle-try"
+  mixins: "mac"
+  mixins: "angle-try"
+  dimensions: "cores:4"
+}
+
+builder_mixins {
+  name: "mac-optional-gpu-try"
+  mixins: "mac"
+  mixins: "gpu-optional-try"
+  recipe {
+    properties: "mastername:tryserver.chromium.mac"
+  }
+}
+
+builder_mixins {
   name: "mac-try"
   mixins: "mac"
   recipe {
@@ -162,6 +283,37 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "ios-ci"
+  mixins: "mac-ci"
+  recipe {
+    name: "ios/unified_builder_tester"
+  }
+}
+
+builder_mixins {
+  name: "ios-try"
+  mixins: "mac-try"
+  recipe {
+    name: "ios/try"
+  }
+}
+
+builder_mixins {
+  name: "mac-gpu-ci"
+  mixins: "mac"
+  recipe {
+    properties: "mastername:chromium.gpu"
+  }
+}
+
+builder_mixins {
+  name: "mac-gpu-fyi-ci"
+  mixins: "mac"
+  mixins: "gpu-fyi-ci"
+  dimensions: "cores:4"
+}
+
+builder_mixins {
   name: "webkit-ci"
   recipe {
     properties: "mastername:chromium.webkit"
@@ -174,6 +326,21 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "win-angle-try"
+  mixins: "win"
+  mixins: "angle-try"
+}
+
+builder_mixins {
+  name: "win-optional-gpu-try"
+  mixins: "win"
+  mixins: "gpu-optional-try"
+  recipe {
+    properties: "mastername:tryserver.chromium.win"
+  }
+}
+
+builder_mixins {
   name: "win-try"
   mixins: "win"
   recipe {
@@ -189,8 +356,25 @@ builder_mixins {
   }
 }
 
+# GPU bots run very long tests sometimes on a single tester. The regular
+# timeout isn't enough on some testers during the migration when they run both
+# the buildbot and LUCI tests. Double the timeout for them.
+# TODO(cwallez@chromium.org): remove this when the migration is complete
+builder_mixins {
+  name: "gpu-slow-bot"
+  execution_timeout_secs: 21600  # 2 x 3h for a double workload
+}
+
+builder_mixins {
+  name: "win-gpu-fyi-ci"
+  mixins: "win"
+  mixins: "gpu-fyi-ci"
+  mixins: "gpu-slow-bot"
+}
+
 builder_mixins {
   name: "findit"
+  mixins: "goma-j150"
   # This category is meant for Findit to trigger tryjobs on.
   category: "Chromium Variable"
   recipe {
@@ -205,8 +389,8 @@ buckets {
   swarming {
     hostname: "chromium-swarm.appspot.com"
     builder_defaults {
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "pool:luci.chromium.ci"
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       execution_timeout_secs: 10800  # 3h
       swarming_tags: "vpython:native-python-wrapper"
@@ -217,7 +401,8 @@ buckets {
       auto_builder_dimension: YES
       luci_migration_host: "luci-migration.appspot.com"
       recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
         name: "chromium"
         properties_j: "$kitchen:{\"git_auth\": true, \"devshell\": true}"
       }
@@ -230,15 +415,114 @@ buckets {
       name: "Android arm64 Builder (dbg)"
       mixins: "android-ci"
       dimensions: "os:Ubuntu-14.04"
-      dimensions: "cores:8"
       execution_timeout_secs: 14400  # 4h
     }
 
     builders {
+      name: "Android FYI 32 Vk Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI 64 Vk Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI dEQP Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 5)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 5X)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 6)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 6P)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (Nexus 9)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android FYI Release (NVIDIA Shield TV)"
+      mixins: "android-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Android x64 Builder (dbg)"
+      mixins: "android-ci"
+      dimensions: "os:Ubuntu-14.04"
+      execution_timeout_secs: 14400  # 4h
+    }
+
+    builders {
+      name: "Android x86 Builder (dbg)"
+      mixins: "android-ci"
+      dimensions: "os:Ubuntu-14.04"
+    }
+
+    builders {
+      name: "Deterministic Android"
+      mixins: "android-ci"
+      recipe {
+        name: "swarming/deterministic_build"
+      }
+    }
+
+    builders {
+      name: "Deterministic Android (dbg)"
+      mixins: "android-ci"
+      recipe {
+        name: "swarming/deterministic_build"
+      }
+    }
+
+    builders {
       name: "Marshmallow 64 bit Tester"
       mixins: "android-ci"
       dimensions: "os:Ubuntu-14.04"
-      dimensions: "cores:8"
+    }
+
+    # ChromeOS bots.
+    builders {
+      name: "chromeos-amd64-generic-rel"
+      mixins: "chromeos-ci"
+    }
+
+    # Fuchsia bots.
+    builders {
+      name: "Fuchsia ARM64"
+      mixins: "linux-ci"
+    }
+
+    builders {
+      name: "Fuchsia ARM64 Cast Audio"
+      mixins: "linux-ci"
+    }
+
+    builders {
+      name: "Fuchsia x64"
+      mixins: "linux-ci"
+    }
+
+    builders {
+      name: "Fuchsia x64 Cast Audio"
+      mixins: "linux-ci"
     }
 
     # Linux bots.
@@ -249,6 +533,12 @@ buckets {
     }
 
     builders {
+      name: "linux-blink-heap-verification"
+      mixins: "fyi-ci"
+      mixins: "linux"
+    }
+
+    builders {
       name: "Cast Linux"
       mixins: "linux-ci"
       recipe {
@@ -259,18 +549,51 @@ buckets {
     builders {
       name: "GPU Linux Builder"
       mixins: "linux-gpu-ci"
-      dimensions: "cores:8"
+    }
+
+    builders {
+      name: "Deterministic Linux"
+      mixins: "linux-ci"
+      recipe {
+        name: "swarming/deterministic_build"
+      }
+    }
+
+    builders {
+      name: "Deterministic Linux (dbg)"
+      mixins: "linux-ci"
+      recipe {
+        name: "swarming/deterministic_build"
+      }
+    }
+
+    builders {
+      name: "Linux ASan LSan Builder"
+      mixins: "linux"
+      mixins: "memory-ci"
+    }
+
+    builders {
+      name: "Linux ASan LSan Tests (1)"
+      mixins: "linux"
+      mixins: "memory-ci"
+    }
+
+    builders {
+      name: "Linux ASan Tests (sandboxed)"
+      mixins: "linux"
+      mixins: "memory-ci"
     }
 
     builders {
       name: "Linux Builder"
       mixins: "linux-ci"
+      dimensions: "cores:32"
     }
 
     builders {
       name: "Linux Release (NVIDIA)"
       mixins: "linux-gpu-ci"
-      dimensions: "cores:8"
     }
 
     builders {
@@ -279,66 +602,364 @@ buckets {
     }
 
     builders {
+      name: "linux64-jumbo-rel"
+      mixins: "linux-ci"
+    }
+
+    builders {
       name: "Linux Builder (dbg)"
       mixins: "linux-ci"
-      dimensions: "cpu:x86-64"
+      dimensions: "cores:32"
+    }
+
+    builders {
+      name: "Linux Builder (dbg)(32)"
+      mixins: "linux-ci"
       dimensions: "cores:32"
     }
 
     builders {
       name: "Linux Tests (dbg)(1)"
       mixins: "linux-ci"
-      dimensions: "cpu:x86-64"
-      dimensions: "cores:8"
+    }
+
+    builders {
+      name: "Linux Tests (dbg)(1)(32)"
+      mixins: "linux-ci"
+    }
+
+    builders {
+      name: "Linux TSan Builder"
+      mixins: "linux"
+      mixins: "memory-ci"
+    }
+
+    builders {
+      name: "Linux TSan Tests"
+      mixins: "linux"
+      mixins: "memory-ci"
+    }
+
+    builders {
+      name: "GPU FYI Linux Builder"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "GPU FYI Linux Builder (dbg)"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "GPU FYI Linux Ozone Builder"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "GPU FYI Linux dEQP Builder"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Linux FYI Release (NVIDIA)"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Linux FYI Debug (NVIDIA)"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Linux FYI dEQP Release (NVIDIA)"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Linux FYI Release (Intel HD 630)"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Linux FYI GPU TSAN Release"
+      mixins: "linux-gpu-fyi-ci"
+    }
+
+    builders {
+      name: "Linux FYI Release (AMD R7 240)"
+      mixins: "linux-gpu-fyi-ci"
+      mixins: "gpu-slow-bot"
+    }
+
+    builders {
+      name: "Linux FYI Ozone (Intel)"
+      mixins: "linux-gpu-fyi-ci"
     }
 
     # Mac bots.
     builders {
+      name: "Mac Builder"
+      mixins: "mac-ci"
+    }
+    builders {
+      name: "Mac10.10 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.10"
+    }
+    builders {
+      name: "Mac10.11 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.11"
+    }
+    builders {
+      name: "Mac10.12 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.12"
+    }
+    builders {
+      name: "Mac10.13 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.13"
+    }
+    builders {
       name: "Mac Builder (dbg)"
       mixins: "mac-ci"
-      dimensions: "cpu:x86-64"
-      dimensions: "cores:8"
     }
     builders {
-      name: "Mac10.9 Tests (dbg)"
+      name: "Mac10.13 Tests (dbg)"
       mixins: "mac-ci"
-      dimensions: "cpu:x86-64"
-      dimensions: "cores:8"
     }
 
     builders {
-      name: "WebKit Mac Builder (dbg)"
-      mixins: "webkit-ci"
-      dimensions: "os:Mac-10.12"
-      dimensions: "cpu:x86-64"
-      dimensions: "cores:8"
+      name: "GPU Mac Builder"
+      mixins: "mac-gpu-ci"
+    }
+    builders {
+      name: "Mac Release (Intel)"
+      mixins: "mac-gpu-ci"
+      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
+      # and so can perhaps run on cheaper linux hardware.
+    }
+    builders {
+      name: "Mac Retina Release (AMD)"
+      mixins: "mac-gpu-ci"
+      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
+      # and so can perhaps run on cheaper linux hardware.
+    }
+
+    builders {
+      name: "GPU Mac Builder (dbg)"
+      mixins: "mac-gpu-ci"
+    }
+    builders {
+      name: "Mac Debug (Intel)"
+      mixins: "mac-gpu-ci"
+      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
+      # and so can perhaps run on cheaper linux hardware.
+    }
+    builders {
+      name: "Mac Retina Debug (AMD)"
+      mixins: "mac-gpu-ci"
+      # TODO(tandrii,kbr): this builder doesn't actually run tests locally,
+      # and so can perhaps run on cheaper linux hardware.
     }
 
+    # chromium.gpu.fyi
+    builders {
+      name: "GPU FYI Mac Builder"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Mac Builder (dbg)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Mac dEQP Builder"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Release (Intel)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Debug (Intel)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac Pro FYI Release (AMD)"
+      mixins: "mac-gpu-fyi-ci"
+      mixins: "gpu-slow-bot"
+    }
+    builders {
+      name: "Mac FYI Retina Release (NVIDIA)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Retina Debug (NVIDIA)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Retina Release (AMD)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Retina Debug (AMD)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Experimental Release (Intel)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Experimental Retina Release (AMD)"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI Experimental Retina Release (NVIDIA)"
+      mixins: "mac-gpu-fyi-ci"
+      mixins: "gpu-slow-bot"
+    }
+    builders {
+      name: "Mac FYI GPU ASAN Release"
+      mixins: "mac-gpu-fyi-ci"
+      execution_timeout_secs: 14400  # 4h
+    }
+    builders {
+      name: "Mac FYI dEQP Release AMD"
+      mixins: "mac-gpu-fyi-ci"
+    }
+    builders {
+      name: "Mac FYI dEQP Release Intel"
+      mixins: "mac-gpu-fyi-ci"
+    }
+
+    # iOS bots.
+    builders { mixins: "ios-ci" name: "ios-device" }
+    builders { mixins: "ios-ci" name: "ios-device-xcode-clang" }
+    builders { mixins: "ios-ci" name: "ios-simulator" }
+    builders { mixins: "ios-ci" name: "ios-simulator-full-configs" }
+    builders { mixins: "ios-ci" name: "ios-simulator-xcode-clang" }
+    builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios-simulator-cronet" }
+
     # Win bots.
     builders {
       name: "Win Builder"
       mixins: "win-ci"
-      dimensions: "cpu:x86-64"
       dimensions: "cores:32"
     }
     builders {
       name: "Win Builder (dbg)"
       mixins: "win-ci"
-      dimensions: "cpu:x86-64"
       dimensions: "cores:32"
     }
     builders {
+      name: "Win x64 Builder (dbg)"
+      mixins: "win-ci"
+      dimensions: "cores:32"
+      dimensions: "os:Windows"
+    }
+    builders {
+      name: "Win7 (32) Tests"
+      mixins: "win-ci"
+      dimensions: "os:Windows-7"
+    }
+    builders {
       name: "Win7 Tests (1)"
       mixins: "win-ci"
-      dimensions: "cpu:x86-64"
-      dimensions: "cores:8"
+      dimensions: "os:Windows-7"
     }
     builders {
       name: "Win7 Tests (dbg)(1)"
       mixins: "win-ci"
+      dimensions: "os:Windows-7"
+    }
+    builders {
+      name: "Win10 Tests x64 (dbg)"
+      mixins: "win-ci"
+      dimensions: "os:Windows-10"
       dimensions: "cpu:x86-64"
       dimensions: "cores:8"
     }
+    builders {
+      name: "GPU FYI Win Builder"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Win Builder (dbg)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Win Clang Builder (dbg)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Win dEQP Builder"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Win x64 Builder"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Win x64 Builder (dbg)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "GPU FYI Win x64 dEQP Builder"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win10 FYI Debug (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win10 FYI dEQP Release (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win10 FYI Exp Release (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win10 FYI Release (Intel HD 630)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win10 FYI Release (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI Debug (AMD)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI Debug (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI dEQP Release (AMD)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI Release (AMD)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI Release (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI x64 Debug (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI x64 dEQP Release (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
+    builders {
+      name: "Win7 FYI x64 Release (NVIDIA)"
+      mixins: "win-gpu-fyi-ci"
+    }
   }
 }
 
@@ -373,7 +994,8 @@ buckets {
       # we specify them here is to pass validation of the buildbucket config.
       # Also, to illustrate the typical use case of this bucket.
       recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
         name: "findit/chromium/compile"
         properties_j: "$kitchen:{\"git_auth\": true, \"devshell\": true}"
       }
@@ -404,8 +1026,8 @@ buckets {
 
     builder_defaults {
       category: "Chromium CQ"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "pool:luci.chromium.try"
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
       execution_timeout_secs: 10800  # 3h
       swarming_tags: "vpython:native-python-wrapper"
@@ -419,30 +1041,33 @@ buckets {
         name: "win_toolchain"
       }
       recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
         name: "chromium_trybot"
         properties_j: "$kitchen:{\"git_auth\": true, \"devshell\": true}"
       }
     }
 
     # Keep builders sorted by OS, then name.
+    builders { mixins: "android-angle-try" name: "android_angle_rel_ng" }
+    builders { mixins: "android-angle-try" name: "android_angle_deqp_rel_ng" }
     builders {
       mixins: "android-try"
       name: "android_arm64_dbg_recipe"
       dimensions: "os:Ubuntu-14.04"
-      dimensions: "cores:8"
     }
     builders {
       mixins: "android-try"
       name: "android_n5x_swarming_dbg"
       dimensions: "os:Ubuntu-14.04"
-      dimensions: "cores:8"
     }
+    builders { mixins: "android-optional-gpu-try" name: "android_optional_gpu_tests_rel" }
+
+    builders { mixins: "chromeos-try" name: "chromeos-amd64-generic-rel" }
 
     builders { mixins: "linux-try" name: "cast_shell_audio_linux" }
     builders { mixins: "linux-try" name: "cast_shell_linux" }
     builders { mixins: "linux-try" name: "chromeos_amd64-generic_chromium_compile_only_ng" }
-    builders { mixins: "linux-try" name: "chromeos_amd64-generic_chromium_compile_only_ng" }
     builders { mixins: "linux-try" name: "chromeos_amd64-generic_variable" }
     builders { mixins: "linux-try" name: "chromeos_daisy_chromium_compile_only_ng" }
     builders { mixins: "linux-try" name: "chromeos_daisy_variable" }
@@ -459,8 +1084,17 @@ buckets {
       }
     }
     builders { mixins: "linux-try" name: "closure_compilation" }
-    builders { mixins: "linux-try" name: "fuchsia" }
+    builders { mixins: "linux-try" name: "fuchsia_arm64" }
+    builders { mixins: "linux-try" name: "fuchsia_x64" }
+    builders { mixins: "linux-try" name: "fuchsia_arm64_cast_audio" }
+    builders { mixins: "linux-try" name: "fuchsia_x64_cast_audio" }
+    builders { mixins: "linux-try" name: "linux-blink-heap-verification-try" }
     builders { mixins: "linux-try" name: "linux_android_rel_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_compile_dbg_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_dbg_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_deqp_rel_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_ozone_rel_ng" }
+    builders { mixins: "linux-angle-try" name: "linux_angle_rel_ng" }
     builders { mixins: "linux-try" name: "linux_arm" }
     builders { mixins: "linux-try" name: "linux_chromium_analysis" }
     builders { mixins: "linux-try" name: "linux_chromium_archive_rel_ng" }
@@ -481,11 +1115,27 @@ buckets {
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable_chrome" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable_deflake" }
-    builders { mixins: "linux-try" name: "linux_chromium_clobber_deterministic" }
+    builders {
+      mixins: "linux-try"
+      name: "linux_chromium_clobber_deterministic",
+      recipe {
+        name: "swarming/deterministic_build"
+      }
+    }
     builders { mixins: "linux-try" name: "linux_chromium_clobber_rel_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_compile_dbg_32_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_compile_dbg_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_compile_rel_ng" }
+    builders {
+      mixins: "linux-try"
+      name: "linux_chromium_compile_rel_ng_patch_on_gclient"
+      dimensions: "builder:linux_chromium_compile_rel_ng"
+      auto_builder_dimension: NO
+      recipe {
+        properties: "buildername:linux_chromium_compile_rel_ng"
+        properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
+      }
+    }
     builders { mixins: "linux-try" name: "linux_chromium_component_updater" }
     builders { mixins: "linux-try" name: "linux_chromium_dbg_32_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_dbg_ng" }
@@ -494,7 +1144,23 @@ buckets {
     builders { mixins: "linux-try" name: "linux_chromium_msan_rel_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_msan_variable" }
     builders { mixins: "linux-try" name: "linux_chromium_ozone_compile_only_ng" }
-    builders { mixins: "linux-try" name: "linux_chromium_rel_ng" }
+    builders {
+      mixins: "linux-try"
+      mixins: "goma-j150"
+      name: "linux_chromium_rel_ng"
+    }
+    builders {
+      mixins: "linux-try"
+      mixins: "goma-j150"
+      name: "linux_chromium_rel_ng_patch_on_gclient"
+      dimensions: "builder:linux_chromium_rel_ng"
+      experimental: YES
+      auto_builder_dimension: NO
+      recipe {
+        properties: "buildername:linux_chromium_rel_ng"
+        properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
+      }
+    }
     builders { mixins: "linux-try" name: "linux_chromium_tsan_rel_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_tsan_variable" }
     builders { mixins: "linux-try" name: "linux_chromium_ubsan_rel_ng" }
@@ -520,19 +1186,25 @@ buckets {
     builders { mixins: "linux-try" name: "linux_mojo_chromeos" }
     builders { mixins: "linux-try" name: "linux_nacl_sdk" }
     builders { mixins: "linux-try" name: "linux_nacl_sdk_build" }
-    builders { mixins: "linux-try" name: "linux_optional_gpu_tests_rel" }
+    builders { mixins: "linux-optional-gpu-try" name: "linux_optional_gpu_tests_rel" }
     builders { mixins: "linux-try" name: "linux_site_isolation" }
     builders { mixins: "linux-try" name: "linux_upload_clang" }
 
-    builders { mixins: "mac-try" name: "ios-device" }
-    builders { mixins: "mac-try" name: "ios-device-xcode-clang" }
-    builders { mixins: "mac-try" name: "ios-simulator" }
-    builders { mixins: "mac-try" name: "ios-simulator-cronet" }
-    builders { mixins: "mac-try" name: "ios-simulator-eg" }
-    builders { mixins: "mac-try" name: "ios-simulator-xcode-clang" }
-    builders { mixins: "mac-try" name: "mac_chromium_10.10_macviews" }
-    builders { mixins: "mac-try" name: "mac_chromium_10.10_rel_ng" }
+    builders { mixins: "ios-try" name: "ios-device" }
+    builders { mixins: "ios-try" name: "ios-device-xcode-clang" }
+    builders { mixins: "ios-try" name: "ios-simulator" }
+    builders { mixins: "ios-try" name: "ios-simulator-cronet" }
+    builders { mixins: "ios-try" name: "ios-simulator-eg" }
+    builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }
+    builders { mixins: "mac-angle-try" name: "mac_angle_compile_dbg_ng" }
+    builders { mixins: "mac-angle-try" name: "mac_angle_dbg_ng" }
+    builders { mixins: "mac-angle-try" name: "mac_angle_rel_ng" }
+    # NOTE: the folliwing 3 trybots aren't sensitive to Mac version on which
+    # they are built, hence no additional dimension is specified.
+    # The 10.xx version translates to which bots will run isolated tests.
+    builders { mixins: "mac-try" name: "mac_chromium_10.10" }
     builders { mixins: "mac-try" name: "mac_chromium_10.12_rel_ng" }
+    builders { mixins: "mac-try" name: "mac_chromium_10.13_rel_ng"}
     builders { mixins: "mac-try" name: "mac_chromium_archive_rel_ng" }
     builders { mixins: "mac-try" name: "mac_chromium_asan_rel_ng" }
     builders { mixins: "mac-try" name: "mac_chromium_asan_variable" }
@@ -553,19 +1225,39 @@ buckets {
     builders { mixins: "mac-try" name: "mac_chromium_variable_layout" }
     builders { mixins: "mac-try" name: "mac_nacl_sdk" }
     builders { mixins: "mac-try" name: "mac_nacl_sdk_build" }
-    builders { mixins: "mac-try" name: "mac_optional_gpu_tests_rel" }
+    builders {
+      mixins: "mac-optional-gpu-try"
+      name: "mac_optional_gpu_tests_rel"
+      # Clear cores dimension requirement because build{103..105}-m9 are cores:4
+      dimensions: "cores:"
+    }
     builders { mixins: "mac-try" name: "mac_upload_clang" }
+    builders { mixins: "mac-try" name: "mac-views-rel" }
 
+    builders { mixins: "win-try" name: "win10_chromium_x64_dbg_ng" }
     builders { mixins: "win-try" name: "win10_chromium_x64_rel_ng" }
     builders { mixins: "win-try" name: "win10_chromium_x64_rel_ng_exp" }
     builders { mixins: "win-try" name: "win8_chromium_gn_upload" }
     builders { mixins: "win-try" name: "win7_chromium_rel_ng" }
     builders { mixins: "win-try" name: "win7_chromium_rel_loc_exp" }
+    builders { mixins: "win-angle-try" name: "win_angle_rel_ng" }
+    builders { mixins: "win-angle-try" name: "win_angle_compile_x64_rel_ng" }
+    builders { mixins: "win-angle-try" name: "win_angle_compile_x64_dbg_ng" }
+    builders { mixins: "win-angle-try" name: "win_angle_compile_dbg_ng" }
+    builders { mixins: "win-angle-try" name: "win_angle_deqp_rel_ng" }
+    builders { mixins: "win-angle-try" name: "win_angle_x64_rel_ng" }
+    builders { mixins: "win-angle-try" name: "win_angle_x64_deqp_rel_ng" }
     builders { mixins: "win-try" name: "win_archive" }
     builders { mixins: "win-try" name: "win_chrome_official" }
     builders { mixins: "win-try" name: "win_chromium_compile_dbg_ng" }
     builders { mixins: "win-try" name: "win_chromium_compile_rel_ng" }
-    builders { mixins: "win-try" name: "win_chromium_dbg_ng" }
+    # TODO(crbug/794085): Revisit exceptional extra-long timeout when we speed
+    # up the builder.
+    builders {
+      mixins: "win-try"
+      name: "win_chromium_dbg_ng"
+      execution_timeout_secs: 14400 # 4h
+    }
     builders { mixins: "win-try" name: "win_chromium_syzyasan_rel" }
     builders { mixins: "win-try" name: "win_chromium_variable" }
     builders { mixins: "win-try" name: "win_chromium_variable_archive" }
@@ -584,7 +1276,7 @@ buckets {
     builders { mixins: "win-try" name: "win_mojo" }
     builders { mixins: "win-try" name: "win_nacl_sdk" }
     builders { mixins: "win-try" name: "win_nacl_sdk_build" }
-    builders { mixins: "win-try" name: "win_optional_gpu_tests_rel" }
+    builders { mixins: "win-optional-gpu-try" name: "win_optional_gpu_tests_rel" }
     builders { mixins: "win-try" name: "win_pgo" }
     builders { mixins: "win-try" name: "win_upload_clang" }
     builders { mixins: "win-try" name: "win_x64_archive" }
diff --git a/chromium/infra/config/global/luci-milo-dev.cfg b/chromium/infra/config/global/luci-milo-dev.cfg
index ac6c60a58e4..505fce8874d 100644
--- a/chromium/infra/config/global/luci-milo-dev.cfg
+++ b/chromium/infra/config/global/luci-milo-dev.cfg
@@ -11,12 +11,8 @@ headers: {
     url: "https://build.chromium.org/p/chromium/sheriff_android.json"
   }
   oncalls: {
-    name: "iOS US"
-    url: "https://build.chromium.org/p/chromium/sheriff_ios_us.json"
-  }
-  oncalls: {
-    name: "iOS EU"
-    url: "https://build.chromium.org/p/chromium/sheriff_ios_europe.json"
+    name: "iOS"
+    url: "https://build.chromium.org/p/chromium/sheriff_ios.json"
   }
   oncalls: {
     name: "CrOS MTV"
@@ -274,6 +270,7 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.win/Win Builder"
+    name: "buildbucket/luci.chromium.ci/Win Builder"
     category: "chromium.win|release|builder"
     short_name: "32"
   }
@@ -284,11 +281,13 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.win/Win7 (32) Tests"
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
     category: "chromium.win|release|tester"
     short_name: "32"
   }
   builders: {
     name: "buildbot/chromium.win/Win7 Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
     category: "chromium.win|release|tester"
     short_name: "32"
   }
@@ -311,13 +310,13 @@ consoles: {
     name: "buildbot/chromium.win/Win Builder (dbg)"
     name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
     category: "chromium.win|debug|builder"
-    short_name: "32"
+    short_name: "32d"
   }
   builders: {
     name: "buildbot/chromium.win/Win7 Tests (dbg)(1)"
     name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
     category: "chromium.win|debug|tester"
-    short_name: "7"
+    short_name: "7d"
   }
   builders: {
     name: "buildbot/chromium.win/Win10 Tests x64"
@@ -336,9 +335,9 @@ consoles: {
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests"
+    name: "buildbot/chromium.mac/Mac10.13 Tests"
     category: "chromium.mac|release|tester"
-    short_name: "9"
+    short_name: "13"
   }
   builders: {
     name: "buildbot/chromium.mac/Mac10.10 Tests"
@@ -361,9 +360,9 @@ consoles: {
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests (dbg)"
+    name: "buildbot/chromium.mac/Mac10.13 Tests (dbg)"
     category: "chromium.mac|debug"
-    short_name: "9"
+    short_name: "13"
   }
   builders: {
     name: "buildbot/chromium.mac/ios-device"
@@ -404,7 +403,12 @@ consoles: {
     short_name: "tst"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder (dbg)(32)"
+    name: "buildbot/chromium.linux/linux-gcc-rel"
+    category: "chromium.linux|release"
+    short_name: "gcc"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "chromium.linux|debug|builder"
     short_name: "32"
   }
@@ -415,7 +419,7 @@ consoles: {
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)(32)"
+    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
     category: "chromium.linux|debug|tester"
     short_name: "32"
   }
@@ -426,7 +430,7 @@ consoles: {
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Deterministic Linux"
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
     category: "chromium.linux"
     short_name: "det"
   }
@@ -641,9 +645,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "chromium.webkit|mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"
@@ -708,6 +712,7 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.win/Win Builder"
+    name: "buildbucket/luci.chromium.ci/Win Builder"
     category: "release|builder"
     short_name: "32"
   }
@@ -718,11 +723,13 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.win/Win7 (32) Tests"
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
     category: "release|tester"
     short_name: "32"
   }
   builders: {
     name: "buildbot/chromium.win/Win7 Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
     category: "release|tester"
     short_name: "32"
   }
@@ -737,6 +744,11 @@ consoles: {
     short_name: "mvc"
   }
   builders: {
+    name: "buildbot/chromium.win/Win10 Tests x64"
+    category: "release|tester"
+    short_name: "w10"
+  }
+  builders: {
     name: "buildbot/chromium.win/Win x64 Builder (dbg)"
     category: "debug|builder"
     short_name: "64"
@@ -754,11 +766,6 @@ consoles: {
     short_name: "7"
   }
   builders: {
-    name: "buildbot/chromium.win/Win10 Tests x64"
-    category: "debug|tester"
-    short_name: "w10"
-  }
-  builders: {
     name: "buildbot/chromium.win/WinMSVC64 (dbg)"
     category: "debug|tester"
     short_name: "mvc"
@@ -779,9 +786,9 @@ consoles: {
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests"
+    name: "buildbot/chromium.mac/Mac10.13 Tests"
     category: "release|tester"
-    short_name: "9"
+    short_name: "13"
   }
   builders: {
     name: "buildbot/chromium.mac/Mac10.10 Tests"
@@ -804,9 +811,9 @@ consoles: {
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests (dbg)"
+    name: "buildbot/chromium.mac/Mac10.13 Tests (dbg)"
     category: "debug"
-    short_name: "9"
+    short_name: "13"
   }
   builders: {
     name: "buildbot/chromium.mac/ios-device"
@@ -850,13 +857,18 @@ consoles: {
     short_name: "bld"
   }
   builders: {
+    name: "buildbot/chromium.linux/linux-gcc-rel"
+    category: "release"
+    short_name: "gcc"
+  }
+  builders: {
     name: "buildbot/chromium.linux/Linux Tests"
     name: "buildbucket/luci.chromium.ci/Linux Tests"
     category: "release"
     short_name: "tst"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder (dbg)(32)"
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "debug|builder"
     short_name: "32"
   }
@@ -866,7 +878,7 @@ consoles: {
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)(32)"
+    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
     category: "debug|tester"
     short_name: "32"
   }
@@ -876,7 +888,7 @@ consoles: {
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Deterministic Linux"
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
     short_name: "det"
   }
   builders: {
@@ -1120,9 +1132,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"
@@ -1186,42 +1198,42 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/chromium.perf/Android Builder"
+    name: "buildbot/chromium.perf/Android Builder Perf"
     category: "builder|android"
     short_name: "arm"
   }
   builders: {
-    name: "buildbot/chromium.perf/Android arm64 Builder"
+    name: "buildbot/chromium.perf/Android arm64 Builder Perf"
     category: "builder|android"
     short_name: "a64"
   }
   builders: {
-    name: "buildbot/chromium.perf/Android Compile"
+    name: "buildbot/chromium.perf/Android Compile Perf"
     category: "builder|android|compile"
     short_name: "arm"
   }
   builders: {
-    name: "buildbot/chromium.perf/Android arm64 Compile"
+    name: "buildbot/chromium.perf/Android arm64 Compile Perf"
     category: "builder|android|compile"
     short_name: "a64"
   }
   builders: {
-    name: "buildbot/chromium.perf/Win Builder"
+    name: "buildbot/chromium.perf/Win Builder Perf"
     category: "builder|win"
     short_name: "32"
   }
   builders: {
-    name: "buildbot/chromium.perf/Win x64 Builder"
+    name: "buildbot/chromium.perf/Win x64 Builder Perf"
     category: "builder|win"
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.perf/Mac Builder"
+    name: "buildbot/chromium.perf/Mac Builder Perf"
     category: "builder"
     short_name: "mac"
   }
   builders: {
-    name: "buildbot/chromium.perf/Linux Builder"
+    name: "buildbot/chromium.perf/Linux Builder Perf"
     category: "builder"
     short_name: "lnx"
   }
@@ -1351,11 +1363,6 @@ consoles: {
     short_name: "med"
   }
   builders: {
-    name: "buildbot/chromium.lkgr/Win SyzyASAN LKGR"
-    category: "win asan"
-    short_name: "syz"
-  }
-  builders: {
     name: "buildbot/chromium.lkgr/Mac ASAN Debug"
     category: "mac asan"
     short_name: "dbg"
@@ -1446,45 +1453,35 @@ consoles: {
   include_experimental_builds: true
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
-    category: "linux|debug|builder|64"
-    short_name: "🦋"
-  }
-  builders: {
-    name: "buildbot/chromium.linux/Linux Builder (dbg)"
-    category: "linux|debug|builder|64"
-    short_name: "🗑"
-  }
-  builders: {
-    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
-    category: "linux|debug|tester|64"
-    short_name: "🦋"
+    name: "buildbucket/luci.chromium.ci/Win Builder"
+    category: "win|release|builder|32"
+    short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)"
-    category: "linux|debug|tester|64"
-    short_name: "🗑"
+    name: "buildbot/chromium.win/Win Builder"
+    category: "win|release|builder|32"
+    short_name: "(ಥ_ಥ)"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
-    category: "win|debug|builder|32"
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
+    category: "win|release|tester|7"
     short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.win/Win Builder (dbg)"
-    category: "win|debug|builder|32"
+    name: "buildbot/chromium.win/Win7 (32) Tests"
+    category: "win|release|tester|7"
     short_name: "(ಥ_ಥ)"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
-    category: "win|debug|tester|7"
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
+    category: "win|release|tester|7"
     short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.win/Win7 Tests (dbg)(1)"
-    category: "win|debug|tester|7"
+    name: "buildbot/chromium.win/Win7 Tests (1)"
+    category: "win|release|tester|7"
     short_name: "(ಥ_ಥ)"
   }
 }
@@ -2023,6 +2020,70 @@ consoles: {
 }
 
 consoles: {
+  id: "chromium.fyi.goma"
+  name: "chromium.fyi.goma"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  ref: "refs/heads/master"
+  manifest_name: "REVISION"
+  header_id: "chromium"
+
+  builders: {
+    name: "buildbot/chromium.fyi/Win Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win cl.exe Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win7 Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win7 Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/WinMSVC64 Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Goma Canary (clobber)"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Builder (dbg) Goma Canary (clobber)"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/chromeos-amd64-generic-rel-goma-canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Linux Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Linux x64 Goma Canary (clobber)"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Linux x64 Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Android Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/ios-device-goma-canary-clobber"
+  }
+}
+
+consoles: {
   id: "chromium.fyi"
   name: "chromium.fyi"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -2087,7 +2148,7 @@ consoles: {
     category: "cronet"
   }
   builders: {
-    name: "buildbot/chromium.fyi/Chromium Mac 10.10 MacViews"
+    name: "buildbot/chromium.fyi/mac-views-rel"
     category: "default"
   }
   builders: {
@@ -2236,10 +2297,6 @@ consoles: {
     category: "linux"
   }
   builders: {
-    name: "buildbot/chromium.fyi/linux-gcc-rel"
-    category: "linux"
-  }
-  builders: {
     name: "buildbot/chromium.fyi/Headless Linux (dbg)"
     category: "linux"
   }
@@ -2381,6 +2438,10 @@ consoles: {
     name: "buildbot/chromium.goma/CrWinClexeGomaGCEStaging"
     category: "gce"
   }
+  builders: {
+    name: "buildbot/chromium.goma/Chromium Linux Goma RBE Staging"
+    category: "rbe"
+  }
 }
 
 consoles: {
@@ -2699,39 +2760,49 @@ consoles: {
     short_name: "tsn"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (NVIDIA Shield TV)"
-    category: "Android"
-    short_name: "nvi"
-  }
-  builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5)"
-    category: "Android"
+    category: "Android|L32"
     short_name: "N5"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5X)"
-    category: "Android"
-    short_name: "N5X"
-  }
-  builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6)"
-    category: "Android"
+    category: "Android|L32"
     short_name: "N6"
   }
   builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5X)"
+    category: "Android|M64|QCOM"
+    short_name: "N5X"
+  }
+  builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6P)"
-    category: "Android"
+    category: "Android|M64|QCOM"
     short_name: "N6P"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 9)"
-    category: "Android"
+    category: "Android|M64|NVDA"
     short_name: "N9"
   }
   builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI Release (NVIDIA Shield TV)"
+    category: "Android|N64|NVDA"
+    short_name: "STV"
+  }
+  builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI dEQP Release (Nexus 5X)"
-    category: "Android"
-    short_name: "dqp"
+    category: "Android|dqp|M64"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI 32 Vk Release (Nexus 5X)"
+    category: "Android|vk|O32"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI 64 Vk Release (Nexus 5X)"
+    category: "Android|vk|O64"
+    short_name: "N5X"
   }
 }
 
@@ -2921,32 +2992,24 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/chromium.perf.fyi/Android Builder FYI"
+    name: "buildbot/chromium.perf.fyi/Android Builder Perf FYI"
     category: "android"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Android arm64 Builder FYI"
+    name: "buildbot/chromium.perf.fyi/Android arm64 Builder Perf FYI"
     category: "android"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Linux Compile FYI"
+    name: "buildbot/chromium.perf.fyi/Linux Compile Perf FYI"
     category: "linux"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Android Nexus 5X Perf FYI"
-    category: "android"
+    name: "buildbot/chromium.perf.fyi/Mac Builder Perf FYI"
+    category: "mac"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Battor Agent Linux"
-    category: "battor"
-  }
-  builders: {
-    name: "buildbot/chromium.perf.fyi/Battor Agent Mac"
-    category: "battor"
-  }
-  builders: {
-    name: "buildbot/chromium.perf.fyi/Battor Agent Win"
-    category: "battor"
+    name: "buildbot/chromium.perf.fyi/Android Nexus 5X Perf FYI"
+    category: "android"
   }
   builders: {
     name: "buildbot/chromium.perf.fyi/Mojo Linux Perf"
@@ -2960,6 +3023,18 @@ consoles: {
     name: "buildbot/chromium.perf.fyi/One Buildbot Step Test Builder"
     category: "linux"
   }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/Mac 10.12 Laptop Low End"
+    category: "mac"
+  }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/Mac 10.13 Laptop High End"
+    category: "mac"
+  }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/Android Go"
+    category: "android"
+  }
 }
 
 consoles: {
@@ -3659,7 +3734,7 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_chromeos_msan_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_chromium_clobber_deterministic"
+    name: "buildbucket/luci.chromium.try/linux_chromium_clobber_deterministic"
   }
   builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_clobber_rel_ng"
@@ -3704,6 +3779,9 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_ubsan_rel_ng"
   }
   builders: {
+    name: "buildbot/tryserver.chromium.linux/linux-gcc-rel"
+  }
+  builders: {
     name: "buildbot/tryserver.chromium.linux/layout_test_leak_detection"
   }
   builders: {
@@ -3777,6 +3855,9 @@ consoles: {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_10.12_rel_ng"
   }
   builders: {
+    name: "buildbot/tryserver.chromium.mac/mac_chromium_10.13_rel_ng"
+  }
+  builders: {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_archive_rel_ng"
   }
   builders: {
@@ -3856,22 +3937,22 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Android Compile"
+    name: "buildbot/tryserver.chromium.perf/Android Compile Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Android arm64 Compile"
+    name: "buildbot/tryserver.chromium.perf/Android arm64 Compile Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Linux Builder"
+    name: "buildbot/tryserver.chromium.perf/Linux Builder Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Mac Builder"
+    name: "buildbot/tryserver.chromium.perf/Mac Builder Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Win Builder"
+    name: "buildbot/tryserver.chromium.perf/Win Builder Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Win x64 Builder"
+    name: "buildbot/tryserver.chromium.perf/Win x64 Builder Perf"
   }
   builders: {
     name: "buildbot/tryserver.chromium.perf/linux_fyi_perf_bisect"
@@ -3932,9 +4013,6 @@ consoles: {
     name: "buildbot/tryserver.chromium.win/win_chromium_gn_upload"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.win/win_chromium_syzyasan_rel"
-  }
-  builders: {
     name: "buildbot/tryserver.chromium.win/win_chromium_variable"
   }
   builders: {
diff --git a/chromium/infra/config/global/luci-milo.cfg b/chromium/infra/config/global/luci-milo.cfg
index f4d28104965..3db95530643 100644
--- a/chromium/infra/config/global/luci-milo.cfg
+++ b/chromium/infra/config/global/luci-milo.cfg
@@ -11,12 +11,8 @@ headers: {
     url: "https://build.chromium.org/p/chromium/sheriff_android.json"
   }
   oncalls: {
-    name: "iOS US"
-    url: "https://build.chromium.org/p/chromium/sheriff_ios_us.json"
-  }
-  oncalls: {
-    name: "iOS EU"
-    url: "https://build.chromium.org/p/chromium/sheriff_ios_europe.json"
+    name: "iOS"
+    url: "https://build.chromium.org/p/chromium/sheriff_ios.json"
   }
   oncalls: {
     name: "CrOS MTV"
@@ -274,6 +270,7 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.win/Win Builder"
+    name: "buildbucket/luci.chromium.ci/Win Builder"
     category: "chromium.win|release|builder"
     short_name: "32"
   }
@@ -284,11 +281,13 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.win/Win7 (32) Tests"
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
     category: "chromium.win|release|tester"
     short_name: "32"
   }
   builders: {
     name: "buildbot/chromium.win/Win7 Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Win7 Tests(1)"
     category: "chromium.win|release|tester"
     short_name: "32"
   }
@@ -298,6 +297,11 @@ consoles: {
     short_name: "64"
   }
   builders: {
+    name: "buildbot/chromium.win/Win10 Tests x64"
+    category: "chromium.win|release|tester"
+    short_name: "w10"
+  }
+  builders: {
     name: "buildbot/chromium.win/WinMSVC64"
     category: "chromium.win|release|tester"
     short_name: "mvc"
@@ -320,9 +324,9 @@ consoles: {
     short_name: "7"
   }
   builders: {
-    name: "buildbot/chromium.win/Win10 Tests x64"
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 (dbg)"
     category: "chromium.win|debug|tester"
-    short_name: "w10"
+    short_name: "10"
   }
   builders: {
     name: "buildbot/chromium.win/WinMSVC64 (dbg)"
@@ -331,41 +335,39 @@ consoles: {
   }
 
   builders: {
-    name: "buildbot/chromium.mac/Mac Builder"
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
     category: "chromium.mac|release"
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests"
-    category: "chromium.mac|release|tester"
-    short_name: "9"
-  }
-  builders: {
-    name: "buildbot/chromium.mac/Mac10.10 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
     category: "chromium.mac|release|tester"
     short_name: "10"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
     category: "chromium.mac|release|tester"
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
     category: "chromium.mac|release|tester"
     short_name: "12"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
+    category: "chromium.mac|release|tester"
+    short_name: "13"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "chromium.mac|debug"
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests (dbg)"
-    name: "buildbucket/luci.chromium.ci/Mac10.9 Tests (dbg)"
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests (dbg)"
     category: "chromium.mac|debug"
-    short_name: "9"
+    short_name: "13"
   }
   builders: {
     name: "buildbot/chromium.mac/ios-device"
@@ -394,41 +396,48 @@ consoles: {
   }
 
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder"
     name: "buildbucket/luci.chromium.ci/Linux Builder"
     category: "chromium.linux|release"
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests"
     name: "buildbucket/luci.chromium.ci/Linux Tests"
     category: "chromium.linux|release"
     short_name: "tst"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder (dbg)(32)"
+    name: "buildbot/chromium.linux/linux-gcc-rel"
+    category: "chromium.linux|release"
+    short_name: "gcc"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "chromium.linux|debug|builder"
     short_name: "32"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder (dbg)"
     name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
     category: "chromium.linux|debug|builder"
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)(32)"
+    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
     category: "chromium.linux|debug|tester"
     short_name: "32"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)"
     name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
     category: "chromium.linux|debug|tester"
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Deterministic Linux"
+    name: "buildbot/chromium.fyi/Linux deterministic (dbg)"
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
+    category: "chromium.linux|debug"
+    short_name: "det"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
     category: "chromium.linux"
     short_name: "det"
   }
@@ -450,21 +459,24 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.linux/Fuchsia ARM64 Cast Audio"
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64 Cast Audio"
     category: "chromium.linux|fuchsia|Cast"
     short_name: "a64"
   }
   builders: {
     name: "buildbot/chromium.linux/Fuchsia x64 Cast Audio"
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64 Cast Audio"
     category: "chromium.linux|fuchsia|Cast"
     short_name: "x64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
     category: "chromium.linux|fuchsia"
     short_name: "a64"
   }
   builders: {
     name: "buildbot/chromium.linux/Fuchsia x64"
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
     category: "chromium.linux|fuchsia"
     short_name: "x64"
   }
@@ -523,26 +535,31 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.memory/Linux TSan Builder"
+    name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux TSan Tests"
+    name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
     category: "chromium.memory|linux|TSan v2"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
     category: "chromium.memory|linux|asan lsan"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
   }
@@ -643,9 +660,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "chromium.webkit|mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"
@@ -660,6 +677,7 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.11 (dbg)"
+    name: "buildbot/luci.chromium.ci/WebKit Mac10.11 (dbg)"
     category: "chromium.webkit|mac|debug"
     short_name: "11"
   }
@@ -711,6 +729,7 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.win/Win Builder"
+    name: "buildbucket/luci.chromium.ci/Win Builder"
     category: "release|builder"
     short_name: "32"
   }
@@ -721,11 +740,13 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.win/Win7 (32) Tests"
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
     category: "release|tester"
     short_name: "32"
   }
   builders: {
     name: "buildbot/chromium.win/Win7 Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
     category: "release|tester"
     short_name: "32"
   }
@@ -740,7 +761,13 @@ consoles: {
     short_name: "mvc"
   }
   builders: {
+    name: "buildbot/chromium.win/Win10 Tests x64"
+    category: "release|tester"
+    short_name: "w10"
+  }
+  builders: {
     name: "buildbot/chromium.win/Win x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/Win x64 Builder (dbg)"
     category: "debug|builder"
     short_name: "64"
   }
@@ -757,9 +784,9 @@ consoles: {
     short_name: "7"
   }
   builders: {
-    name: "buildbot/chromium.win/Win10 Tests x64"
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 (dbg)"
     category: "debug|tester"
-    short_name: "w10"
+    short_name: "10"
   }
   builders: {
     name: "buildbot/chromium.win/WinMSVC64 (dbg)"
@@ -777,41 +804,39 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/chromium.mac/Mac Builder"
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
     category: "release"
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests"
-    category: "release|tester"
-    short_name: "9"
-  }
-  builders: {
-    name: "buildbot/chromium.mac/Mac10.10 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
     category: "release|tester"
     short_name: "10"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
     category: "release|tester"
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
     category: "release|tester"
     short_name: "12"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
+    category: "release|tester"
+    short_name: "13"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
     category: "debug"
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests (dbg)"
-    name: "buildbucket/luci.chromium.ci/Mac10.9 Tests (dbg)"
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests (dbg)"
     category: "debug"
-    short_name: "9"
+    short_name: "13"
   }
   builders: {
     name: "buildbot/chromium.mac/ios-device"
@@ -855,13 +880,22 @@ consoles: {
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests"
+    name: "buildbot/chromium.linux/linux-gcc-rel"
+    category: "release"
+    short_name: "gcc"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/linux64-jumbo-rel"
+    category: "jumbo"
+    short_name: "jumbo"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.ci/Linux Tests"
     category: "release"
     short_name: "tst"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder (dbg)(32)"
+    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
     category: "debug|builder"
     short_name: "32"
   }
@@ -872,18 +906,17 @@ consoles: {
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)(32)"
+    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)(32)"
     category: "debug|tester"
     short_name: "32"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)"
     name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
     category: "debug|tester"
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Deterministic Linux"
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
     short_name: "det"
   }
   builders: {
@@ -903,21 +936,24 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.linux/Fuchsia ARM64 Cast Audio"
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64 Cast Audio"
     category: "fuchsia|Cast"
     short_name: "a64"
   }
   builders: {
     name: "buildbot/chromium.linux/Fuchsia x64 Cast Audio"
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64 Cast Audio"
     category: "fuchsia|Cast"
     short_name: "x64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Fuchsia ARM64"
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
     category: "fuchsia"
     short_name: "a64"
   }
   builders: {
     name: "buildbot/chromium.linux/Fuchsia x64"
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
     category: "fuchsia"
     short_name: "x64"
   }
@@ -998,27 +1034,37 @@ consoles: {
   header_id: "chromium"
 
   builders: {
+    name: "buildbot/chromium.memory/Android CFI"
+    category: "android"
+    short_name: "cfi"
+  }
+  builders: {
     name: "buildbot/chromium.memory/Linux TSan Builder"
+    name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
     category: "linux|TSan v2"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux TSan Tests"
+    name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
     category: "linux|TSan v2"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux ASan LSan Builder"
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
     category: "linux|asan lsan"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux ASan LSan Tests (1)"
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
     category: "linux|asan lsan"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.memory/Linux ASan Tests (sandboxed)"
+    name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
     category: "linux|asan lsan"
     short_name: "sbx"
   }
@@ -1128,9 +1174,9 @@ consoles: {
     short_name: "11"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac10.11 (retina)"
+    name: "buildbot/chromium.webkit/WebKit Mac10.12 (retina)"
     category: "mac|release"
-    short_name: "11r"
+    short_name: "12r"
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.12"
@@ -1145,6 +1191,7 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.webkit/WebKit Mac10.11 (dbg)"
+    name: "buildbot/luci.chromium.ci/WebKit Mac10.11 (dbg)"
     category: "mac|debug"
     short_name: "11"
   }
@@ -1195,42 +1242,42 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/chromium.perf/Android Builder"
+    name: "buildbot/chromium.perf/Android Builder Perf"
     category: "builder|android"
     short_name: "arm"
   }
   builders: {
-    name: "buildbot/chromium.perf/Android arm64 Builder"
+    name: "buildbot/chromium.perf/Android arm64 Builder Perf"
     category: "builder|android"
     short_name: "a64"
   }
   builders: {
-    name: "buildbot/chromium.perf/Android Compile"
+    name: "buildbot/chromium.perf/Android Compile Perf"
     category: "builder|android|compile"
     short_name: "arm"
   }
   builders: {
-    name: "buildbot/chromium.perf/Android arm64 Compile"
+    name: "buildbot/chromium.perf/Android arm64 Compile Perf"
     category: "builder|android|compile"
     short_name: "a64"
   }
   builders: {
-    name: "buildbot/chromium.perf/Win Builder"
+    name: "buildbot/chromium.perf/Win Builder Perf"
     category: "builder|win"
     short_name: "32"
   }
   builders: {
-    name: "buildbot/chromium.perf/Win x64 Builder"
+    name: "buildbot/chromium.perf/Win x64 Builder Perf"
     category: "builder|win"
     short_name: "64"
   }
   builders: {
-    name: "buildbot/chromium.perf/Mac Builder"
+    name: "buildbot/chromium.perf/Mac Builder Perf"
     category: "builder"
     short_name: "mac"
   }
   builders: {
-    name: "buildbot/chromium.perf/Linux Builder"
+    name: "buildbot/chromium.perf/Linux Builder Perf"
     category: "builder"
     short_name: "lnx"
   }
@@ -1360,11 +1407,6 @@ consoles: {
     short_name: "med"
   }
   builders: {
-    name: "buildbot/chromium.lkgr/Win SyzyASAN LKGR"
-    category: "win asan"
-    short_name: "syz"
-  }
-  builders: {
     name: "buildbot/chromium.lkgr/Mac ASAN Debug"
     category: "mac asan"
     short_name: "dbg"
@@ -1477,125 +1519,364 @@ consoles: {
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/GPU Linux Builder"
-    category: "gpu|linux|release|builder"
-    short_name: "ᕕ(ᐛ)ᕗ"
+    name: "buildbucket/luci.chromium.ci/Fuchsia ARM64 Cast Audio"
+    category: "fuchsia|arm64|cast"
+    short_name: "ci"
   }
   builders: {
-    name: "buildbot/chromium.gpu/GPU Linux Builder"
-    category: "gpu|linux|release|builder"
-    short_name: "(ಥ_ಥ)"
+    name: "buildbot/chromium.linux/Fuchsia ARM64 Cast Audio"
+    category: "fuchsia|arm64|cast"
+    short_name: "bb"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
-    category: "linux|builder|debug|64"
-    short_name: "🦋"
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64"
+    category: "fuchsia|x64"
+    short_name: "ci"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder (dbg)"
-    category: "linux|builder|debug|64"
-    short_name: "🗑"
+    name: "buildbot/chromium.linux/Fuchsia x64"
+    category: "fuchsia|x64"
+    short_name: "bb"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
-    category: "linux|tester|debug|64"
-    short_name: "🦋"
+    name: "buildbucket/luci.chromium.ci/Fuchsia x64 Cast Audio"
+    category: "fuchsia|x64|cast"
+    short_name: "ci"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests (dbg)(1)"
-    category: "linux|tester|debug|64"
-    short_name: "🗑"
+    name: "buildbot/chromium.linux/Fuchsia x64 Cast Audio"
+    category: "fuchsia|x64|cast"
+    short_name: "bb"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Linux Builder"
-    category: "linux|builder|release|64"
+    name: "buildbucket/luci.chromium.ci/Win Builder"
+    category: "win|release|builder|32"
     short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Builder"
-    category: "linux|builder|release|64"
+    name: "buildbot/chromium.win/Win Builder"
+    category: "win|release|builder|32"
     short_name: "(ಥ_ಥ)"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Linux Tests"
-    category: "linux|tester|release|64"
+    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
+    category: "win|release|tester|7|(32)"
     short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.linux/Linux Tests"
-    category: "linux|tester|release|64"
+    name: "buildbot/chromium.win/Win7 (32) Tests"
+    category: "win|release|tester|7|(32)"
     short_name: "(ಥ_ಥ)"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Cast Linux"
-    category: "linux|cast"
-    short_name: "🦋"
+    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
+    category: "win|release|tester|7|(1)"
+    short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.linux/Cast Linux"
-    category: "linux|cast"
-    short_name: "🗑"
+    name: "buildbot/chromium.win/Win7 Tests (1)"
+    category: "win|release|tester|7|(1)"
+    short_name: "(ಥ_ಥ)"
   }
 
+  # GPU FYI Window bots, prefixed with GPU FYI|Windows
   builders: {
-    name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
-    category: "mac|debug|builder"
-    short_name: "ci"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder"
+    category: "GPU FYI|Windows|Builder|Release|x86"
+    short_name: "🏗️"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/GPU FYI Win Builder"
+    category: "GPU FYI|Windows|Builder|Release|x86"
+    short_name: "🚧"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder"
+    category: "GPU FYI|Windows|Builder|Release|x64"
+    short_name: "🏗️"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac Builder (dbg)"
-    category: "mac|debug|builder"
+    name: "buildbot/chromium.gpu.fyi/GPU FYI Win x64 Builder"
+    category: "GPU FYI|Windows|Builder|Release|x64"
+    short_name: "🚧"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win dEQP Builder"
+    category: "GPU FYI|Windows|Builder|dEQP|x86"
+    short_name: "🏗️"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/GPU FYI Win dEQP Builder"
+    category: "GPU FYI|Windows|Builder|dEQP|x86"
+    short_name: "🚧"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 dEQP Builder"
+    category: "GPU FYI|Windows|Builder|dEQP|x64"
+    short_name: "🏗️"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/GPU FYI Win x64 dEQP Builder"
+    category: "GPU FYI|Windows|Builder|dEQP|x64"
+    short_name: "🚧"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder (dbg)"
+    category: "GPU FYI|Windows|Builder|Debug|x86"
+    short_name: "🏗️"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/GPU FYI Win Builder (dbg)"
+    category: "GPU FYI|Windows|Builder|Debug|x86"
+    short_name: "🚧"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder (dbg)"
+    category: "GPU FYI|Windows|Builder|Debug|x64"
+    short_name: "🏗️"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/GPU FYI Win x64 Builder (dbg)"
+    category: "GPU FYI|Windows|Builder|Debug|x64"
+    short_name: "🚧"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Clang Builder (dbg)"
+    category: "GPU FYI|Windows|Builder|Clang|Debug|x86"
+    short_name: "🛠️"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/GPU FYI Win Clang Builder (dbg)"
+    category: "GPU FYI|Windows|Builder|Clang|Debug|x86"
+    short_name: "🚧"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Debug (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|Debug|x86"
+    short_name: "🏠"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win10 FYI Debug (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|Debug|x86"
+    short_name: "🏚️"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (Intel HD 630)"
+    category: "GPU FYI|Windows|10|Intel|Release|x86"
+    short_name: "🏠"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win10 FYI Release (Intel HD 630)"
+    category: "GPU FYI|Windows|10|Intel|Release|x86"
+    short_name: "🏚️"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|Release|x86"
+    short_name: "🏠"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win10 FYI Release (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|Release|x86"
+    short_name: "🏚️"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (AMD)"
+    category: "GPU FYI|Windows|7|AMD|Debug|x86"
+    short_name: "🐞"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI Debug (AMD)"
+    category: "GPU FYI|Windows|7|AMD|Debug|x86"
+    short_name: "🐛"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI dEQP Release (AMD)"
+    category: "GPU FYI|Windows|7|AMD|dEQP|x86"
+    short_name: "⛅"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI dEQP Release (AMD)"
+    category: "GPU FYI|Windows|7|AMD|dEQP|x86"
+    short_name: "🔥"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Release (AMD)"
+    category: "GPU FYI|Windows|7|AMD|Release|x86"
+    short_name: "🐈"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI Release (AMD)"
+    category: "GPU FYI|Windows|7|AMD|Release|x86"
+    short_name: "🧵"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Debug|x86"
+    short_name: "🐈"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI Debug (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Debug|x86"
+    short_name: "🧵"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Exp Release (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|Exp|x86"
+    short_name: "⚗️"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win10 FYI Exp Release (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|Exp|x86"
+    short_name: "🎆"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Release (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Release|x86"
+    short_name: "🐮"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI Release (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Release|x86"
+    short_name: "🥩"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI dEQP Release (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|dEQP|x86"
+    short_name: "🌞"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win10 FYI dEQP Release (NVIDIA)"
+    category: "GPU FYI|Windows|10|Nvidia|dEQP|x86"
+    short_name: "🔥"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Debug (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Debug|x64"
+    short_name: "🤖"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 Debug (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Debug|x64"
+    short_name: "🐵"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Release (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Release|x64"
+    short_name: "🤖"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 Release (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|Release|x64"
+    short_name: "🐵"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 dEQP Release (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|dEQP|x64"
+    short_name: "🌻"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 dEQP Release (NVIDIA)"
+    category: "GPU FYI|Windows|7|Nvidia|dEQP|x64"
+    short_name: "🔥"
+  }
+  builders: {
+    name: "buildbot/chromium.memory/Linux ASan LSan Builder"
+    category: "chromium.memory|asan|builder"
     short_name: "bb"
   }
-
   builders: {
-    name: "buildbucket/luci.chromium.ci/Mac10.9 Tests (dbg)"
-    category: "mac|debug|tester|10.9"
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
+    category: "chromium.memory|asan|builder"
     short_name: "ci"
   }
   builders: {
-    name: "buildbot/chromium.mac/Mac10.9 Tests (dbg)"
-    category: "mac|debug|tester|10.9"
+    name: "buildbot/chromium.memory/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|asan|tester"
     short_name: "bb"
   }
-
   builders: {
-    name: "buildbucket/luci.chromium.ci/WebKit Mac Builder (dbg)"
-    category: "mac|debug"
-    short_name: "yay"
+    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|asan|tester"
+    short_name: "ci"
   }
   builders: {
-    name: "buildbot/chromium.webkit/WebKit Mac Builder (dbg)"
-    category: "mac|debug"
-    short_name: "nay"
+    name: "buildbot/chromium.memory/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|asan|tester|sandbox"
+    short_name: "bb"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|asan|tester|sandbox"
+    short_name: "ci"
   }
 
   builders: {
-    name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
-    category: "win|debug|builder|32"
+    name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
+    category: "chromium.memory|tsan|builder"
     short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.win/Win Builder (dbg)"
-    category: "win|debug|builder|32"
+    name: "buildbot/chromium.memory/Linux TSan Builder"
+    category: "chromium.memory|tsan|builder"
     short_name: "(ಥ_ಥ)"
   }
-
   builders: {
-    name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
-    category: "win|debug|tester|7"
+    name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
+    category: "chromium.memory|tsan|tester"
     short_name: "ᕕ(ᐛ)ᕗ"
   }
   builders: {
-    name: "buildbot/chromium.win/Win7 Tests (dbg)(1)"
-    category: "win|debug|tester|7"
+    name: "buildbot/chromium.memory/Linux TSan Tests"
+    category: "chromium.memory|tsan|tester"
     short_name: "(ಥ_ಥ)"
   }
+
+  builders: {
+    name: "buildbot/chromium.fyi/Linux deterministic (dbg)"
+    category: "chromium.linux|debug"
+    short_name: "bb"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
+    category: "chromium.linux|debug"
+    short_name: "ci"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Android deterministic"
+    category: "chromium.android|release"
+    short_name: "bb"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android"
+    category: "chromium.android|release"
+    short_name: "ci"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Android deterministic (dbg)"
+    category: "chromium.android|debug"
+    short_name: "bb"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Deterministic Android (dbg)"
+    category: "chromium.android|debug"
+    short_name: "ci"
+  }
+  builders: {
+    name: "buildbot/chromium.mac/ios-simulator"
+    category: "chromium.mac|ios-simulator"
+    short_name: "bb"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/ios-simulator"
+    category: "chromium.mac|ios-simulator"
+    short_name: "ci"
+  }
 }
 
 # Everything below was generated from buildermap.json.
@@ -1707,15 +1988,29 @@ consoles: {
   }
   builders: {
     name: "buildbot/chromium.android/Android x86 Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/Android x86 Builder (dbg)"
     category: "builder|x86"
     short_name: "32"
   }
   builders: {
     name: "buildbot/chromium.android/Android x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/Android x64 Builder (dbg)"
     category: "builder|x86"
     short_name: "64"
   }
   builders: {
+    name: "buildbot/chromium.fyi/Android deterministic"
+    name: "buildbucket/luci.chromium.ci/Deterministic Android"
+    category: "builder|det"
+    short_name: "rel"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Android deterministic (dbg)"
+    name: "buildbucket/luci.chromium.ci/Deterministic Android (dbg)"
+    category: "builder|det"
+    short_name: "dbg"
+  }
+  builders: {
     name: "buildbot/chromium.android/KitKat Phone Tester (dbg)"
     category: "tester|phone"
     short_name: "K"
@@ -2029,6 +2324,11 @@ consoles: {
     short_name: "lto"
   }
   builders: {
+    name: "buildbot/chromium.clang/ToTWinLibcxx64"
+    category: "ToT Windows|x64"
+    short_name: "cxx"
+  }
+  builders: {
     name: "buildbot/chromium.clang/CrWinClangLLD"
     category: "ToT Windows|LLD"
     short_name: "rel"
@@ -2134,6 +2434,70 @@ consoles: {
 }
 
 consoles: {
+  id: "chromium.fyi.goma"
+  name: "chromium.fyi.goma"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  ref: "refs/heads/master"
+  manifest_name: "REVISION"
+  header_id: "chromium"
+
+  builders: {
+    name: "buildbot/chromium.fyi/Win Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win cl.exe Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win7 Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Win7 Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/WinMSVC64 Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Goma Canary (clobber)"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Builder (dbg) Goma Canary (clobber)"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Mac Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/chromeos-amd64-generic-rel-goma-canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Linux Builder Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Linux x64 Goma Canary (clobber)"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Linux x64 Goma Canary LocalOutputCache"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/Android Builder (dbg) Goma Canary"
+  }
+  builders: {
+    name: "buildbot/chromium.fyi/ios-device-goma-canary-clobber"
+  }
+}
+
+consoles: {
   id: "chromium.fyi"
   name: "chromium.fyi"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -2198,7 +2562,7 @@ consoles: {
     category: "cronet"
   }
   builders: {
-    name: "buildbot/chromium.fyi/Chromium Mac 10.10 MacViews"
+    name: "buildbot/chromium.fyi/mac-views-rel"
     category: "default"
   }
   builders: {
@@ -2343,11 +2707,16 @@ consoles: {
     short_name: "IM"
   }
   builders: {
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-verification"
+    category: "linux|blink"
+    short_name: "VF"
+  }
+  builders: {
     name: "buildbot/chromium.fyi/Linux ARM"
     category: "linux"
   }
   builders: {
-    name: "buildbot/chromium.fyi/linux-gcc-rel"
+    name: "buildbot/chromium.fyi/linux-annotator-rel"
     category: "linux"
   }
   builders: {
@@ -2492,6 +2861,10 @@ consoles: {
     name: "buildbot/chromium.goma/CrWinClexeGomaGCEStaging"
     category: "gce"
   }
+  builders: {
+    name: "buildbot/chromium.goma/Chromium Linux Goma RBE Staging"
+    category: "rbe"
+  }
 }
 
 consoles: {
@@ -2519,27 +2892,27 @@ consoles: {
     category: "Windows"
   }
   builders: {
-    name: "buildbot/chromium.gpu/GPU Mac Builder"
+    name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
     category: "Mac"
   }
   builders: {
-    name: "buildbot/chromium.gpu/GPU Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/GPU Mac Builder (dbg)"
     category: "Mac"
   }
   builders: {
-    name: "buildbot/chromium.gpu/Mac Debug (Intel)"
+    name: "buildbucket/luci.chromium.ci/Mac Debug (Intel)"
     category: "Mac"
   }
   builders: {
-    name: "buildbot/chromium.gpu/Mac Release (Intel)"
+    name: "buildbucket/luci.chromium.ci/Mac Release (Intel)"
     category: "Mac"
   }
   builders: {
-    name: "buildbot/chromium.gpu/Mac Retina Debug (AMD)"
+    name: "buildbucket/luci.chromium.ci/Mac Retina Debug (AMD)"
     category: "Mac"
   }
   builders: {
-    name: "buildbot/chromium.gpu/Mac Retina Release (AMD)"
+    name: "buildbucket/luci.chromium.ci/Mac Retina Release (AMD)"
     category: "Mac"
   }
   builders: {
@@ -2576,273 +2949,303 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.gpu.fyi/GPU FYI Win Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder"
     category: "Windows|Builder"
     short_name: "x86"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/GPU FYI Win x64 Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder"
     category: "Windows|Builder"
     short_name: "x64"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/GPU FYI Win dEQP Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win dEQP Builder"
     category: "Windows|Builder|dEQP"
     short_name: "x86"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/GPU FYI Win x64 dEQP Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 dEQP Builder"
     category: "Windows|Builder|dEQP"
     short_name: "x64"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/GPU FYI Win Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Builder (dbg)"
     category: "Windows|Builder|Debug"
     short_name: "x86"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/GPU FYI Win x64 Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win x64 Builder (dbg)"
     category: "Windows|Builder|Debug"
     short_name: "x64"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/GPU FYI Win Clang Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Win Clang Builder (dbg)"
     category: "Windows|Builder|Debug"
     short_name: "clg"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win10 FYI Debug (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Debug (NVIDIA)"
     category: "Windows|10"
     short_name: "nvi"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win10 FYI Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (Intel HD 630)"
     category: "Windows|10|Release"
     short_name: "int"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win10 FYI Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (NVIDIA)"
     category: "Windows|10|Release"
     short_name: "nvi"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI Debug (AMD)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (AMD)"
     category: "Windows|7|AMD"
     short_name: "dbg"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI dEQP Release (AMD)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI dEQP Release (AMD)"
     category: "Windows|7|AMD"
     short_name: "dqp"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI Release (AMD)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Release (AMD)"
     category: "Windows|7|AMD"
     short_name: "rel"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI Debug (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (NVIDIA)"
     category: "Windows|7|Nvidia"
     short_name: "dbg"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win10 FYI Exp Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Exp Release (NVIDIA)"
     category: "Windows|10|Nvidia"
     short_name: "exp"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI Release (NVIDIA)"
     category: "Windows|7|Nvidia"
     short_name: "rel"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win10 FYI dEQP Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI dEQP Release (NVIDIA)"
     category: "Windows|10|Nvidia"
     short_name: "dqp"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 Debug (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Debug (NVIDIA)"
     category: "Windows|7|Nvidia|x64"
     short_name: "dbg"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Release (NVIDIA)"
     category: "Windows|7|Nvidia|x64"
     short_name: "rel"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Win7 FYI x64 dEQP Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Win7 FYI x64 dEQP Release (NVIDIA)"
     category: "Windows|7|Nvidia|x64"
     short_name: "dqp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/GPU FYI Mac Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder"
     category: "Mac|Builder"
     short_name: "rel"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/GPU FYI Mac Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac Builder (dbg)"
     category: "Mac|Builder"
     short_name: "dbg"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/GPU FYI Mac dEQP Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Mac dEQP Builder"
     category: "Mac|Builder"
     short_name: "dqp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Debug (Intel)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Debug (Intel)"
     category: "Mac|Intel"
     short_name: "dbg"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Experimental Release (Intel)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Release (Intel)"
     category: "Mac|Intel"
     short_name: "exp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI dEQP Release Intel"
+    name: "buildbucket/luci.chromium.ci/Mac FYI dEQP Release Intel"
     category: "Mac|Intel"
     short_name: "dqp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Release (Intel)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Release (Intel)"
     category: "Mac|Intel"
     short_name: "rel"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac Pro FYI Release (AMD)"
+    name: "buildbucket/luci.chromium.ci/Mac Pro FYI Release (AMD)"
     category: "Mac|AMD|Pro"
     short_name: "rel"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI dEQP Release AMD"
+    name: "buildbucket/luci.chromium.ci/Mac FYI dEQP Release AMD"
     category: "Mac|AMD"
     short_name: "dqp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Retina Debug (AMD)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Debug (AMD)"
     category: "Mac|AMD|Retina"
     short_name: "dbg"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Retina Release (AMD)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Release (AMD)"
     category: "Mac|AMD|Retina"
     short_name: "rel"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Experimental Retina Release (AMD)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (AMD)"
     category: "Mac|AMD|Retina"
     short_name: "exp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Retina Debug (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Debug (NVIDIA)"
     category: "Mac|Nvidia"
     short_name: "dbg"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Retina Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Retina Release (NVIDIA)"
     category: "Mac|Nvidia"
     short_name: "rel"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI Experimental Retina Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (NVIDIA)"
     category: "Mac|Nvidia"
     short_name: "exp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Mac FYI GPU ASAN Release"
+    name: "buildbucket/luci.chromium.ci/Mac FYI GPU ASAN Release"
     category: "Mac"
     short_name: "asn"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/GPU FYI Linux Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder"
     category: "Linux|Builder"
     short_name: "rel"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/GPU FYI Linux Builder (dbg)"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Builder (dbg)"
     category: "Linux|Builder"
     short_name: "dbg"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/GPU FYI Linux Ozone Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux Ozone Builder"
     category: "Linux|Builder"
     short_name: "ozn"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/GPU FYI Linux dEQP Builder"
+    name: "buildbucket/luci.chromium.ci/GPU FYI Linux dEQP Builder"
     category: "Linux|Builder"
     short_name: "dqp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Linux FYI Release (Intel HD 630)"
+    name: "buildbucket/luci.chromium.ci/Linux FYI Release (Intel HD 630)"
     category: "Linux|Intel"
     short_name: "630"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Linux FYI Ozone (Intel)"
+    name: "buildbucket/luci.chromium.ci/Linux FYI Ozone (Intel)"
     category: "Linux|Intel"
     short_name: "ozn"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Linux FYI Release (AMD R7 240)"
+    name: "buildbucket/luci.chromium.ci/Linux FYI Release (AMD R7 240)"
     category: "Linux"
     short_name: "amd"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Linux FYI Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Linux FYI Release (NVIDIA)"
     category: "Linux|Nvidia"
     short_name: "rel"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Linux FYI Debug (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Linux FYI Debug (NVIDIA)"
     category: "Linux|Nvidia"
     short_name: "dbg"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Linux FYI dEQP Release (NVIDIA)"
+    name: "buildbucket/luci.chromium.ci/Linux FYI dEQP Release (NVIDIA)"
     category: "Linux|Nvidia"
     short_name: "dqp"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Linux FYI GPU TSAN Release"
+    name: "buildbucket/luci.chromium.ci/Linux FYI GPU TSAN Release"
     category: "Linux"
     short_name: "tsn"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (NVIDIA Shield TV)"
-    category: "Android"
-    short_name: "nvi"
-  }
-  builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5)"
-    category: "Android"
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 5)"
+    category: "Android|L32"
     short_name: "N5"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5X)"
-    category: "Android"
-    short_name: "N5X"
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6)"
+    category: "Android|L32"
+    short_name: "N6"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6)"
-    category: "Android"
-    short_name: "N6"
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 5X)"
+    category: "Android|M64|QCOM"
+    short_name: "N5X"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6P)"
-    category: "Android"
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6P)"
+    category: "Android|M64|QCOM"
     short_name: "N6P"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 9)"
-    category: "Android"
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 9)"
+    category: "Android|M64|NVDA"
     short_name: "N9"
   }
   builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI dEQP Release (Nexus 5X)"
-    category: "Android"
-    short_name: "dqp"
+    name: "buildbucket/luci.chromium.ci/Android FYI Release (NVIDIA Shield TV)"
+    category: "Android|N64|NVDA"
+    short_name: "STV"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Android FYI dEQP Release (Nexus 5X)"
+    category: "Android|dqp|M64"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Android FYI 32 Vk Release (Nexus 5X)"
+    category: "Android|vk|O32"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Android FYI 64 Vk Release (Nexus 5X)"
+    category: "Android|vk|O64"
+    short_name: "N5X"
   }
 }
 
@@ -2906,6 +3309,9 @@ consoles: {
     name: "buildbot/chromium.infra/infra-continuous-win-64"
   }
   builders: {
+    name: "buildbucket/luci.infra.ci/infra-continuous-win7-64"
+  }
+  builders: {
     name: "buildbot/chromium.infra/infra-continuous-xenial-64"
   }
   builders: {
@@ -2915,9 +3321,15 @@ consoles: {
     name: "buildbot/chromium.infra/infra-continuous-zesty-64"
   }
   builders: {
+    name: "buildbucket/luci.infra.ci/luci-check"
+  }
+  builders: {
     name: "buildbot/chromium.infra/luci-gae-trusty64"
   }
   builders: {
+    name: "buildbucket/luci.infra.ci/luci-go-continuous-mac-10.13-64"
+  }
+  builders: {
     name: "buildbot/chromium.infra/luci-go-osx"
   }
   builders: {
@@ -2927,9 +3339,27 @@ consoles: {
     name: "buildbot/chromium.infra/luci-go-trusty64"
   }
   builders: {
+    name: "buildbucket/luci.infra.ci/luci-go-continuous-xenial-64"
+  }
+  builders: {
+    name: "buildbucket/luci.infra.ci/luci-gae-continuous-trusty-64"
+  }
+  builders: {
+    name: "buildbucket/luci.infra.ci/luci-go-continuous-trusty-32"
+  }
+  builders: {
     name: "buildbot/chromium.infra/luci-go-win64"
   }
   builders: {
+    name: "buildbucket/luci.infra.ci/infra-continuous-win7-32"
+  }
+  builders: {
+    name: "buildbucket/luci.infra.ci/luci-go-continuous-win10-64"
+  }
+  builders: {
+    name: "buildbucket/luci.infra.ci/infra-continuous-win10-64"
+  }
+  builders: {
     name: "buildbot/chromium.infra/recipe_engine-recipes-tests"
   }
   builders: {
@@ -3032,32 +3462,28 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/chromium.perf.fyi/Android Builder FYI"
+    name: "buildbot/chromium.perf.fyi/Android Builder Perf FYI"
     category: "android"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Android arm64 Builder FYI"
+    name: "buildbot/chromium.perf.fyi/Android arm64 Builder Perf FYI"
     category: "android"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Linux Compile FYI"
-    category: "linux"
-  }
-  builders: {
-    name: "buildbot/chromium.perf.fyi/Android Nexus 5X Perf FYI"
+    name: "buildbot/chromium.perf.fyi/Android CFI Builder Perf FYI"
     category: "android"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Battor Agent Linux"
-    category: "battor"
+    name: "buildbot/chromium.perf.fyi/Android CFI arm64 Builder Perf FYI"
+    category: "android"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Battor Agent Mac"
-    category: "battor"
+    name: "buildbot/chromium.perf.fyi/Linux Compile Perf FYI"
+    category: "linux"
   }
   builders: {
-    name: "buildbot/chromium.perf.fyi/Battor Agent Win"
-    category: "battor"
+    name: "buildbot/chromium.perf.fyi/Android Nexus 5X Perf FYI"
+    category: "android"
   }
   builders: {
     name: "buildbot/chromium.perf.fyi/Mojo Linux Perf"
@@ -3071,6 +3497,22 @@ consoles: {
     name: "buildbot/chromium.perf.fyi/One Buildbot Step Test Builder"
     category: "linux"
   }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/Mac 10.12 Laptop Low End"
+    category: "mac"
+  }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/Mac 10.13 Laptop High End"
+    category: "mac"
+  }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/Mac Builder Perf FYI"
+    category: "mac"
+  }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/Android Go"
+    category: "android"
+  }
 }
 
 consoles: {
@@ -3088,6 +3530,9 @@ consoles: {
     name: "buildbot/chromium.swarm/Android N5X Swarm"
   }
   builders: {
+    name: "buildbot/chromium.swarm/ChromeOS Swarm"
+  }
+  builders: {
     name: "buildbot/chromium.swarm/Heartbeat"
   }
   builders: {
@@ -3510,6 +3955,10 @@ consoles: {
   header_id: "chromiumos"
 
   builders: {
+    name: "buildbot/chromiumos.chromium/amd64-generic-goma-canary-chromium-pfq-informational"
+    category: "goma"
+  }
+  builders: {
     name: "buildbot/chromiumos.chromium/amd64-generic-telemetry"
     category: "chromiumos perf"
   }
@@ -3545,6 +3994,9 @@ consoles: {
     name: "buildbot/tryserver.chromium.android/android_blink_rel"
   }
   builders: {
+    name: "buildbot/tryserver.chromium.android/android_cfi_rel_ng"
+  }
+  builders: {
     name: "buildbot/tryserver.chromium.android/android_chromium_variable"
   }
   builders: {
@@ -3599,7 +4051,7 @@ consoles: {
     name: "buildbot/tryserver.chromium.android/android_n5x_swarming_rel"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.android/android_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"
   }
   builders: {
     name: "buildbot/tryserver.chromium.android/android_unswarmed_n5_rel"
@@ -3627,34 +4079,34 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/tryserver.chromium.angle/android_angle_deqp_rel_ng"
+    name: "buildbucket/luci.chromium.try/android_angle_deqp_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/android_angle_rel_ng"
+    name: "buildbucket/luci.chromium.try/android_angle_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/linux_angle_compile_dbg_ng"
+    name: "buildbucket/luci.chromium.try/linux_angle_compile_dbg_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/linux_angle_dbg_ng"
+    name: "buildbucket/luci.chromium.try/linux_angle_dbg_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/linux_angle_deqp_rel_ng"
+    name: "buildbucket/luci.chromium.try/linux_angle_deqp_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/linux_angle_ozone_rel_ng"
+    name: "buildbucket/luci.chromium.try/linux_angle_ozone_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/linux_angle_rel_ng"
+    name: "buildbucket/luci.chromium.try/linux_angle_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/mac_angle_dbg_ng"
+    name: "buildbucket/luci.chromium.try/mac_angle_dbg_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/mac_angle_compile_dbg_ng"
+    name: "buildbucket/luci.chromium.try/mac_angle_compile_dbg_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.angle/mac_angle_rel_ng"
+    name: "buildbucket/luci.chromium.try/mac_angle_rel_ng"
   }
   builders: {
     name: "buildbot/tryserver.chromium.angle/win_angle_compile_dbg_ng"
@@ -3731,7 +4183,7 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/closure_compilation"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/fuchsia_arm64"
+    name: "buildbucket/luci.chromium.try/fuchsia_arm64"
   }
   builders: {
     name: "buildbot/tryserver.chromium.linux/fuchsia_arm64_cast_audio"
@@ -3770,30 +4222,18 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_chromeos_msan_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_chromium_clobber_deterministic"
-  }
-  builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_clobber_rel_ng"
   }
   builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_compile_dbg_32_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_chromium_compile_dbg_ng"
-  }
-  builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_chromium_compile_rel_ng"
-  }
-  builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_component_updater"
   }
   builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_dbg_32_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_chromium_dbg_ng"
-  }
-  builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_gn_upload"
   }
   builders: {
@@ -3806,15 +4246,15 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_ozone_compile_only_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_chromium_rel_ng"
-  }
-  builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_tsan_rel_ng"
   }
   builders: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_ubsan_rel_ng"
   }
   builders: {
+    name: "buildbot/tryserver.chromium.linux/linux-gcc-rel"
+  }
+  builders: {
     name: "buildbot/tryserver.chromium.linux/layout_test_leak_detection"
   }
   builders: {
@@ -3839,7 +4279,7 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/linux_nacl_sdk_build"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium.try/linux_optional_gpu_tests_rel"
   }
   builders: {
     name: "buildbot/tryserver.chromium.linux/linux_site_isolation"
@@ -3888,6 +4328,9 @@ consoles: {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_10.12_rel_ng"
   }
   builders: {
+    name: "buildbot/tryserver.chromium.mac/mac_chromium_10.13_rel_ng"
+  }
+  builders: {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_archive_rel_ng"
   }
   builders: {
@@ -3951,7 +4394,7 @@ consoles: {
     name: "buildbot/tryserver.chromium.mac/mac_nacl_sdk_build"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.mac/mac_optional_gpu_tests_rel"
+    name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
   }
   builders: {
     name: "buildbot/tryserver.chromium.mac/mac_upload_clang"
@@ -3967,22 +4410,22 @@ consoles: {
   header_id: "chromium"
 
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Android Compile"
+    name: "buildbot/tryserver.chromium.perf/Android Compile Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Android arm64 Compile"
+    name: "buildbot/tryserver.chromium.perf/Android arm64 Compile Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Linux Builder"
+    name: "buildbot/tryserver.chromium.perf/Linux Builder Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Mac Builder"
+    name: "buildbot/tryserver.chromium.perf/Mac Builder Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Win Builder"
+    name: "buildbot/tryserver.chromium.perf/Win Builder Perf"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.perf/Win x64 Builder"
+    name: "buildbot/tryserver.chromium.perf/Win x64 Builder Perf"
   }
   builders: {
     name: "buildbot/tryserver.chromium.perf/linux_fyi_perf_bisect"
@@ -4016,6 +4459,9 @@ consoles: {
     name: "buildbot/tryserver.chromium.win/win-msvc-rel"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/win10_chromium_x64_dbg_ng"
+  }
+  builders: {
     name: "buildbot/tryserver.chromium.win/win10_chromium_x64_rel_ng"
   }
   builders: {
@@ -4043,9 +4489,6 @@ consoles: {
     name: "buildbot/tryserver.chromium.win/win_chromium_gn_upload"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.win/win_chromium_syzyasan_rel"
-  }
-  builders: {
     name: "buildbot/tryserver.chromium.win/win_chromium_variable"
   }
   builders: {
@@ -4142,7 +4585,7 @@ consoles: {
     name: "buildbot/tryserver.blink/mac10.11_blink_rel"
   }
   builders: {
-    name: "buildbot/tryserver.blink/mac10.11_retina_blink_rel"
+    name: "buildbot/tryserver.blink/mac10.12_retina_blink_rel"
   }
   builders: {
     name: "buildbot/tryserver.blink/mac10.12_blink_rel"
@@ -4168,6 +4611,73 @@ consoles: {
 }
 
 consoles: {
+  id: "angle.try"
+  name: "angle.try"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  ref: "refs/heads/master"
+  manifest_name: "REVISION"
+  header_id: "chromium"
+
+  builders: {
+    name: "buildbucket/luci.chromium.try/android_angle_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/android_angle_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_compile_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_ozone_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/mac_angle_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/mac_angle_compile_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/mac_angle_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_compile_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_compile_x64_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_compile_x64_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_x64_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_x64_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_x64_rel_ng"
+  }
+}
+
+consoles: {
   id: "luci.chromium.try"
   name: "luci.chromium.try"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -4179,9 +4689,18 @@ consoles: {
     name: "buildbucket/luci.chromium.try/android_arm64_dbg_recipe"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/android_angle_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/android_angle_rel_ng"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/android_n5x_swarming_dbg"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/cast_shell_audio_linux"
   }
   builders: {
@@ -4221,9 +4740,27 @@ consoles: {
     name: "buildbucket/luci.chromium.try/fuchsia"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/linux-blink-heap-verification-try"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/linux_android_rel_ng"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_compile_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_ozone_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/linux_angle_rel_ng"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/linux_arm"
   }
   builders: {
@@ -4410,15 +4947,27 @@ consoles: {
     name: "buildbucket/luci.chromium.try/ios-simulator-xcode-clang"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/mac_angle_compile_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/mac_angle_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/mac_angle_rel_ng"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.10_macviews"
   }
   builders: {
-    name: "buildbucket/luci.chromium.try/mac_chromium_10.10_rel_ng"
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
   }
   builders: {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/mac_chromium_10.13_rel_ng"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/mac_chromium_archive_rel_ng"
   }
   builders: {
@@ -4485,6 +5034,9 @@ consoles: {
     name: "buildbucket/luci.chromium.try/mac_upload_clang"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/win10_chromium_x64_dbg_ng"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/win10_chromium_x64_rel_ng"
   }
   builders: {
@@ -4500,6 +5052,33 @@ consoles: {
     name: "buildbucket/luci.chromium.try/win7_chromium_rel_loc_exp"
   }
   builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_compile_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_compile_x64_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_compile_x64_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_x64_dbg_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_x64_deqp_rel_ng"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.try/win_angle_x64_rel_ng"
+  }
+  builders: {
     name: "buildbucket/luci.chromium.try/win_archive"
   }
   builders: {
diff --git a/chromium/infra/config/global/luci-scheduler.cfg b/chromium/infra/config/global/luci-scheduler.cfg
index 8be08b6185e..1e26483b28e 100644
--- a/chromium/infra/config/global/luci-scheduler.cfg
+++ b/chromium/infra/config/global/luci-scheduler.cfg
@@ -13,7 +13,7 @@ acl_sets {
   }
   acls {
     role: OWNER
-    granted_to: "group:project-chromium-committers"
+    granted_to: "group:project-chromium-admins"
   }
 }
 
@@ -30,8 +30,12 @@ acl_sets {
     granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
   }
   acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acls {
     role: OWNER
-    granted_to: "group:project-chromium-committers"
+    granted_to: "group:project-chromium-admins"
   }
 }
 
@@ -49,21 +53,68 @@ trigger {
 
   # Android. Sorted alphabetically.
   triggers: "Android arm64 Builder (dbg)"
+  triggers: "Android FYI 32 Vk Release (Nexus 5X)"
+  triggers: "Android FYI 64 Vk Release (Nexus 5X)"
+  triggers: "Android FYI dEQP Release (Nexus 5X)"
+  triggers: "Android FYI Release (Nexus 5)"
+  triggers: "Android FYI Release (Nexus 5X)"
+  triggers: "Android FYI Release (Nexus 6)"
+  triggers: "Android FYI Release (Nexus 6P)"
+  triggers: "Android FYI Release (Nexus 9)"
+  triggers: "Android FYI Release (NVIDIA Shield TV)"
+  triggers: "Android x64 Builder (dbg)"
+  triggers: "Android x86 Builder (dbg)"
+  triggers: "Deterministic Android"
+  triggers: "Deterministic Android (dbg)"
+  triggers: "Optional Android Release (Nexus 5X)"
+
+  # ChromeOS. Sorted alphabetically.
+  triggers: "chromeos-amd64-generic-rel"
 
   # Linux. Sorted alphabetically.
   triggers: "Cast Linux"
+  triggers: "Deterministic Linux"
+  triggers: "Deterministic Linux (dbg)"
+  triggers: "Fuchsia ARM64"
+  triggers: "Fuchsia ARM64 Cast Audio"
+  triggers: "Fuchsia x64"
+  triggers: "Fuchsia x64 Cast Audio"
+  triggers: "GPU FYI Linux Builder"
+  triggers: "GPU FYI Linux Builder (dbg)"
+  triggers: "GPU FYI Linux dEQP Builder"
+  triggers: "GPU FYI Linux Ozone Builder"
   triggers: "GPU Linux Builder"
   triggers: "linux-blink-heap-incremental-marking"
-  triggers: "Linux Builder (dbg)"
+  triggers: "linux-blink-heap-verification"
+  triggers: "Linux ASan LSan Builder"
   triggers: "Linux Builder"
+  triggers: "linux64-jumbo-rel"
+  triggers: "Linux Builder (dbg)"
+  triggers: "Linux Builder (dbg)(32)"
+  triggers: "Linux FYI GPU TSAN Release"
+  triggers: "Linux TSan Builder"
 
   # Mac. Sorted alphabetically.
+  triggers: "GPU FYI Mac Builder"
+  triggers: "GPU FYI Mac Builder (dbg)"
+  triggers: "GPU FYI Mac dEQP Builder"
+  triggers: "GPU Mac Builder"
+  triggers: "GPU Mac Builder (dbg)"
+  triggers: "Mac Builder"
   triggers: "Mac Builder (dbg)"
-  triggers: "WebKit Mac Builder (dbg)"
+  triggers: "Mac FYI GPU ASAN Release"
 
   # Windows. Sorted alphabetically.
+  triggers: "GPU FYI Win Builder"
+  triggers: "GPU FYI Win Builder (dbg)"
+  triggers: "GPU FYI Win Clang Builder (dbg)"
+  triggers: "GPU FYI Win dEQP Builder"
+  triggers: "GPU FYI Win x64 Builder"
+  triggers: "GPU FYI Win x64 Builder (dbg)"
+  triggers: "GPU FYI Win x64 dEQP Builder"
   triggers: "Win Builder"
   triggers: "Win Builder (dbg)"
+  triggers: "Win x64 Builder (dbg)"
 }
 
 
@@ -83,6 +134,96 @@ job {
 }
 
 job {
+  id: "Android FYI 32 Vk Release (Nexus 5X)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 32 Vk Release (Nexus 5X)"
+  }
+}
+
+job {
+  id: "Android FYI 64 Vk Release (Nexus 5X)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI 64 Vk Release (Nexus 5X)"
+  }
+}
+
+job {
+  id: "Android FYI dEQP Release (Nexus 5X)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI dEQP Release (Nexus 5X)"
+  }
+}
+
+job {
+  id: "Android FYI Release (Nexus 5)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 5)"
+  }
+}
+
+job {
+  id: "Android FYI Release (Nexus 5X)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 5X)"
+  }
+}
+
+job {
+  id: "Android FYI Release (Nexus 6)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 6)"
+  }
+}
+
+job {
+  id: "Android FYI Release (Nexus 6P)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 6P)"
+  }
+}
+
+job {
+  id: "Android FYI Release (Nexus 9)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (Nexus 9)"
+  }
+}
+
+job {
+  id: "Android FYI Release (NVIDIA Shield TV)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android FYI Release (NVIDIA Shield TV)"
+  }
+}
+
+job {
   id: "Android WebView N (dbg)"
   # triggered by "Android arm64 Builder (dbg)"
   acl_sets: "triggered-by-parent-builders"
@@ -96,6 +237,46 @@ job {
 }
 
 job {
+  id: "Android x64 Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android x64 Builder (dbg)"
+  }
+}
+
+job {
+  id: "Android x86 Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android x86 Builder (dbg)"
+  }
+}
+
+job {
+  id: "Deterministic Android"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Android"
+  }
+}
+
+job {
+  id: "Deterministic Android (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Android (dbg)"
+  }
+}
+
+job {
   id: "Marshmallow 64 bit Tester"
   # triggered by "Android arm64 Builder (dbg)"
   acl_sets: "triggered-by-parent-builders"
@@ -146,6 +327,13 @@ job {
 }
 
 job {
+  id: "Optional Android Release (Nexus 5X)"
+  acl_sets: "default"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
   id: "Oreo Phone Tester"
   # triggered by "Android arm64 Builder (dbg)"
   acl_sets: "triggered-by-parent-builders"
@@ -158,6 +346,19 @@ job {
   # }
 }
 
+################################################################################
+# ChromeOS Builders. Sorted alphabetically.
+################################################################################
+
+job {
+  id: "chromeos-amd64-generic-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "chromeos-amd64-generic-rel"
+  }
+}
 
 ################################################################################
 # Linux Builders. Sorted alphabetically except builder-Testers must follow their
@@ -175,6 +376,188 @@ job {
 }
 
 job {
+  id: "Deterministic Linux"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Linux"
+  }
+}
+
+job {
+  id: "Deterministic Linux (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Deterministic Linux (dbg)"
+  }
+}
+
+job {
+  id: "Fuchsia ARM64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Fuchsia ARM64"
+  }
+}
+
+job {
+  id: "Fuchsia ARM64 Cast Audio"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Fuchsia ARM64 Cast Audio"
+  }
+}
+
+job {
+  id: "Fuchsia x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Fuchsia x64"
+  }
+}
+
+job {
+  id: "Fuchsia x64 Cast Audio"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Fuchsia x64 Cast Audio"
+  }
+}
+
+job {
+  id: "GPU FYI Linux Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Builder"
+  }
+}
+
+job {
+  id: "Linux FYI Release (AMD R7 240)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (AMD R7 240)"
+  }
+}
+
+job {
+  id: "Linux FYI Release (Intel HD 630)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Linux FYI Release (NVIDIA)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Optional Linux Release (Intel HD 630)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "Optional Linux Release (NVIDIA)"
+  # Triggered by "GPU FYI Linux Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "GPU FYI Linux Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Builder (dbg)"
+  }
+}
+
+job {
+  id: "Linux FYI Debug (NVIDIA)"
+  # Triggered by "GPU FYI Linux Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Debug (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU FYI Linux dEQP Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux dEQP Builder"
+  }
+}
+
+job {
+  id: "Linux FYI dEQP Release (NVIDIA)"
+  # Triggered by "GPU FYI Linux dEQP Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI dEQP Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU FYI Linux Ozone Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Linux Ozone Builder"
+  }
+}
+
+job {
+  id: "Linux FYI Ozone (Intel)"
+  # Triggered by "GPU FYI Linux Ozone Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI Ozone (Intel)"
+  }
+}
+
+job {
   id: "GPU Linux Builder"
   acl_sets: "default"
   buildbucket: {
@@ -206,6 +589,48 @@ job {
 }
 
 job {
+  id: "linux-blink-heap-verification"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-heap-verification"
+  }
+}
+
+job {
+  id: "Linux ASan LSan Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ASan LSan Builder"
+  }
+}
+
+job {
+  id: "Linux ASan LSan Tests (1)"
+  # Triggered by "Linux ASan LSan Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ASan LSan Tests (1)"
+  }
+}
+
+job {
+  id: "Linux ASan Tests (sandboxed)"
+  # Triggered by "Linux ASan LSan Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux ASan Tests (sandboxed)"
+  }
+}
+
+job {
   id: "Linux Builder (dbg)"
   acl_sets: "default"
   buildbucket: {
@@ -216,6 +641,17 @@ job {
 }
 
 job {
+  id: "linux64-jumbo-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux64-jumbo-rel"
+  }
+}
+
+
+job {
   id: "Linux Tests (dbg)(1)"
   # Triggered by "Linux Builder (dbg)".
   acl_sets: "triggered-by-parent-builders"
@@ -227,6 +663,27 @@ job {
 }
 
 job {
+  id: "Linux Builder (dbg)(32)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Builder (dbg)(32)"
+  }
+}
+
+# Triggered by "Linux Builder (dbg)(32)"
+job {
+  id: "Linux Tests (dbg)(1)(32)"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Tests (dbg)(1)(32)"
+  }
+}
+
+job {
   id: "Linux Builder"
   acl_sets: "default"
   buildbucket: {
@@ -237,6 +694,16 @@ job {
 }
 
 job {
+  id: "Linux FYI GPU TSAN Release"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux FYI GPU TSAN Release"
+  }
+}
+
+job {
   id: "Linux Tests"
   # Triggered by "Linux Builder".
   acl_sets: "triggered-by-parent-builders"
@@ -247,11 +714,292 @@ job {
   }
 }
 
+job {
+  id: "Linux TSan Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux TSan Builder"
+  }
+}
+
+job {
+  id: "Linux TSan Tests"
+  # Triggered by "Linux TSan Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux TSan Tests"
+  }
+}
+
 ################################################################################
 # Mac Builders. Sorted alphabetically.
 ################################################################################
 
 job {
+  id: "GPU FYI Mac Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac Builder"
+  }
+}
+
+job {
+  id: "GPU Mac Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Mac Builder"
+  }
+}
+
+job {
+  id: "GPU Mac Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU Mac Builder (dbg)"
+  }
+}
+
+job {
+  id: "Mac Debug (Intel)"
+  # Triggered by "GPU Mac Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Debug (Intel)"
+  }
+}
+
+job {
+  id: "Mac FYI Experimental Release (Intel)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Release (Intel)"
+  }
+}
+
+job {
+  id: "Mac FYI Experimental Retina Release (AMD)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Retina Release (AMD)"
+  }
+}
+
+job {
+  id: "Mac FYI Experimental Retina Release (NVIDIA)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Experimental Retina Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Mac FYI Release (Intel)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Release (Intel)"
+  }
+}
+
+job {
+  id: "Mac FYI Retina Release (AMD)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Release (AMD)"
+  }
+}
+
+job {
+  id: "Mac FYI Retina Release (NVIDIA)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Mac Pro FYI Release (AMD)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Pro FYI Release (AMD)"
+  }
+}
+
+job {
+  id: "Mac Release (Intel)"
+  # Triggered by "GPU Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Release (Intel)"
+  }
+}
+
+job {
+  id: "Mac Retina Debug (AMD)"
+  # Triggered by "GPU Mac Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Retina Debug (AMD)"
+  }
+}
+
+job {
+  id: "Mac Retina Release (AMD)"
+  # Triggered by "GPU Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Retina Release (AMD)"
+  }
+}
+
+job {
+  id: "Optional Mac Release (Intel)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "Optional Mac Retina Release (NVIDIA)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "Optional Mac Retina Release (AMD)"
+  # Triggered by "GPU FYI Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "GPU FYI Mac Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac Builder (dbg)"
+  }
+}
+
+job {
+  id: "Mac FYI Debug (Intel)"
+  # Triggered by "GPU FYI Mac Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Debug (Intel)"
+  }
+}
+
+job {
+  id: "Mac FYI Retina Debug (AMD)"
+  # Triggered by "GPU FYI Mac Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Debug (AMD)"
+  }
+}
+
+job {
+  id: "Mac FYI Retina Debug (NVIDIA)"
+  # Triggered by "GPU FYI Mac Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI Retina Debug (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU FYI Mac dEQP Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Mac dEQP Builder"
+  }
+}
+
+job {
+  id: "Mac FYI dEQP Release AMD"
+  # Triggered by "GPU FYI Mac dEQP Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI dEQP Release AMD"
+  }
+}
+
+job {
+  id: "Mac FYI dEQP Release Intel"
+  # Triggered by "GPU FYI Mac dEQP Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI dEQP Release Intel"
+  }
+}
+
+job {
+  id: "Mac Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Builder"
+  }
+}
+
+job {
   id: "Mac Builder (dbg)"
   acl_sets: "default"
   buildbucket: {
@@ -262,23 +1010,67 @@ job {
 }
 
 job {
-  id: "Mac10.9 Tests (dbg)"
-  # Triggered by "Mac Builder (dbg)".
+  id: "Mac FYI GPU ASAN Release"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac FYI GPU ASAN Release"
+  }
+}
+
+job {
+  id: "Mac10.10 Tests"
+  # Triggered by "Mac Builder".
   acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Mac10.9 Tests (dbg)"
+    builder: "Mac10.10 Tests"
   }
 }
 
 job {
-  id: "WebKit Mac Builder (dbg)"
-  acl_sets: "default"
+  id: "Mac10.11 Tests"
+  # Triggered by "Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.11 Tests"
+  }
+}
+
+job {
+  id: "Mac10.12 Tests"
+  # Triggered by "Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.12 Tests"
+  }
+}
+
+job {
+  id: "Mac10.13 Tests"
+  # Triggered by "Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.13 Tests"
+  }
+}
+
+job {
+  id: "Mac10.13 Tests (dbg)"
+  # Triggered by "Mac Builder (dbg)".
+  acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "WebKit Mac Builder (dbg)"
+    builder: "Mac10.13 Tests (dbg)"
   }
 }
 
@@ -287,6 +1079,243 @@ job {
 ################################################################################
 
 job {
+  id: "GPU FYI Win Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win Builder"
+  }
+}
+
+job {
+  id: "Optional Win10 Release (Intel HD 630)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "Optional Win10 Release (NVIDIA)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "Win10 FYI Exp Release (NVIDIA)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI Exp Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Win10 FYI Release (Intel HD 630)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI Release (Intel HD 630)"
+  }
+}
+
+job {
+  id: "Win10 FYI Release (NVIDIA)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Win7 ANGLE Tryserver (AMD)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  # This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
+  noop: {}
+}
+
+job {
+  id: "Win7 FYI Release (AMD)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Release (AMD)"
+  }
+}
+
+job {
+  id: "Win7 FYI Release (NVIDIA)"
+  # Triggered by "GPU FYI Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU FYI Win Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win Builder (dbg)"
+  }
+}
+
+job {
+  id: "Win10 FYI Debug (NVIDIA)"
+  # Triggered by "GPU FYI Win Builder (dbg)"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI Debug (NVIDIA)"
+  }
+}
+
+job {
+  id: "Win7 FYI Debug (AMD)"
+  # Triggered by "GPU FYI Win Builder (dbg)"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Debug (AMD)"
+  }
+}
+
+job {
+  id: "Win7 FYI Debug (NVIDIA)"
+  # Triggered by "GPU FYI Win Builder (dbg)"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI Debug (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU FYI Win Clang Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win Clang Builder (dbg)"
+  }
+}
+
+job {
+  id: "GPU FYI Win dEQP Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win dEQP Builder"
+  }
+}
+
+job {
+  id: "Win10 FYI dEQP Release (NVIDIA)"
+  # Triggered by "GPU FYI Win dEQP Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI dEQP Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "Win7 FYI dEQP Release (AMD)"
+  # Triggered by "GPU FYI Win dEQP Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI dEQP Release (AMD)"
+  }
+}
+
+job {
+  id: "GPU FYI Win x64 Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 Builder"
+  }
+}
+
+job {
+  id: "Win7 FYI x64 Release (NVIDIA)"
+  # Triggered by "GPU FYI Win x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI x64 Release (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU FYI Win x64 Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 Builder (dbg)"
+  }
+}
+
+job {
+  id: "Win7 FYI x64 Debug (NVIDIA)"
+  # Triggered by "GPU FYI Win x64 Builder (dbg)"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI x64 Debug (NVIDIA)"
+  }
+}
+
+job {
+  id: "GPU FYI Win x64 dEQP Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "GPU FYI Win x64 dEQP Builder"
+  }
+}
+
+job {
+  id: "Win7 FYI x64 dEQP Release (NVIDIA)"
+  # Triggered by "GPU FYI Win x64 dEQP Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win7 FYI x64 dEQP Release (NVIDIA)"
+  }
+}
+
+job {
   id: "Win Builder (dbg)"
   acl_sets: "default"
   buildbucket: {
@@ -297,6 +1326,16 @@ job {
 }
 
 job {
+  id: "Win x64 Builder (dbg)"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win x64 Builder (dbg)"
+  }
+}
+
+job {
   id: "Win Builder"
   acl_sets: "default"
   buildbucket: {
@@ -307,23 +1346,47 @@ job {
 }
 
 job {
+  id: "Win7 (32) Tests"
+  # Triggered by "Win Builder"
+  acl_sets: "triggered-by-parent-builders"
+  noop: {}
+  # buildbucket: {
+  #   server: "cr-buildbucket.appspot.com"
+  #   bucket: "luci.chromium.ci"
+  #   builder: "Win7 (32) Tests"
+  # }
+}
+
+job {
   id: "Win7 Tests (1)"
   # Triggered by "Win Builder"
   acl_sets: "triggered-by-parent-builders"
+  noop: {}
+  # buildbucket: {
+  #   server: "cr-buildbucket.appspot.com"
+  #   bucket: "luci.chromium.ci"
+  #   builder: "Win7 Tests (1)"
+  # }
+}
+
+job {
+  id: "Win7 Tests (dbg)(1)"
+  # Triggered by "Win Builder (dbg)"
+  acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win7 Tests (1)"
+    builder: "Win7 Tests (dbg)(1)"
   }
 }
 
 job {
-  id: "Win7 Tests (dbg)(1)"
-  # Triggered by "Win Builder (dbg)"
+  id: "Win10 Tests x64 (dbg)"
+  # Triggered by "Win x64 Builder (dbg)"
   acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win7 Tests (dbg)(1)"
+    builder: "Win10 Tests x64 (dbg)"
   }
 }