[go: nahoru, domu]

[updater] Run updater testers under chromium.updater buildergroup.

This change propagates changes to waterfall created in
crrev.com/c/2530896.


Bug: 1136981
Change-Id: I69fb6fd9f8c980de9d7373ca02b6a41ce3bd7214
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2531065
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Anjali Doneria <adoneria@google.com>
Cr-Commit-Position: refs/heads/master@{#826529}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index de0a091..4217e56 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -19356,51 +19356,6 @@
       }
     }
     builders {
-      name: "mac-omaha-builder-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
-    builders {
       name: "mac-osxbeta-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -19493,6 +19448,51 @@
       }
     }
     builders {
+      name: "mac-updater-builder-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
       name: "mac-upload-perfetto"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -19539,7 +19539,7 @@
       }
     }
     builders {
-      name: "mac10.10-omaha-tester-rel"
+      name: "mac10.10-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -19553,13 +19553,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
@@ -19586,7 +19586,7 @@
       }
     }
     builders {
-      name: "mac10.11-omaha-tester-rel"
+      name: "mac10.11-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -19600,13 +19600,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
@@ -19633,7 +19633,7 @@
       }
     }
     builders {
-      name: "mac10.12-omaha-tester-rel"
+      name: "mac10.12-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -19647,13 +19647,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
@@ -19680,7 +19680,7 @@
       }
     }
     builders {
-      name: "mac10.13-omaha-tester-rel"
+      name: "mac10.13-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -19694,13 +19694,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
@@ -19727,7 +19727,7 @@
       }
     }
     builders {
-      name: "mac10.14-omaha-tester-rel"
+      name: "mac10.14-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -19741,13 +19741,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
@@ -19774,7 +19774,7 @@
       }
     }
     builders {
-      name: "mac10.15-omaha-tester-rel"
+      name: "mac10.15-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -19788,13 +19788,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
@@ -20192,52 +20192,6 @@
       }
     }
     builders {
-      name: "win-omaha-builder-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:win-omaha-builder-rel"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
-    builders {
       name: "win-paeverywhere-x64-fyi-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -20846,6 +20800,52 @@
       }
     }
     builders {
+      name: "win-updater-builder-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-updater-builder-rel"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
       name: "win-upload-perfetto"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -20987,10 +20987,10 @@
       }
     }
     builders {
-      name: "win10-omaha-tester-rel"
+      name: "win10-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:win10-omaha-tester-rel"
+      dimensions: "builder:win10-updater-tester-rel"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
@@ -21000,13 +21000,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
@@ -21217,7 +21217,7 @@
       }
     }
     builders {
-      name: "win7-omaha-tester-rel"
+      name: "win7-updater-tester-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
@@ -21231,13 +21231,13 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 36000
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
         key: "chromium.resultdb.result_sink"
-        value: 100
+        value: 50
       }
       experiments {
         key: "luci.use_realms"
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index ebad6c12..9004ffd 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -5426,56 +5426,6 @@
     category: "perfetto"
     short_name: "win"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac10.10-omaha-tester-rel"
-    category: "updater|mac"
-    short_name: "10.10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac10.11-omaha-tester-rel"
-    category: "updater|mac"
-    short_name: "10.11"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac10.12-omaha-tester-rel"
-    category: "updater|mac"
-    short_name: "10.12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac10.13-omaha-tester-rel"
-    category: "updater|mac"
-    short_name: "10.13"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac10.14-omaha-tester-rel"
-    category: "updater|mac"
-    short_name: "10.14"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac10.15-omaha-tester-rel"
-    category: "updater|mac"
-    short_name: "10.15"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/mac-omaha-builder-rel"
-    category: "updater|mac"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win10-omaha-tester-rel"
-    category: "updater|win"
-    short_name: "10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win7-omaha-tester-rel"
-    category: "updater|win"
-    short_name: "7"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/win-omaha-builder-rel"
-    category: "updater|win"
-    short_name: "bld"
-  }
   header {
     oncalls {
       name: "Chromium"
@@ -9292,6 +9242,330 @@
   }
 }
 consoles {
+  id: "chromium.updater"
+  name: "chromium.updater"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac10.10-updater-tester-rel"
+    category: "updater|mac"
+    short_name: "10.10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac10.11-updater-tester-rel"
+    category: "updater|mac"
+    short_name: "10.11"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac10.12-updater-tester-rel"
+    category: "updater|mac"
+    short_name: "10.12"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac10.13-updater-tester-rel"
+    category: "updater|mac"
+    short_name: "10.13"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac10.14-updater-tester-rel"
+    category: "updater|mac"
+    short_name: "10.14"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac10.15-updater-tester-rel"
+    category: "updater|mac"
+    short_name: "10.15"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/mac-updater-builder-rel"
+    category: "updater|mac"
+    short_name: "bld"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win10-updater-tester-rel"
+    category: "updater|win"
+    short_name: "10"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win7-updater-tester-rel"
+    category: "updater|win"
+    short_name: "7"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win-updater-builder-rel"
+    category: "updater|win"
+    short_name: "bld"
+  }
+  header {
+    oncalls {
+      name: "Chromium"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
+    }
+    oncalls {
+      name: "Android"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
+    }
+    oncalls {
+      name: "iOS"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
+    }
+    oncalls {
+      name: "ChromeOS"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chromeos-gardeners"
+    }
+    oncalls {
+      name: "GPU"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-gpu-pixel-wrangling"
+    }
+    oncalls {
+      name: "ANGLE"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:angle-wrangler"
+    }
+    oncalls {
+      name: "Perf"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
+    }
+    oncalls {
+      name: "Perfbot"
+      url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
+    }
+    oncalls {
+      name: "Trooper"
+      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
+      show_primary_secondary_labels: true
+    }
+    links {
+      name: "Builds"
+      links {
+        text: "continuous"
+        url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+        alt: "Continuous browser snapshots"
+      }
+      links {
+        text: "symbols"
+        url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+        alt: "Windows Symbols"
+      }
+      links {
+        text: "status"
+        url: "https://chromium-status.appspot.com/"
+        alt: "Current tree status"
+      }
+    }
+    links {
+      name: "Dashboards"
+      links {
+        text: "perf"
+        url: "https://chromeperf.appspot.com/"
+        alt: "Chrome perf dashboard"
+      }
+      links {
+        text: "flake-portal"
+        url: "https://analysis.chromium.org/p/chromium/flake-portal"
+        alt: "New flake portal"
+      }
+      links {
+        text: "legacy-flakiness"
+        url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+        alt: "Legacy flakiness dashboard"
+      }
+    }
+    links {
+      name: "Chromium"
+      links {
+        text: "source"
+        url: "https://chromium.googlesource.com/chromium/src"
+        alt: "Chromium source code repository"
+      }
+      links {
+        text: "reviews"
+        url: "https://chromium-review.googlesource.com"
+        alt: "Chromium code review tool"
+      }
+      links {
+        text: "bugs"
+        url: "https://crbug.com"
+        alt: "Chromium bug tracker"
+      }
+      links {
+        text: "coverage"
+        url: "https://analysis.chromium.org/p/chromium/coverage"
+        alt: "Chromium code coverage dashboard"
+      }
+      links {
+        text: "dev"
+        url: "https://dev.chromium.org/Home"
+        alt: "Chromium developer home page"
+      }
+      links {
+        text: "support"
+        url: "https://support.google.com/chrome/#topic=7438008"
+        alt: "Google Chrome help center"
+      }
+    }
+    links {
+      name: "Consoles"
+      links {
+        text: "android"
+        url: "/p/chromium/g/chromium.android"
+        alt: "Chromium Android console"
+      }
+      links {
+        text: "clang"
+        url: "/p/chromium/g/chromium.clang"
+        alt: "Chromium Clang console"
+      }
+      links {
+        text: "dawn"
+        url: "/p/chromium/g/chromium.dawn"
+        alt: "Chromium Dawn console"
+      }
+      links {
+        text: "fuzz"
+        url: "/p/chromium/g/chromium.fuzz"
+        alt: "Chromium Fuzz console"
+      }
+      links {
+        text: "fyi"
+        url: "/p/chromium/g/chromium.fyi"
+        alt: "Chromium FYI console"
+      }
+      links {
+        text: "gpu"
+        url: "/p/chromium/g/chromium.gpu"
+        alt: "Chromium GPU console"
+      }
+      links {
+        text: "perf"
+        url: "/p/chrome/g/chrome.perf/console"
+        alt: "Chromium Perf console"
+      }
+      links {
+        text: "perf.fyi"
+        url: "/p/chrome/g/chrome.perf.fyi/console"
+        alt: "Chromium Perf FYI console"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/chromium.swangle"
+        alt: "Chromium SWANGLE console"
+      }
+      links {
+        text: "webrtc"
+        url: "/p/chromium/g/chromium.webrtc"
+        alt: "Chromium WebRTC console"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/chromium.chromiumos"
+        alt: "ChromiumOS console"
+      }
+    }
+    links {
+      name: "Branch Consoles"
+      links {
+        text: "m86"
+        url: "/p/chromium-m86/g/main/console"
+        alt: "Stable branch console"
+      }
+      links {
+        text: "m87"
+        url: "/p/chromium-m87/g/main/console"
+        alt: "Beta branch console"
+      }
+      links {
+        text: "trunk"
+        url: "/p/chromium/g/main/console"
+        alt: "Trunk (ToT) console"
+      }
+    }
+    links {
+      name: "Tryservers"
+      links {
+        text: "android"
+        url: "/p/chromium/g/tryserver.chromium.android/builders"
+        alt: "Android"
+      }
+      links {
+        text: "angle"
+        url: "/p/chromium/g/tryserver.chromium.angle/builders"
+        alt: "Angle"
+      }
+      links {
+        text: "blink"
+        url: "/p/chromium/g/tryserver.blink/builders"
+        alt: "Blink"
+      }
+      links {
+        text: "chrome"
+        url: "/p/chrome/g/tryserver.chrome/builders"
+        alt: "Chrome"
+      }
+      links {
+        text: "chromiumos"
+        url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
+        alt: "ChromiumOS"
+      }
+      links {
+        text: "linux"
+        url: "/p/chromium/g/tryserver.chromium.linux/builders"
+        alt: "Linux"
+      }
+      links {
+        text: "mac"
+        url: "/p/chromium/g/tryserver.chromium.mac/builders"
+        alt: "Mac"
+      }
+      links {
+        text: "swangle"
+        url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+        alt: "SWANGLE"
+      }
+      links {
+        text: "win"
+        url: "/p/chromium/g/tryserver.chromium.win/builders"
+        alt: "Win"
+      }
+    }
+    links {
+      name: "Navigate"
+      links {
+        text: "about"
+        url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+        alt: "Tour of the console"
+      }
+      links {
+        text: "customize"
+        url: "https://chromium.googlesource.com/chromium/src/+/refs/heads/master/infra/config/generated/luci-milo.cfg"
+        alt: "Customize this console"
+      }
+    }
+    console_groups {
+      title {
+        text: "Tree Closers"
+        url: "https://chromium-status.appspot.com/"
+      }
+      console_ids: "chromium/chromium"
+      console_ids: "chromium/chromium.win"
+      console_ids: "chromium/chromium.mac"
+      console_ids: "chromium/chromium.linux"
+      console_ids: "chromium/chromium.chromiumos"
+      console_ids: "chrome/chrome"
+      console_ids: "chromium/chromium.memory"
+      console_ids: "chromium/chromium.gpu"
+    }
+    console_groups {
+      console_ids: "chromium/chromium.android"
+      console_ids: "chrome/chrome.perf"
+      console_ids: "chromium/chromium.gpu.fyi"
+      console_ids: "chromium/chromium.swangle"
+      console_ids: "chromium/chromium.fuzz"
+    }
+    tree_status_host: "chromium-status.appspot.com"
+  }
+}
+consoles {
   id: "chromium.webrtc"
   name: "chromium.webrtc"
   repo_url: "https://chromium.googlesource.com/chromium/src"
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index 4580c18d..4a0baf9 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -5820,16 +5820,6 @@
   }
 }
 job {
-  id: "mac-omaha-builder-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "mac-omaha-builder-rel"
-  }
-}
-job {
   id: "mac-osxbeta-rel"
   realm: "ci"
   acls {
@@ -5854,6 +5844,16 @@
   }
 }
 job {
+  id: "mac-updater-builder-rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-updater-builder-rel"
+  }
+}
+job {
   id: "mac-upload-perfetto"
   realm: "ci"
   schedule: "with 3h interval"
@@ -5865,7 +5865,7 @@
   }
 }
 job {
-  id: "mac10.10-omaha-tester-rel"
+  id: "mac10.10-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5875,11 +5875,11 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.10-omaha-tester-rel"
+    builder: "mac10.10-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.11-omaha-tester-rel"
+  id: "mac10.11-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5889,11 +5889,11 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.11-omaha-tester-rel"
+    builder: "mac10.11-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.12-omaha-tester-rel"
+  id: "mac10.12-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5903,11 +5903,11 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.12-omaha-tester-rel"
+    builder: "mac10.12-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.13-omaha-tester-rel"
+  id: "mac10.13-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5917,11 +5917,11 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.13-omaha-tester-rel"
+    builder: "mac10.13-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.14-omaha-tester-rel"
+  id: "mac10.14-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5931,11 +5931,11 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.14-omaha-tester-rel"
+    builder: "mac10.14-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.15-omaha-tester-rel"
+  id: "mac10.15-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5945,7 +5945,7 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.15-omaha-tester-rel"
+    builder: "mac10.15-updater-tester-rel"
   }
 }
 job {
@@ -6034,16 +6034,6 @@
   }
 }
 job {
-  id: "win-omaha-builder-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "win-omaha-builder-rel"
-  }
-}
-job {
   id: "win-paeverywhere-x64-fyi-dbg"
   realm: "ci"
   acl_sets: "ci"
@@ -6178,6 +6168,16 @@
   }
 }
 job {
+  id: "win-updater-builder-rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-updater-builder-rel"
+  }
+}
+job {
   id: "win-upload-perfetto"
   realm: "ci"
   schedule: "with 3h interval"
@@ -6209,7 +6209,7 @@
   }
 }
 job {
-  id: "win10-omaha-tester-rel"
+  id: "win10-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -6219,7 +6219,7 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "win10-omaha-tester-rel"
+    builder: "win10-updater-tester-rel"
   }
 }
 job {
@@ -6283,7 +6283,7 @@
   }
 }
 job {
-  id: "win7-omaha-tester-rel"
+  id: "win7-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -6293,7 +6293,7 @@
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "win7-omaha-tester-rel"
+    builder: "win7-updater-tester-rel"
   }
 }
 trigger {
@@ -6575,15 +6575,14 @@
   triggers: "mac-hermetic-upgrade-rel"
   triggers: "mac-mojo-rel"
   triggers: "mac-official"
-  triggers: "mac-omaha-builder-rel"
   triggers: "mac-swangle-chromium-x64"
+  triggers: "mac-updater-builder-rel"
   triggers: "metadata-exporter"
   triggers: "win-annotator-rel"
   triggers: "win-archive-dbg"
   triggers: "win-archive-rel"
   triggers: "win-asan"
   triggers: "win-official"
-  triggers: "win-omaha-builder-rel"
   triggers: "win-paeverywhere-x64-fyi-dbg"
   triggers: "win-paeverywhere-x64-fyi-rel"
   triggers: "win-paeverywhere-x86-fyi-dbg"
@@ -6596,6 +6595,7 @@
   triggers: "win-swangle-tot-swiftshader-x86"
   triggers: "win-swangle-x64"
   triggers: "win-swangle-x86"
+  triggers: "win-updater-builder-rel"
   triggers: "win10-code-coverage"
   triggers: "win10-inverse-fieldtrials-fyi-rel"
   triggers: "win32-archive-dbg"
diff --git a/infra/config/lib/ci.star b/infra/config/lib/ci.star
index 0e1f9c7..ba343f1 100644
--- a/infra/config/lib/ci.star
+++ b/infra/config/lib/ci.star
@@ -993,6 +993,17 @@
         **kwargs
     )
 
