Clean up configs from .*chromium.chromiumos CQ migration.

Also clean up some other migrated builders.

BUG=793905,793907,793908,793914,793944,793913

Change-Id: I0a047112e0cf319bb00ad45f2c8441d96060ca67
Reviewed-on: https://chromium-review.googlesource.com/1056467Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Jao-ke Chin-Lee <jchinlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558386}

infra/config/branch/cq.cfg

@@ -34,10 +34,13 @@ verifiers {
       builders { name: "android_arm64_dbg_recipe" }
       builders { name: "android_cronet" }
       builders { name: "cast_shell_linux" }
+      builders { name: "chromeos-amd64-generic-rel" }
+      builders { name: "chromeos-daisy-rel" }
       builders { name: "chromium_presubmit" }
       builders { name: "fuchsia_arm64" }
       builders { name: "fuchsia_x64" }
       builders { name: "ios-simulator" }
+      builders { name: "linux-chromeos-rel" }
       builders { name: "linux-ozone-rel" }
       builders { name: "linux_chromium_compile_dbg_ng" }
       builders { name: "linux_chromium_asan_rel_ng" }
@@ -71,21 +74,6 @@ verifiers {
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
     }
-    buckets {
-      name: "master.tryserver.chromium.chromiumos"
-      builders {
-        name: "chromeos-amd64-generic-rel"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
-      builders {
-        name: "chromeos-daisy-rel"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
-      builders {
-        name: "linux-chromeos-rel"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
-    }
     buckets {
       name: "master.tryserver.chromium.linux"
       builders {

infra/config/global/luci-milo.cfg

@@ -335,7 +335,6 @@ consoles {
     short_name: "32"
   }
   builders {
-    name: "buildbot/chromium.win/Win x64 Builder"
     name: "buildbucket/luci.chromium.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
     short_name: "64"
@@ -353,13 +352,11 @@ consoles {
     short_name: "32"
   }
   builders {
-    name: "buildbot/chromium.win/Win 7 Tests x64 (1)"
     name: "buildbucket/luci.chromium.ci/Win 7 Tests x64 (1)"
     category: "chromium.win|release|tester"
     short_name: "64"
   }
   builders {
-    name: "buildbot/chromium.win/Win10 Tests x64"
     name: "buildbucket/luci.chromium.ci/Win10 Tests x64"
     category: "chromium.win|release|tester"
     short_name: "w10"
@@ -370,13 +367,11 @@ consoles {
     short_name: "64"
   }
   builders {
-    name: "buildbot/chromium.win/Win Builder (dbg)"
     name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
     category: "chromium.win|debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbot/chromium.win/Win7 Tests (dbg)(1)"
     name: "buildbucket/luci.chromium.ci/Win7 Tests (dbg)(1)"
     category: "chromium.win|debug|tester"
     short_name: "7"
@@ -542,7 +537,6 @@ consoles {
     short_name: "ful"
   }
   builders {
-    name: "buildbot/chromium.chromiumos/linux-chromeos-rel"
     name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
@@ -553,13 +547,11 @@ consoles {
     short_name: "dbg"
   }
   builders {
-    name: "buildbot/chromium.chromiumos/chromeos-amd64-generic-rel"
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "x64"
   }
   builders {
-    name: "buildbot/chromium.chromiumos/chromeos-daisy-rel"
     name: "buildbucket/luci.chromium.ci/chromeos-daisy-rel"
     category: "chromium.chromiumos|simple|release"
     short_name: "dsy"
@@ -585,31 +577,26 @@ consoles {
     short_name: "cro"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux TSan Builder"
     name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux TSan Tests"
     name: "buildbucket/luci.chromium.ci/Linux TSan Tests"
     category: "chromium.memory|linux|TSan v2"
     short_name: "tst"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux ASan LSan Builder"
     name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
     category: "chromium.memory|linux|asan lsan"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux ASan LSan Tests (1)"
     name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "tst"
   }
   builders {
-    name: "buildbot/chromium.memory/Linux ASan Tests (sandboxed)"
     name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
@@ -1609,36 +1596,6 @@ consoles {
     category: "win|release|tester|7|(1)"
     short_name: "(ಥ_ಥ)"
   }
-  builders {
-    name: "buildbot/chromium.memory/Linux ASan LSan Builder"
-    category: "chromium.memory|asan|builder"
-    short_name: "bb"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Builder"
-    category: "chromium.memory|asan|builder"
-    short_name: "ci"
-  }
-  builders {
-    name: "buildbot/chromium.memory/Linux ASan LSan Tests (1)"
-    category: "chromium.memory|asan|tester"
-    short_name: "bb"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Linux ASan LSan Tests (1)"
-    category: "chromium.memory|asan|tester"
-    short_name: "ci"
-  }
-  builders {
-    name: "buildbot/chromium.memory/Linux ASan Tests (sandboxed)"
-    category: "chromium.memory|asan|tester|sandbox"
-    short_name: "bb"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Linux ASan Tests (sandboxed)"
-    category: "chromium.memory|asan|tester|sandbox"
-    short_name: "ci"
-  }
   builders {
     name: "buildbot/chromium.fyi/Headless Linux (dbg)"
     category: "chromium.fyi|linux|debug"
@@ -1739,36 +1696,6 @@ consoles {
     category: "android|builder|arm|tester|32"
     short_name: "bb"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
-    category: "cros|rel"
-    short_name: "ᕕ(ᐛ)ᕗ"
-  }
-  builders {
-    name: "buildbot/chromium.chromiumos/linux-chromeos-rel"
-    category: "cros|rel"
-    short_name: "(ಥ_ಥ)"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
-    category: "cros|simple|x64"
-    short_name: "ᕕ(ᐛ)ᕗ"
-  }
-  builders {
-    name: "buildbot/chromium.chromiumos/chromeos-amd64-generic-rel"
-    category: "cros|simple|x64"
-    short_name: "(ಥ_ಥ)"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/chromeos-daisy-rel"
-    category: "cros|simple|dsy"
-    short_name: "ᕕ(ᐛ)ᕗ"
-  }
-  builders {
-    name: "buildbot/chromium.chromiumos/chromeos-daisy-rel"
-    category: "cros|simple|dsy"
-    short_name: "(ಥ_ಥ)"
-  }
   include_experimental_builds: true
 }
 
@@ -4135,11 +4062,9 @@ consoles {
   manifest_name: "REVISION"
   builders {
     name: "buildbot/tryserver.chromium.chromiumos/chromeos-amd64-generic-rel"
-    name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-rel"
   }
   builders {
     name: "buildbot/tryserver.chromium.chromiumos/chromeos-daisy-rel"
-    name: "buildbucket/luci.chromium.try/chromeos-daisy-rel"
   }
   builders {
     name: "buildbot/tryserver.chromium.chromiumos/linux-chromeos-compile-dbg"
@@ -4149,7 +4074,6 @@ consoles {
   }
   builders {
     name: "buildbot/tryserver.chromium.chromiumos/linux-chromeos-rel"
-    name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
   }
   builder_view_only: true
 }
@@ -4677,7 +4601,10 @@ consoles {
     name: "buildbucket/luci.chromium.try/cast_shell_linux"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/chromeos_amd64-generic_chromium_compile_only_ng"
+    name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/chromeos-daisy-rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/chromeos_amd64-generic_chromium_compile_only_ng"
@@ -4718,6 +4645,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-blink-heap-verification-try"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-jumbo-rel"
   }