infra: Remove kevin tester from beta & stable branches.

The devices they run on are continuously flashed to CrOS ToT, so running
branched Chrome on ToT CrOS can cause issues.

So this removes all CrOS HW tests from the branch builders. VM tests
will still run, and CrOS CI will still have CrOS-branch testing done.

Bug: 1097132
Change-Id: Ica19d0180baff979ac82fc68ad8947e94d0aee57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2254703Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780911}

infra/config/generated/commit-queue.cfg

@@ -1409,15 +1409,6 @@ config_groups {
       builders {
         name: "chromium/try-m83/chromeos-arm-generic-rel"
       }
-      builders {
-        name: "chromium/try-m83/chromeos-kevin-compile-rel"
-        location_regexp: ".+/[+]/chromeos/CHROMEOS_LKGM"
-      }
-      builders {
-        name: "chromium/try-m83/chromeos-kevin-rel"
-        location_regexp: ".+/[+]/build/chromeos/.+"
-        location_regexp: ".+/[+]/build/config/chromeos/.*"
-      }
       builders {
         name: "chromium/try-m83/chromium_presubmit"
         disable_reuse: true
@@ -1781,15 +1772,6 @@ config_groups {
       builders {
         name: "chromium/try-m84/chromeos-arm-generic-rel"
       }
-      builders {
-        name: "chromium/try-m84/chromeos-kevin-compile-rel"
-        location_regexp: ".+/[+]/chromeos/CHROMEOS_LKGM"
-      }
-      builders {
-        name: "chromium/try-m84/chromeos-kevin-rel"
-        location_regexp: ".+/[+]/build/chromeos/.+"
-        location_regexp: ".+/[+]/build/config/chromeos/.*"
-      }
       builders {
         name: "chromium/try-m84/chromium_presubmit"
         disable_reuse: true

infra/config/generated/cr-buildbucket.cfg

@@ -10031,7 +10031,6 @@ buckets {
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.chromiumos\""
@@ -14810,38 +14809,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "chromeos-kevin-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      recipe {
-        name: "chromium"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
-        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
-        properties_j: "mastername:\"chromium.chromiumos\""
-      }
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "fuchsia-arm64-cast"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17500,38 +17467,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "chromeos-kevin-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      recipe {
-        name: "chromium"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
-        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
-        properties_j: "mastername:\"chromium.chromiumos\""
-      }
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "fuchsia-arm64-cast"
       swarming_host: "chromium-swarm.appspot.com"
@@ -30587,84 +30522,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "chromeos-kevin-compile-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      recipe {
-        name: "chromium_trybot"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
-        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
-        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      }
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-      }
-    }
-    builders {
-      name: "chromeos-kevin-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      recipe {
-        name: "chromium_trybot"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
-        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
-        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      }
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "chromium_presubmit"
       swarming_host: "chromium-swarm.appspot.com"