+def updater_builder(
+        *,
+        name,
+        **kwargs):
+    return ci.builder(
+        name = name,
+        builder_group = "chromium.updater",
+        goma_backend = builders.goma.backend.RBE_PROD,
+        **kwargs
+    )
+
 def win_builder(
         *,
         name,
@@ -1057,5 +1068,6 @@
     swangle_mac_builder = swangle_mac_builder,
     swangle_windows_builder = swangle_windows_builder,
     thin_tester = thin_tester,
+    updater_builder = updater_builder,
     win_builder = win_builder,
 )
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index 6f474892..2a667bf7 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -81,6 +81,7 @@
         "chromium.fuzz",
         "chromium.gpu.fyi",
         "chromium.swangle",
+        "chromium.updater",
     ],
 ) for name, title in (
     ("main", settings.main_console_title),
@@ -336,6 +337,10 @@
 )
 
 ci.console_view(
+    name = "chromium.updater",
+)
+
+ci.console_view(
     name = "chromium.win",
     branch_selector = branches.STANDARD_MILESTONE,
     ordering = {
@@ -2617,8 +2622,8 @@
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.fyi_builder(
-    name = "mac-omaha-builder-rel",
+ci.updater_builder(
+    name = "mac-updater-builder-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "bld",
@@ -2629,62 +2634,62 @@
     cores = None,
 )
 
-ci.fyi_builder(
-    name = "mac10.10-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.10-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.10",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.11-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.11-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.11",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.12-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.12-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.12",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.13-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.13-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.13",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.14-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.14-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.14",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.15-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.15-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.15",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "win-omaha-builder-rel",
+ci.updater_builder(
+    name = "win-updater-builder-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|win",
         short_name = "bld",
@@ -2693,23 +2698,23 @@
     cpu = cpu.X86,
 )
 
-ci.fyi_builder(
-    name = "win7-omaha-tester-rel",
+ci.updater_builder(
+    name = "win7-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|win",
         short_name = "7",
     ),
-    triggered_by = ["win-omaha-builder-rel"],
+    triggered_by = ["win-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "win10-omaha-tester-rel",
+ci.updater_builder(
+    name = "win10-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|win",
         short_name = "10",
     ),
     os = os.WINDOWS_10,
-    triggered_by = ["win-omaha-builder-rel"],
+    triggered_by = ["win-updater-builder-rel"],
 )
 
 ci.fyi_builder(
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 1899d27..bc457044 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -60518,88 +60518,6 @@
       }
     ]
   },
-  "mac10.10-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.10"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.10"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
-  },
-  "mac10.11-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.11"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.11"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
-  },
   "mac10.12-blink-rel-dummy": {
     "isolated_scripts": [
       {
@@ -60634,49 +60552,6 @@
       }
     ]
   },
-  "mac10.12-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "8086:0a2e",
-              "os": "Mac-10.12.6"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "8086:0a2e",
-              "os": "Mac-10.12.6"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
-  },
   "mac10.13-blink-rel-dummy": {
     "isolated_scripts": [
       {
@@ -60712,47 +60587,6 @@
       }
     ]
   },
