Stop branch builders from closing the tree.

Bug: 1094768,1105382 Change-Id: I4adef61ba684a97f729c02e2557736cbf6def33c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297031 Commit-Queue: Takuto Ikuta <tikuta@chromium.org> Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Auto-Submit: Owen Rodley <orodley@chromium.org> Cr-Commit-Position: refs/heads/master@{#788441}

Stop branch builders from closing the tree.
Bug: 1094768,1105382 Change-Id: I4adef61ba684a97f729c02e2557736cbf6def33c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297031 Commit-Queue: Takuto Ikuta <tikuta@chromium.org> Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Auto-Submit: Owen Rodley <orodley@chromium.org> Cr-Commit-Position: refs/heads/master@{#788441}
80a0f0e1 · Owen Rodley · Commit Bot · ee1a3619 · 80a0f0e1 · 80a0f0e1
Commit 80a0f0e1 authored Jul 15, 2020 by Owen Rodley Committed by Commit Bot Jul 15, 2020
3 changed files
--- a/infra/config/generated/luci-notify.cfg
+++ b/infra/config/generated/luci-notify.cfg
@@ -2862,13 +2862,6 @@ notifiers {
  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -2882,19 +2875,8 @@ notifiers {
    name: "Android Release (Nexus 5X)"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -2907,19 +2889,8 @@ notifiers {
    name: "Cast Linux"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -2938,19 +2909,8 @@ notifiers {
    name: "Fuchsia ARM64"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -2969,19 +2929,8 @@ notifiers {
    name: "Fuchsia x64"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -2995,19 +2944,8 @@ notifiers {
    name: "GPU Linux Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3021,19 +2959,8 @@ notifiers {
    name: "GPU Mac Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3047,19 +2974,8 @@ notifiers {
    name: "GPU Win x64 Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3072,19 +2988,8 @@ notifiers {
    name: "Linux ASan LSan Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3096,19 +3001,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux ASan LSan Tests (1)"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3120,19 +3014,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux ASan Tests (sandboxed)"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3145,19 +3028,8 @@ notifiers {
    name: "Linux Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3170,19 +3042,8 @@ notifiers {
    name: "Linux Builder (dbg)"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3194,19 +3055,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux Ozone Tester (Headless)"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3218,19 +3068,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux Ozone Tester (Wayland)"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3242,19 +3081,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux Ozone Tester (X11)"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3267,19 +3095,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux Release (NVIDIA)"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3292,19 +3109,8 @@ notifiers {
    name: "Linux TSan Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3316,19 +3122,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux TSan Tests"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3340,19 +3135,8 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux Tests"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3364,27 +3148,19 @@ notifiers {
    bucket: "ci-m84"
    name: "Linux Tests (dbg)(1)"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Mac Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Mac Release (Intel)"
  }
 }
 notifiers {
@@ -3392,27 +3168,16 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Mac Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Mac Retina Release (AMD)"
  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3423,138 +3188,57 @@ notifiers {
  }
  builders {
    bucket: "ci-m84"
-    name: "Mac Release (Intel)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Win10 x64 Release (NVIDIA)"
  }
 }
 notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "Mac Retina Release (AMD)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "Mac10.10 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "Mac10.11 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Mac10.12 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "android-cronet-arm-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Mac10.13 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "android-cronet-arm-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Mac10.13 Tests (dbg)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "android-cronet-kitkat-arm-rel"
  }
 }
 notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Mac10.14 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "android-cronet-lollipop-arm-rel"
  }
 }
 notifiers {
@@ -3562,33 +3246,19 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
-  builders {
-    bucket: "ci-m84"
-    name: "Mac10.15 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cr-fuchsia+bot@chromium.org"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "WebKit Mac10.13 (retina)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "fuchsia-arm64-cast"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
@@ -3596,79 +3266,49 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
-  builders {
-    bucket: "ci-m84"
-    name: "Win 7 Tests x64 (1)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cr-fuchsia+bot@chromium.org"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Win Builder (dbg)"
+    name: "fuchsia-x64-cast"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Win x64 Builder"
+    name: "ios-simulator-cronet"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m84"
-    name: "Win10 Tests x64"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "linux-ozone-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -3678,12 +3318,9 @@ notifiers {
    }
  }
  builders {
-    bucket: "ci-m84"
-    name: "Win10 x64 Release (NVIDIA)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    bucket: "ci-m85"
+    name: "Android Release (Nexus 5X)"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
@@ -3691,988 +3328,83 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
-    bucket: "ci-m84"
-    name: "Win7 Tests (dbg)(1)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    bucket: "ci-m85"
+    name: "Cast Linux"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
  notifications {
-    on_change: true
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "thomasanderson@chromium.org"
    }
  }
-  builders {
-    bucket: "ci-m84"
-    name: "android-cronet-arm-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
  notifications {
    on_change: true
    email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "cr-fuchsia+bot@chromium.org"
    }
  }
  builders {
-    bucket: "ci-m84"
-    name: "android-cronet-arm-rel"
+    bucket: "ci-m85"
+    name: "Fuchsia ARM64"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
  notifications {
-    on_change: true
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "thomasanderson@chromium.org"
    }
  }
-  builders {
-    bucket: "ci-m84"
-    name: "android-cronet-kitkat-arm-rel"
-  }
-}
-notifiers {
  notifications {
    on_change: true
    email {
-      recipients: "cronet-bots-observer@google.com"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "android-cronet-lollipop-arm-rel"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cr-fuchsia+bot@chromium.org"
    }
  }
  builders {
-    bucket: "ci-m84"
-    name: "chromeos-amd64-generic-dbg"
+    bucket: "ci-m85"
+    name: "Fuchsia x64"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
-    bucket: "ci-m84"
-    name: "chromeos-amd64-generic-rel"
+    bucket: "ci-m85"
+    name: "GPU Linux Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "chromeos-arm-generic-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  notifications {
-    on_change: true
-    email {
-      recipients: "cr-fuchsia+bot@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "fuchsia-arm64-cast"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  notifications {
-    on_change: true
-    email {
-      recipients: "cr-fuchsia+bot@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "fuchsia-x64-cast"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "ios-simulator"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_change: true
-    email {
-      recipients: "cronet-bots-observer@google.com"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "ios-simulator-cronet"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "ios-simulator-full-configs"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "linux-chromeos-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "linux-chromeos-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m84"
-    name: "linux-ozone-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Android Release (Nexus 5X)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Cast Linux"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  notifications {
-    on_change: true
-    email {
-      recipients: "cr-fuchsia+bot@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Fuchsia ARM64"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  notifications {
-    on_change: true
-    email {
-      recipients: "cr-fuchsia+bot@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Fuchsia x64"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "GPU Linux Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "GPU Mac Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "GPU Win x64 Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux ASan LSan Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux ASan LSan Tests (1)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux ASan Tests (sandboxed)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Ozone Tester (Headless)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Ozone Tester (Wayland)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Ozone Tester (X11)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Release (NVIDIA)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux TSan Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux TSan Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Linux Tests (dbg)(1)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac Release (Intel)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac Retina Release (AMD)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac10.10 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac10.11 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac10.12 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac10.13 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  builders {
-    bucket: "ci-m85"
-    name: "Mac10.13 Tests (dbg)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Mac10.14 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "GPU Mac Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
@@ -4680,16 +3412,14 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Mac10.15 Tests"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "GPU Win x64 Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
@@ -4697,16 +3427,13 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "WebKit Mac10.13 (retina)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Linux ASan LSan Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
@@ -4714,16 +3441,12 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Win 7 Tests x64 (1)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Linux ASan LSan Tests (1)"
  }
 }
 notifiers {
@@ -4731,17 +3454,12 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Win Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Linux ASan Tests (sandboxed)"
  }
 }
 notifiers {
@@ -4749,34 +3467,27 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Win x64 Builder"
+    name: "Linux Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Win10 Tests x64"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Linux Builder (dbg)"
+    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
@@ -4784,24 +3495,25 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
+  builders {
+    bucket: "ci-m85"
+    name: "Linux Ozone Tester (Headless)"
+  }
+}
+notifiers {
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      recipients: "chrome-gpu-build-failures@google.com"
-      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Win10 x64 Release (NVIDIA)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Linux Ozone Tester (Wayland)"
  }
 }
 notifiers {
@@ -4809,66 +3521,66 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "Win7 Tests (dbg)(1)"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Linux Ozone Tester (X11)"
  }
 }
 notifiers {
  notifications {
-    on_change: true
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "android-cronet-arm-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
+    name: "Linux Release (NVIDIA)"
  }
 }
 notifiers {
  notifications {
-    on_change: true
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "android-cronet-arm-rel"
+    name: "Linux TSan Builder"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
 }
 notifiers {
  notifications {
-    on_change: true
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "android-cronet-kitkat-arm-rel"
+    name: "Linux TSan Tests"
  }
 }
 notifiers {
  notifications {
-    on_change: true
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      recipients: "cronet-bots-observer@google.com"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "android-cronet-lollipop-arm-rel"
+    name: "Linux Tests"
  }
 }
 notifiers {
@@ -4876,17 +3588,12 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "chromeos-amd64-generic-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Linux Tests (dbg)(1)"
  }
 }
 notifiers {
@@ -4894,17 +3601,13 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "chromeos-amd64-generic-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Mac Release (Intel)"
  }
 }
 notifiers {
@@ -4912,17 +3615,13 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "chromeos-arm-generic-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "Mac Retina Release (AMD)"
  }
 }
 notifiers {
@@ -4930,79 +3629,51 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "chrome-gpu-build-failures@google.com"
+      rotation_urls: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
    }
  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
+  builders {
+    bucket: "ci-m85"
+    name: "Win10 x64 Release (NVIDIA)"
  }
+}
+notifiers {
  notifications {
    on_change: true
    email {
-      recipients: "cr-fuchsia+bot@chromium.org"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "fuchsia-arm64-cast"
+    name: "android-cronet-arm-dbg"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      recipients: "thomasanderson@chromium.org"
-    }
-  }
  notifications {
    on_change: true
    email {
-      recipients: "cr-fuchsia+bot@chromium.org"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "fuchsia-x64-cast"
+    name: "android-cronet-arm-rel"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "ios-simulator"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    name: "android-cronet-kitkat-arm-rel"
  }
 }
 notifiers {
@@ -5014,8 +3685,7 @@ notifiers {
  }
  builders {
    bucket: "ci-m85"
-    name: "ios-simulator-cronet"
-    repository: "https://chromium.googlesource.com/chromium/src"
+    name: "android-cronet-lollipop-arm-rel"
  }
 }
 notifiers {
@@ -5023,63 +3693,55 @@ notifiers {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "ios-simulator-full-configs"
+    name: "fuchsia-arm64-cast"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  notifications {
+    on_change: true
+    email {
+      recipients: "cr-fuchsia+bot@chromium.org"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "linux-chromeos-dbg"
+    name: "fuchsia-x64-cast"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    on_change: true
    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+      recipients: "cronet-bots-observer@google.com"
    }
  }
  builders {
    bucket: "ci-m85"
-    name: "linux-chromeos-rel"
+    name: "ios-simulator-cronet"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-  }
  notifications {
    on_occurrence: FAILURE
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
@@ -5092,9 +3754,5 @@ notifiers {
    name: "linux-ozone-rel"
    repository: "https://chromium.googlesource.com/chromium/src"
  }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
-  }
 }
 tree_closing_enabled: true
--- a/infra/config/lib/ci.star
+++ b/infra/config/lib/ci.star
@@ -454,10 +454,15 @@ def ci_builder(
      'chromium-tree-closer' config in notifiers.star for the full criteria.
    notifies - Any extra notifiers to attach to this builder.
  """
+
+  # Branch builders should never close the tree, only builders from the main
+  # "ci" bucket.
+  bucket = defaults.get_value_from_kwargs('bucket', kwargs)
+  if tree_closing and bucket == 'ci':
+    notifies = (notifies or []) + ['chromium-tree-closer', 'chromium-tree-closer-email']
+
  # Define the builder first so that any validation of luci.builder arguments
  # (e.g. bucket) occurs before we try to use it
-  if tree_closing:
-    notifies = (notifies or []) + ['chromium-tree-closer', 'chromium-tree-closer-email']
  ret = builders.builder(
      name = name,
      resultdb_bigquery_exports = [resultdb.export_test_results(
@@ -473,7 +478,6 @@ def ci_builder(
      console_view = defaults.get_value_from_kwargs('mastername', kwargs)

    if console_view:
-      bucket = defaults.get_value_from_kwargs('bucket', kwargs)
      add_to_console_view = defaults.get_value(
          'add_to_console_view', add_to_console_view)


--- a/infra/config/subprojects/chromium/versioned/m85/buckets/ci.star
+++ b/infra/config/subprojects/chromium/versioned/m85/buckets/ci.star
@@ -230,7 +230,6 @@ ci.chromium_builder(
    # TODO: Change this back down to something reasonable once these builders
    # have populated their cached by getting through the compile step
    execution_timeout = 6 * time.hour,
-    tree_closing = False,
 )

 ci.chromium_builder(
@@ -246,7 +245,6 @@ ci.chromium_builder(
    # TODO: Change this back down to something reasonable once these builders
    # have populated their cached by getting through the compile step
    execution_timeout = 10 * time.hour,
-    tree_closing = False,
 )

 ci.chromium_builder(
@@ -262,7 +260,6 @@ ci.chromium_builder(
    # TODO: Change this back down to something reasonable once these builders
    # have populated their cached by getting through the compile step
    execution_timeout = 10 * time.hour,
-    tree_closing = False,
 )

 ci.chromiumos_builder(