@@ -32655,84 +32512,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "chromeos-kevin-compile-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      recipe {
-        name: "chromium_trybot"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
-        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
-        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      }
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-      }
-    }
-    builders {
-      name: "chromeos-kevin-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      recipe {
-        name: "chromium_trybot"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
-        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
-        properties_j: "mastername:\"tryserver.chromium.chromiumos\""
-      }
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "chromium_presubmit"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -924,11 +924,6 @@ consoles {
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci-m83/chromeos-kevin-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "kvn"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci-m83/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
@@ -1601,11 +1596,6 @@ consoles {
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci-m84/chromeos-kevin-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "kvn"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci-m84/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
@@ -2278,11 +2268,6 @@ consoles {
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "kvn"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
@@ -2959,11 +2944,6 @@ consoles {
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci-m83/chromeos-kevin-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "kvn"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci-m83/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
@@ -3636,11 +3616,6 @@ consoles {
     category: "chromium.chromiumos|simple|release"
     short_name: "arm"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci-m84/chromeos-kevin-rel"
-    category: "chromium.chromiumos|simple|release"
-    short_name: "kvn"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci-m84/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
@@ -4680,12 +4655,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try-m83/chromeos-arm-generic-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try-m83/chromeos-kevin-compile-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try-m83/chromeos-kevin-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try-m83/chromium_presubmit"
   }
@@ -4841,12 +4810,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try-m84/chromeos-arm-generic-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try-m84/chromeos-kevin-compile-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.try-m84/chromeos-kevin-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try-m84/chromium_presubmit"
   }

infra/config/generated/luci-scheduler.cfg

@@ -8996,15 +8996,6 @@ job {
     builder: "chromeos-arm-generic-rel"
   }
 }
-job {
-  id: "ci-m83-chromeos-kevin-rel"
-  acl_sets: "ci-m83"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-m83"
-    builder: "chromeos-kevin-rel"
-  }
-}
 job {
   id: "ci-m83-fuchsia-arm64-cast"
   acl_sets: "ci-m83"
@@ -9920,15 +9911,6 @@ job {
     builder: "chromeos-arm-generic-rel"
   }
 }
-job {
-  id: "ci-m84-chromeos-kevin-rel"
-  acl_sets: "ci-m84"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-m84"
-    builder: "chromeos-kevin-rel"
-  }
-}
 job {
   id: "ci-m84-fuchsia-arm64-cast"
   acl_sets: "ci-m84"
@@ -11254,7 +11236,6 @@ trigger {
   triggers: "ci-m83-chromeos-amd64-generic-dbg"
   triggers: "ci-m83-chromeos-amd64-generic-rel"
   triggers: "ci-m83-chromeos-arm-generic-rel"
-  triggers: "ci-m83-chromeos-kevin-rel"
   triggers: "ci-m83-fuchsia-arm64-cast"
   triggers: "ci-m83-fuchsia-x64-cast"
   triggers: "ci-m83-ios-simulator"
@@ -11304,7 +11285,6 @@ trigger {
   triggers: "ci-m84-chromeos-amd64-generic-dbg"
   triggers: "ci-m84-chromeos-amd64-generic-rel"
   triggers: "ci-m84-chromeos-arm-generic-rel"
-  triggers: "ci-m84-chromeos-kevin-rel"
   triggers: "ci-m84-fuchsia-arm64-cast"
   triggers: "ci-m84-fuchsia-x64-cast"
   triggers: "ci-m84-ios-simulator"
@@ -11527,7 +11507,7 @@ trigger {
   triggers: "ci-chromeos-amd64-generic-rel"
   triggers: "chromeos-arm-generic-dbg"
   triggers: "ci-chromeos-arm-generic-rel"
-  triggers: "ci-chromeos-kevin-rel"
+  triggers: "chromeos-kevin-rel"
   triggers: "ci-fuchsia-arm64-cast"
   triggers: "fuchsia-fyi-arm64-rel"
   triggers: "fuchsia-fyi-x64-dbg"

infra/config/subprojects/chromium/ci.star

@@ -473,14 +473,6 @@ ci.chromiumos_builder(
     ),
 )
 
-ci.chromiumos_builder(
-    name = 'chromeos-kevin-rel',
-    console_view_entry = ci.console_view_entry(
-        category = 'simple|release',
-        short_name = 'kvn',
-    ),
-)
-
 ci.chromiumos_builder(
     name = 'linux-chromeos-dbg',
     console_view_entry = ci.console_view_entry(

infra/config/subprojects/chromium/master-only/ci.star

@@ -551,6 +551,15 @@ ci.chromiumos_builder(
     ),
 )
 
+ci.chromiumos_builder(
+    name = 'chromeos-kevin-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|release',
+        short_name = 'kvn',
+    ),
+    main_console_view = 'main',
+)
+
 
 ci.clang_builder(
     name = 'CFI Linux CF',

infra/config/subprojects/chromium/master-only/try.star

@@ -273,6 +273,27 @@ try_.chromium_chromiumos_builder(
     name = 'chromeos-arm-generic-dbg',
 )
 
+try_.chromium_chromiumos_builder(
+    name = 'chromeos-kevin-compile-rel',
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/chromeos/CHROMEOS_LKGM',
+        ],
+    ),
+    main_list_view = 'try'
+)
+
+try_.chromium_chromiumos_builder(
+    name = 'chromeos-kevin-rel',
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/build/chromeos/.+',
+            '.+/[+]/build/config/chromeos/.*',
+        ],
+    ),
+    main_list_view = 'try',
+)
+
 try_.chromium_chromiumos_builder(
     name = 'linux-chromeos-dbg',
 )