-  "mac10.13-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.13.6"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.13.6"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
-  },
   "mac10.14-blink-rel-dummy": {
     "isolated_scripts": [
       {
@@ -60787,47 +60621,6 @@
       }
     ]
   },
-  "mac10.14-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.14.6"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.14.6"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
-  },
   "mac10.15-blink-rel-dummy": {
     "isolated_scripts": [
       {
@@ -60863,47 +60656,6 @@
       }
     ]
   },
-  "mac10.15-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.15"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.15"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
-  },
   "mac11.0-blink-rel-dummy": {
     "isolated_scripts": [
       {
@@ -64202,51 +63954,6 @@
       }
     ]
   },
-  "win10-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "integrity": "high",
-              "os": "Windows-10-18363"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "integrity": "high",
-              "os": "Windows-10-18363"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
-  },
   "win7-blink-rel-dummy": {
     "isolated_scripts": [
       {
@@ -64279,50 +63986,5 @@
         "test_id_prefix": "ninja://:blink_web_tests/"
       }
     ]
-  },
-  "win7-omaha-tester-rel": {
-    "gtest_tests": [
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "integrity": "high",
-              "os": "Windows-7-SP1"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "updater_tests",
-        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
-      }
-    ],
-    "isolated_scripts": [
-      {
-        "isolate_name": "updater_integration_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "updater_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "integrity": "high",
-              "os": "Windows-7-SP1"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
-      }
-    ]
   }
 }
