Remove *variable "Findit" trybots from Chromium

Bug: 877679
Change-Id: If81739c63d63e64801e7a5e1c2e8722c04ed77c7
Reviewed-on: https://chromium-review.googlesource.com/1188979Reviewed-by: Roberto Carrillo <robertocn@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Commit-Queue: Eric Foo <efoo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586427}

PRESUBMIT_test.py

@@ -568,13 +568,6 @@ class TryServerMasterTest(unittest.TestCase):
             'android_archive_rel_ng',
             'android_arm64_dbg_recipe',
             'android_blink_rel',
-            'android_chromium_variable',
-            'android_chromium_variable_archive',
-            'android_chromium_variable_arm64',
-            'android_chromium_variable_cast_shell',
-            'android_chromium_variable_clang',
-            'android_chromium_variable_gn',
-            'android_chromium_variable_nexus4',
             'android_clang_dbg_recipe',
             'android_compile_dbg',
             'android_compile_x64_dbg',

infra/config/global/cr-buildbucket.cfg

@@ -2623,11 +2623,8 @@ buckets {
     builders { mixins: "linux-try" name: "cast_shell_audio_linux" }
     builders { mixins: "linux-try" name: "cast_shell_linux" }
     builders { mixins: "linux-try" name: "chromeos_amd64-generic_chromium_compile_only_ng" }
-    builders { mixins: "linux-try" name: "chromeos_amd64-generic_variable" }
     builders { mixins: "linux-try" name: "chromeos_daisy_chromium_compile_only_ng" }
-    builders { mixins: "linux-try" name: "chromeos_daisy_variable" }
     builders { mixins: "linux-try" name: "chromeos_x86-generic_chromium_compile_only_ng" }
-    builders { mixins: "linux-try" name: "chromeos_x86-generic_variable" }
     builders { mixins: "linux-try" name: "chromium_devtools" }
     builders {
       mixins: "linux-try"
@@ -2682,8 +2679,6 @@ buckets {
       mixins: "goma-j150"
       name: "linux_chromium_asan_rel_ng"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_asan_variable" }
-    builders { mixins: "linux-try" name: "linux_chromium_cast_variable" }
     builders {
       mixins: "linux-try"
       name: "linux_chromium_cfi_rel_ng"
@@ -2694,7 +2689,6 @@ buckets {
       mixins: "goma-j150"
       name: "linux_chromium_chromeos_asan_rel_ng"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_chromeos_asan_variable" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_compile_dbg_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_compile_rel_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_dbg_ng" }
@@ -2703,12 +2697,8 @@ buckets {
       mixins: "goma-j150"
       name: "linux_chromium_chromeos_msan_rel_ng"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_chromeos_msan_variable" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_ozone_rel_ng" }
     builders { mixins: "linux-try" name: "linux_chromium_chromeos_rel_ng" }
-    builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable" }
-    builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable_chrome" }
-    builders { mixins: "linux-try" name: "linux_chromium_chromeos_variable_deflake" }
     builders {
       name: "linux_chromium_clobber_deterministic",
       mixins: "linux-try"
@@ -2726,7 +2716,6 @@ buckets {
     builders { mixins: "linux-try" name: "linux_chromium_dbg_ng" }
     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 {
       mixins: "linux-try"
       mixins: "goma-j150"
@@ -2737,24 +2726,7 @@ buckets {
       mixins: "goma-j150"
       name: "linux_chromium_tsan_rel_ng"
     }
-    builders { mixins: "linux-try" name: "linux_chromium_tsan_variable" }
     builders { mixins: "linux-try" name: "linux_chromium_ubsan_rel_ng" }
-    builders {
-      # TODO(robertocn): remove this builder.
-      mixins: "linux-try"
-      mixins: "findit"
-      name: "linux_chromium_variable"
-      auto_builder_dimension: NO
-    }
-    builders { mixins: "linux-try" name: "linux_chromium_variable_32" }
-    builders { mixins: "linux-try" name: "linux_chromium_variable_chrome" }
-    builders { mixins: "linux-try" name: "linux_chromium_variable_clobber" }
-    builders { mixins: "linux-try" name: "linux_chromium_variable_deflake" }
-    builders { mixins: "linux-try" name: "linux_chromium_webkit_asan_variable" }
-    builders { mixins: "linux-try" name: "linux_chromium_webkit_leak_variable" }
-    builders { mixins: "linux-try" name: "linux_chromium_webkit_msan_variable" }
-    builders { mixins: "linux-try" name: "linux_chromium_webkit_variable" }
-    builders { mixins: "linux-try" name: "linux_chromiumos_full_variable" }
     builders { mixins: "linux-try" name: "linux_layout_tests_layout_ng" }
     builders { mixins: "linux-try" name: "linux_layout_tests_slimming_paint_v2" }
     builders { mixins: "linux-try" name: "linux_mojo" }
@@ -2791,7 +2763,6 @@ buckets {
     builders { mixins: "mac-try" name: "mac_chromium_10.13_rel_ng"}
     builders { mixins: "mac-try" name: "mac_chromium_archive_rel_ng" }
     builders { mixins: "mac-try" name: "mac_chromium_asan_rel_ng" }
-    builders { mixins: "mac-try" name: "mac_chromium_asan_variable" }
     builders {
       mixins: "mac-try"
       mixins: "goma-j150"
@@ -2805,16 +2776,6 @@ buckets {
       mixins: "goma-j150"
       name: "mac_chromium_rel_ng"
     }
-    builders { mixins: "mac-try" name: "mac_chromium_variable" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_10.10" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_10.10_layout" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_10.11" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_10.11_layout" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_10.12" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_archive" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_chrome" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_deflake" }
-    builders { mixins: "mac-try" name: "mac_chromium_variable_layout" }
     builders { mixins: "mac-try" name: "mac-cocoa-rel" }
     builders {
       mixins: "mac-optional-gpu-try"
@@ -2868,39 +2829,15 @@ buckets {
       execution_timeout_secs: 14400 # 4h
     }
     builders { mixins: "win-try" name: "win_chromium_syzyasan_rel" }
-    builders { mixins: "win-try" name: "win_chromium_variable" }
-    builders { mixins: "win-try" name: "win_chromium_variable_archive" }
-    builders { mixins: "win-try" name: "win_chromium_variable_chrome" }
-    builders { mixins: "win-try" name: "win_chromium_variable_clang" }
-    builders { mixins: "win-try" name: "win_chromium_variable_deflake" }
-    builders { mixins: "win-try" name: "win_chromium_variable_webkit_builder" }
-    builders { mixins: "win-try" name: "win_chromium_variable_webkit_win7_builder" }
-    builders { mixins: "win-try" name: "win_chromium_variable_webkit_win7_builder_x64" }
     builders { mixins: "win-try" name: "win_chromium_x64_rel_ng" }
     builders { mixins: "win-try" name: "win_mojo" }
     builders { mixins: "win-optional-gpu-try" name: "win_optional_gpu_tests_rel" }
     builders { mixins: "win-try" mixins: "upload_clang" name: "win_upload_clang" }
     builders { mixins: "win-try" name: "win_x64_archive" }
-    builders { mixins: "win-try" name: "win_x64_chromium_variable_builder" }
     ############################################################################
     # This Section of luci.chromium.try is managed by luci-check
     # If builders require customization, please move it above this section
     ############################################################################
-    builders {
-      name: "android_chromium_variable_clang"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
-    builders {
-      name: "android_chromium_variable_deflake"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
-    builders {
-      name: "android_chromium_variable_archive"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
     builders {
       name: "android_compile_x86_dbg"
       dimensions: "os:Ubuntu-14.04"
@@ -2936,11 +2873,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
     }
-    builders {
-      name: "android_chromium_variable_nexus4"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
     builders {
       name: "android_compile_x64_dbg"
       dimensions: "os:Ubuntu-14.04"
@@ -2956,16 +2888,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
     }
-    builders {
-      name: "android_chromium_variable_cast_shell"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
-    builders {
-      name: "android_chromium_variable_arm64"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
     builders {
       name: "layout_test_leak_detection"
       dimensions: "os:Ubuntu-14.04"
@@ -2987,11 +2909,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
     }
-    builders {
-      name: "android_chromium_variable"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
     ############################################################################
     # End luci-check managed section
     ############################################################################

infra/config/global/luci-milo.cfg

@@ -3894,27 +3894,6 @@ consoles {
   builders {
     name: "buildbot/tryserver.chromium.android/android_cfi_rel_ng"
   }
-  builders {
-    name: "buildbot/tryserver.chromium.android/android_chromium_variable"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.android/android_chromium_variable_archive"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.android/android_chromium_variable_arm64"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.android/android_chromium_variable_cast_shell"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.android/android_chromium_variable_clang"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.android/android_chromium_variable_deflake"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.android/android_chromium_variable_nexus4"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/android_clang_dbg_recipe"
   }
@@ -4189,9 +4168,6 @@ consoles {
   builders {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_asan_rel_ng"
   }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_asan_variable"
-  }
   builders {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_compile_dbg_ng"
   }
@@ -4204,39 +4180,9 @@ consoles {
   builders {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_rel_ng"
   }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_10.10"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_10.10_layout"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_10.11"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_10.11_layout"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_10.12"
-  }
   builders {
     name: "buildbot/tryserver.chromium.mac/mac_chromium_10.13_rel_ng"
   }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_archive"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_chrome"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_deflake"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.mac/mac_chromium_variable_layout"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac-cocoa-rel"
   }
@@ -4329,30 +4275,6 @@ consoles {
   builders {
     name: "buildbot/tryserver.chromium.win/win_chromium_dbg_ng"
   }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable_archive"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable_chrome"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable_clang"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable_deflake"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable_webkit_builder"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable_webkit_win7_builder"
-  }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_chromium_variable_webkit_win7_builder_x64"
-  }
   builders {
     name: "buildbot/tryserver.chromium.win/win_chromium_x64_rel_ng"
   }
@@ -4368,9 +4290,6 @@ consoles {
   builders {
     name: "buildbot/tryserver.chromium.win/win_x64_archive"
   }
-  builders {
-    name: "buildbot/tryserver.chromium.win/win_x64_chromium_variable_builder"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/win-annotator-rel"
   }
@@ -4557,21 +4476,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/chromeos_amd64-generic_chromium_compile_only_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/chromeos_amd64-generic_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/chromeos_daisy_chromium_compile_only_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/chromeos_daisy_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/chromeos_x86-generic_chromium_compile_only_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/chromeos_x86-generic_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/chromium_devtools"
   }
@@ -4659,21 +4569,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_asan_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_asan_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_cast_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_cfi_rel_ng"
   }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_asan_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_asan_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_compile_dbg_ng"
   }
@@ -4686,24 +4587,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_ozone_rel_ng"
   }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_variable_chrome"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_variable_deflake"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_clobber_deterministic"
   }
@@ -4734,51 +4623,15 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_msan_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_msan_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_rel_ng"
   }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_tsan_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_tsan_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_ubsan_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_variable_32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_variable_chrome"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_variable_clobber"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_variable_deflake"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_webkit_asan_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_webkit_leak_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_webkit_msan_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_webkit_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromiumos_full_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_layout_tests_layout_ng"
   }
@@ -4848,9 +4701,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_asan_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_asan_variable"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_compile_dbg_ng"
   }
@@ -4863,36 +4713,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_10.10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_10.10_layout"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_10.11"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_10.11_layout"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_10.12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_archive"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_chrome"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_deflake"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_variable_layout"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
   }
@@ -4953,30 +4773,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win_chromium_syzyasan_rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable_archive"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable_chrome"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable_clang"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable_deflake"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable_webkit_builder"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable_webkit_win7_builder"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_chromium_variable_webkit_win7_builder_x64"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/win_chromium_x64_rel_ng"
   }
@@ -4992,8 +4788,5 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win_x64_archive"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/win_x64_chromium_variable_builder"
-  }
   builder_view_only: true
 }