luci: clean up after recent migrations.

Bug: 731436,805257,824593,824594,826895
Change-Id: I93d5a5fb56be9161211e7cd0ba58876d4c702b19
Reviewed-on: https://chromium-review.googlesource.com/1041527Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556067}

infra/config/branch/cq.cfg

@@ -31,21 +31,22 @@ verifiers {
   try_job {
     buckets {
       name: "luci.chromium.try"
+      builders { name: "android_arm64_dbg_recipe" }
+      builders { name: "android_cronet" }
       builders { name: "cast_shell_linux" }
       builders { name: "chromium_presubmit" }
       builders { name: "fuchsia_arm64" }
+      builders { name: "fuchsia_x64" }
+      builders { name: "linux-ozone-rel" }
       builders { name: "linux_chromium_compile_dbg_ng" }
       builders { name: "linux_chromium_rel_ng" }
+      builders { name: "linux_chromium_tsan_rel_ng" }
       builders { name: "mac_chromium_compile_dbg_ng" }
       builders { name: "mac_chromium_rel_ng" }
       builders { name: "win_chromium_compile_dbg_ng" }
     }
     buckets {
       name: "master.tryserver.chromium.android"
-      builders {
-        name: "android_arm64_dbg_recipe"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
       builders {
         name: "android_clang_dbg_recipe"
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
@@ -54,10 +55,6 @@ verifiers {
         name: "android_compile_dbg"
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
-      builders {
-        name: "android_cronet"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
       builders {
         name: "android_n5x_swarming_rel"
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
@@ -88,26 +85,14 @@ verifiers {
     }
     buckets {
       name: "master.tryserver.chromium.linux"
-      builders {
-        name: "fuchsia_x64"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
       builders {
         name: "linux_chromium_asan_rel_ng"
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
-      builders {
-        name: "linux_chromium_ozone_compile_only_ng"
-        equivalent_to { bucket: "luci.chromium.try" builder: "linux-ozone-rel" percentage: 100 }
-      }
       builders {
         name: "linux_chromium_headless_rel"
         equivalent_to { bucket: "luci.chromium.try" percentage: 0 }
       }
-      builders {
-        name: "linux_chromium_tsan_rel_ng"
-        equivalent_to { bucket: "luci.chromium.try" percentage: 100 }
-      }
     }
     buckets {
       name: "master.tryserver.chromium.mac"

infra/config/global/cr-buildbucket.cfg

@@ -1347,17 +1347,6 @@ buckets {
     builders { mixins: "linux-try" name: "linux_chromium_headless_rel" }
     builders { mixins: "linux-try" name: "linux_chromium_msan_rel_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_msan_variable" }
-    builders {
-      # TODO(jbudorick): Remove this in favor of linux-ozone-rel once
-      # the bot has been fully migrated to LUCI.
-      mixins: "linux-try"
-      name: "linux_chromium_ozone_compile_only_ng"
-      auto_builder_dimension: NO
-      dimensions: "builder:linux-ozone-rel"
-      recipe {
-        properties: "buildername:linux-ozone-rel"
-      }
-    }
     builders {
       mixins: "linux-try"
       mixins: "goma-j150"

infra/config/global/luci-milo.cfg

@@ -400,7 +400,6 @@ consoles: {
     short_name: "tst"
   }
   builders: {
-    name: "buildbot/chromium.linux/linux-gcc-rel"
     name: "buildbucket/luci.chromium.ci/linux-gcc-rel"
     category: "chromium.linux|release"
     short_name: "gcc"
@@ -474,7 +473,6 @@ consoles: {
     short_name: "x64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Ozone Linux"
     name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
     category: "chromium.linux|ozone"
     short_name: "bld"
@@ -877,7 +875,6 @@ consoles: {
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.linux/linux-gcc-rel"
     name: "buildbucket/luci.chromium.ci/linux-gcc-rel"
     category: "release"
     short_name: "gcc"
@@ -955,7 +952,6 @@ consoles: {
     short_name: "x64"
   }
   builders: {
-    name: "buildbot/chromium.linux/Ozone Linux"
     name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
     category: "ozone"
     short_name: "bld"
@@ -1480,17 +1476,6 @@ consoles: {
     short_name: "bb"
   }
 
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-gcc-rel"
-    category: "linux|gcc"
-    short_name: "ci"
-  }
-  builders {
-    name: "buildbot/chromium.linux/linux-gcc-rel"
-    category: "linux|gcc"
-    short_name: "bb"
-  }
-
   builders {
     name: "buildbucket/luci.chromium.ci/Leak Detection Linux"
     category: "linux|leak"
@@ -1502,17 +1487,6 @@ consoles: {
     short_name: "bb"
   }
 
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
-    category: "linux|ozone"
-    short_name: "ci"
-  }
-  builders {
-    name: "buildbot/chromium.linux/Ozone Linux"
-    category: "linux|ozone"
-    short_name: "bb"
-  }
-
   builders: {
     name: "buildbucket/luci.chromium.ci/Win Builder"
     category: "win|release|builder|32"
@@ -4021,7 +3995,6 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_msan_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux_chromium_ozone_compile_only_ng"
     name: "buildbucket/luci.chromium.try/linux-ozone-rel"
   }
   builders: {
@@ -4031,7 +4004,6 @@ consoles: {
     name: "buildbot/tryserver.chromium.linux/linux_chromium_ubsan_rel_ng"
   }
   builders: {
-    name: "buildbot/tryserver.chromium.linux/linux-gcc-rel"
     name: "buildbucket/luci.chromium.try/linux-gcc-rel"
   }
   builders: {

testing/buildbot/chromium.linux.json

@@ -2672,19 +2672,6 @@
       }
     ]
   },
-  "Ozone Linux": {
-    "additional_compile_targets": [
-      "chrome"
-    ],
-    "gtest_tests": [
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "services_unittests"
-      }
-    ]
-  },
   "linux-gcc-rel": {
     "additional_compile_targets": [
       "empty_main"

testing/buildbot/waterfalls.pyl

@@ -1497,14 +1497,6 @@
           'isolated_scripts': 'chromium_linux_dbg_isolated_scripts',
         },
       },
-      'Ozone Linux': {
-        'additional_compile_targets': [
-          'chrome',
-        ],
-        'test_suites': {
-          'gtest_tests': 'ozone_linux_gtests',
-        },
-      },
       'linux-gcc-rel': {
         'additional_compile_targets': [
           'empty_main',

tools/mb/mb_config.pyl

@@ -340,7 +340,6 @@
       'Fuchsia ARM64': 'release_bot_fuchsia_arm64',
       'Fuchsia x64 Cast Audio': 'release_bot_fuchsia_cast_audio',
       'Fuchsia x64': 'release_bot_fuchsia',
-      'Ozone Linux': 'ozone_linux_release_bot',
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
       'linux-ozone-rel': 'ozone_linux_release_bot',
     },
@@ -634,7 +633,6 @@
       # on the continuous builder.
       'linux_chromium_msan_rel_ng': 'msan_release_bot',
 
-      'linux_chromium_ozone_compile_only_ng': 'ozone_linux_release_trybot_compile_only',
       'linux_chromium_rel_ng': 'gpu_tests_release_trybot_no_symbols',
       'linux_chromium_tsan_rel_ng': 'tsan_disable_nacl_release_trybot',
       'linux_layout_tests_layout_ng': 'release_trybot',
@@ -1456,10 +1454,6 @@
       'ozone_linux', 'release_trybot',
     ],
 
-    'ozone_linux_release_trybot_compile_only': [
-      'ozone_linux', 'release_trybot', 'compile_only',
-    ],
-
     'presubmit': [
       # The chromium_presubmit bot does not use mb.
       'error',