diff --git a/testing/buildbot/chromium.updater.json b/testing/buildbot/chromium.updater.json
new file mode 100644
index 0000000..59cec92
--- /dev/null
+++ b/testing/buildbot/chromium.updater.json
@@ -0,0 +1,342 @@
+{
+  "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
+  "AAAAA2 See generate_buildbot_json.py to make changes": {},
+  "mac10.10-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.10"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.10"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  },
+  "mac10.11-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.11"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.11"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  },
+  "mac10.12-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "8086:0a2e",
+              "os": "Mac-10.12.6"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "8086:0a2e",
+              "os": "Mac-10.12.6"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  },
+  "mac10.13-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.13.6"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.13.6"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  },
+  "mac10.14-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.14.6"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.14.6"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  },
+  "mac10.15-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.15"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Mac-10.15"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  },
+  "win10-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "integrity": "high",
+              "os": "Windows-10-18363"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "integrity": "high",
+              "os": "Windows-10-18363"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  },
+  "win7-updater-tester-rel": {
+    "gtest_tests": [
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "integrity": "high",
+              "os": "Windows-7-SP1"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "isolate_name": "updater_integration_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "updater_integration_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "integrity": "high",
+              "os": "Windows-7-SP1"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+      }
+    ]
+  }
+}
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index a19c38c..0d3ee47 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -2616,24 +2616,6 @@
         },
         'use_swarming': False,
       },