infra/config/subprojects/chromium/try.star

@@ -201,25 +201,6 @@ try_.chromium_chromiumos_builder(
     tryjob = try_.job(),
 )
 
-try_.chromium_chromiumos_builder(
-    name = 'chromeos-kevin-compile-rel',
-    tryjob = try_.job(
-        location_regexp = [
-            '.+/[+]/chromeos/CHROMEOS_LKGM',
-        ],
-    ),
-)
-
-try_.chromium_chromiumos_builder(
-    name = 'chromeos-kevin-rel',
-    tryjob = try_.job(
-        location_regexp = [
-            '.+/[+]/build/chromeos/.+',
-            '.+/[+]/build/config/chromeos/.*',
-        ],
-    ),
-)
-
 try_.chromium_chromiumos_builder(
     name = 'linux-chromeos-compile-dbg',
     tryjob = try_.job(),

infra/config/subprojects/chromium/versioned/m83/buckets/ci.star

@@ -226,14 +226,6 @@ ci.chromiumos_builder(
     ),
 )
 
-ci.chromiumos_builder(
-    name = 'chromeos-kevin-rel',
-    console_view_entry = ci.console_view_entry(
-        category = 'simple|release',
-        short_name = 'kvn',
-    ),
-)
-
 ci.chromiumos_builder(
     name = 'linux-chromeos-dbg',
     console_view_entry = ci.console_view_entry(

infra/config/subprojects/chromium/versioned/m83/buckets/try.star

@@ -162,25 +162,6 @@ try_.chromium_chromiumos_builder(
     tryjob = try_.job(),
 )
 
-try_.chromium_chromiumos_builder(
-    name = 'chromeos-kevin-compile-rel',
-    tryjob = try_.job(
-        location_regexp = [
-            '.+/[+]/chromeos/CHROMEOS_LKGM',
-        ],
-    ),
-)
-
-try_.chromium_chromiumos_builder(
-    name = 'chromeos-kevin-rel',
-    tryjob = try_.job(
-        location_regexp = [
-            '.+/[+]/build/chromeos/.+',
-            '.+/[+]/build/config/chromeos/.*',
-        ],
-    ),
-)
-
 try_.chromium_chromiumos_builder(
     name = 'linux-chromeos-compile-dbg',
     tryjob = try_.job(),

infra/config/subprojects/chromium/versioned/m84/buckets/ci.star

@@ -226,14 +226,6 @@ ci.chromiumos_builder(
     ),
 )
 
-ci.chromiumos_builder(
-    name = 'chromeos-kevin-rel',
-    console_view_entry = ci.console_view_entry(
-        category = 'simple|release',
-        short_name = 'kvn',
-    ),
-)
-
 ci.chromiumos_builder(
     name = 'linux-chromeos-dbg',
     console_view_entry = ci.console_view_entry(

infra/config/subprojects/chromium/versioned/m84/buckets/try.star

@@ -197,25 +197,6 @@ try_.chromium_chromiumos_builder(
     tryjob = try_.job(),
 )
 
-try_.chromium_chromiumos_builder(
-    name = 'chromeos-kevin-compile-rel',
-    tryjob = try_.job(
-        location_regexp = [
-            '.+/[+]/chromeos/CHROMEOS_LKGM',
-        ],
-    ),
-)
-
-try_.chromium_chromiumos_builder(
-    name = 'chromeos-kevin-rel',
-    tryjob = try_.job(
-        location_regexp = [
-            '.+/[+]/build/chromeos/.+',
-            '.+/[+]/build/config/chromeos/.*',
-        ],
-    ),
-)
-
 try_.chromium_chromiumos_builder(
     name = 'linux-chromeos-compile-dbg',
     tryjob = try_.job(),