-      'mac10.10-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.10',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
-      'mac10.11-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.11',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.12-blink-rel-dummy': {
         'test_suites': {
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
@@ -2648,15 +2630,6 @@
           ],
         },
       },
-      'mac10.12-omaha-tester-rel': {
-        'mixins': [
-            'mac_mini_10.12',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.13-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [
@@ -2674,15 +2647,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'mac10.13-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.13',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.14-blink-rel-dummy': {
         'mixins': [
           'mac_mini_10.14',
@@ -2694,15 +2658,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'mac10.14-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.14',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.15-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [
@@ -2720,15 +2675,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'mac10.15-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.15',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac11.0-blink-rel-dummy': {
         'mixins': [
             'mac_11.0_beta',
@@ -2829,23 +2775,6 @@
           'gtest_tests': 'chromium_win_gtests',
         },
       },
-      'win10-omaha-tester-rel': {
-        'mixins': [
-          'win10',
-          'x86-64',
-          ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-          'isolated_scripts': 'updater_isolated_scripts',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'integrity': 'high',
-            }
-          ]
-        },
-      },
       'win7-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [
@@ -2859,23 +2788,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'win7-omaha-tester-rel': {
-        'mixins': [
-          'win7',
-          'x86-64'
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-          'isolated_scripts': 'updater_isolated_scripts',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'integrity': 'high',
-            }
-          ]
-        },
-      },
     },
   },
   {
@@ -5225,6 +5137,100 @@
     },
   },
   {
+    'name': 'chromium.updater',
+    'mixins': ['chromium-tester-service-account'],
+    'machines': {
+      'mac10.10-updater-tester-rel': {
+        'mixins': [
+            'mac_10.10',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.11-updater-tester-rel': {
+        'mixins': [
+            'mac_10.11',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.12-updater-tester-rel': {
+        'mixins': [
+            'mac_mini_10.12',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.13-updater-tester-rel': {
+        'mixins': [
+            'mac_10.13',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.14-updater-tester-rel': {
+        'mixins': [
+            'mac_10.14',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.15-updater-tester-rel': {
+        'mixins': [
+            'mac_10.15',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'win10-updater-tester-rel': {
+        'mixins': [
+          'win10',
+          'x86-64',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+        'swarming': {
+          'dimension_sets': [
+            {
+              'integrity': 'high',
+            }
+          ]
+        },
+      },
+      'win7-updater-tester-rel': {
+        'mixins': [
+          'win7',
+          'x86-64'
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+        'swarming': {
+          'dimension_sets': [
+            {
+              'integrity': 'high',
+            }
+          ]
+        },
+      },
+    }
+  },
+  {
     'name': 'chromium.webrtc',
     'mixins': ['chromium-tester-service-account'],
     'machines': {
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index e93e9da..8b0a71b 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -311,11 +311,9 @@
       'linux-wpt-payments-fyi-rel': 'release_bot_minimal_symbols',
       'mac-code-coverage': 'clang_code_coverage',
       'mac-hermetic-upgrade-rel': 'release_bot',
-      'mac-omaha-builder-rel': 'updater_release_bot',
       'mac-upload-perfetto': 'release_bot',
       'win-annotator-rel': 'release_bot',
       'win-celab-builder-rel': 'release_bot_minimal_symbols',
-      'win-omaha-builder-rel': 'updater_release_bot',
       'win-paeverywhere-x86-fyi-dbg': 'debug_bot_paeverywhere_x86',
       'win-paeverywhere-x86-fyi-rel': 'release_trybot_paeverywhere_x86',
       'win-paeverywhere-x64-fyi-dbg': 'debug_bot_paeverywhere_x64',
@@ -647,6 +645,11 @@
       'Win V8 FYI Release (NVIDIA)': 'gpu_tests_release_trybot_x86_resource_whitelisting',
     },
 
+    'chromium.updater': {
+      'mac-updater-builder-rel': 'updater_release_bot',
+      'win-updater-builder-rel': 'updater_release_bot',
+    },
+
     # TODO(crbug.com/818301): This master is going away.
     'chromium.webkit': {
       'WebKit Linux Trusty ASAN': 'asan_lsan_release_bot',
diff --git a/tools/mb/mb_config_expectations/chromium.fyi.json b/tools/mb/mb_config_expectations/chromium.fyi.json
index 1bc3a9f..2a787cc2 100644
--- a/tools/mb/mb_config_expectations/chromium.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -689,12 +689,6 @@
       "use_goma": true
     }
   },
-  "mac-omaha-builder-rel": {
-    "gn_args": {
-      "is_debug": false,
-      "is_google_branded": true
-    }
-  },
   "mac-upload-perfetto": {
     "gn_args": {
       "is_component_build": false,
@@ -717,12 +711,6 @@
       "use_goma": true
     }
   },
-  "win-omaha-builder-rel": {
-    "gn_args": {
-      "is_debug": false,
-      "is_google_branded": true
-    }
-  },
   "win-paeverywhere-x64-fyi-dbg": {
     "gn_args": {
       "is_component_build": true,
diff --git a/tools/mb/mb_config_expectations/chromium.updater.json b/tools/mb/mb_config_expectations/chromium.updater.json
new file mode 100644
index 0000000..5d12518
--- /dev/null
+++ b/tools/mb/mb_config_expectations/chromium.updater.json
@@ -0,0 +1,14 @@
+{
+  "mac-updater-builder-rel": {
+    "gn_args": {
+      "is_debug": false,
+      "is_google_branded": true
+    }
+  },
+  "win-updater-builder-rel": {
+    "gn_args": {
+      "is_debug": false,
+      "is_google_branded": true
+    }
+  }
+}
\ No newline at end of file