Create a new bucket luci.chromium.codesearch and add trybots

For the following OSes: android, chromiumos, fuchsia, linux, and win.
And remove the change in luci.chromium.try

Bug: 1098927
Change-Id: I6a547e24c645128e3bef5368cf8117269dd0de47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2286191Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#789665}

infra/config/generated/commit-queue.cfg

@@ -137,6 +137,26 @@ config_groups {
         owner_whitelist_group: "googlers"
         owner_whitelist_group: "project-chromium-robot-committers"
       }
+      builders {
+        name: "chromium/codesearch/gen-android-try"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/codesearch/gen-chromiumos-try"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/codesearch/gen-fuchsia-try"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/codesearch/gen-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/codesearch/gen-win-try"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/android-10-arm64-rel"
         includable_only: true
@@ -400,10 +420,6 @@ config_groups {
         name: "chromium/try/closure_compilation"
         location_regexp: ".+/[+]/third_party/closure_compiler/.+"
       }
-      builders {
-        name: "chromium/try/codesearch-gen-chromium-win-try"
-        includable_only: true
-      }
       builders {
         name: "chromium/try/dawn-linux-x64-deps-rel"
         location_regexp: ".+/[+]/gpu/.+"

infra/config/generated/cr-buildbucket.cfg

@@ -16911,6 +16911,192 @@ buckets {
     }
   }
 }
+buckets {
+  name: "codesearch"
+  acls {
+    role: WRITER
+    group: "service-account-chromium-tryserver"
+  }
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-chromium-tryjob-access"
+  }
+  swarming {
+    builders {
+      name: "gen-android-try"
+      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"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"mastername\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      execution_timeout_secs: 32400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gen-chromiumos-try"
+      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"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"mastername\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      execution_timeout_secs: 32400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gen-fuchsia-try"
+      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"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"mastername\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      execution_timeout_secs: 32400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gen-linux-try"
+      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"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"mastername\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      execution_timeout_secs: 32400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "gen-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"mastername\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
+      execution_timeout_secs: 32400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+      }
+    }
+  }
+}
 buckets {
   name: "findit"
   acls {
@@ -20826,43 +21012,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "codesearch-gen-chromium-win-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "luciexe"
-      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"mastername\":\"tryserver.chromium.codesearch\",\"recipe\":\"chromium_codesearch\"}"
-      execution_timeout_secs: 32400
-      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: "dawn-linux-x64-deps-rel"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -14614,6 +14614,26 @@ consoles {
     tree_status_host: "chromium-status.appspot.com"
   }
 }
+consoles {
+  id: "luci.chromium.codesearch"
+  name: "luci.chromium.codesearch"
+  builders {
+    name: "buildbucket/luci.chromium.codesearch/gen-android-try"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.codesearch/gen-chromiumos-try"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.codesearch/gen-fuchsia-try"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.codesearch/gen-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.codesearch/gen-win-try"
+  }
+  builder_view_only: true
+}
 consoles {
   id: "luci.chromium.goma"
   name: "luci.chromium.goma"
@@ -15043,9 +15063,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/closure_compilation"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/codesearch-gen-chromium-win-try"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia-angle-rel"
   }
@@ -15812,9 +15829,6 @@ consoles {
 consoles {
   id: "tryserver.chromium.codesearch"
   name: "tryserver.chromium.codesearch"
-  builders {
-    name: "buildbucket/luci.chromium.try/codesearch-gen-chromium-win-try"
-  }
   builder_view_only: true
 }
 consoles {

infra/config/generated/realms.cfg

@@ -89,6 +89,25 @@ realms {
     principals: "group:project-chromium-ci-schedulers"
   }
 }
+realms {
+  name: "codesearch"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.owner"
+    principals: "group:service-account-chromium-tryserver"
+  }
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-chromium-tryjob-access"
+  }
+}
 realms {
   name: "findit"
   bindings {

infra/config/lib/try.star

@@ -331,20 +331,6 @@ def chromium_chromiumos_builder(*, name, **kwargs):
   )
 
 
-def chromium_codesearch_builder(*, name, os=None, **kwargs):
-  return try_builder(
-      name = name,
-      builderless = True,
-      configure_kitchen = False,
-      executable = 'recipe:chromium_codesearch',
-      mastername = 'tryserver.chromium.codesearch',
-      goma_backend = builders.goma.backend.RBE_PROD,
-      execution_timeout = 9 * time.hour,
-      os = os,
-      **kwargs
-  )
-
-
 def chromium_dawn_builder(*, name, **kwargs):
   return try_builder(
       name = name,
@@ -535,7 +521,6 @@ try_ = struct(
     chromium_android_builder = chromium_android_builder,
     chromium_angle_builder = chromium_angle_builder,
     chromium_chromiumos_builder = chromium_chromiumos_builder,
-    chromium_codesearch_builder = chromium_codesearch_builder,
     chromium_dawn_builder = chromium_dawn_builder,
     chromium_linux_builder = chromium_linux_builder,
     chromium_mac_builder = chromium_mac_builder,

infra/config/main.star

@@ -95,6 +95,7 @@ exec('//recipes.star')
 exec('//notifiers.star')
 
 exec('//subprojects/chromium/subproject.star')
+master_only_exec('//subprojects/codesearch/subproject.star')
 master_only_exec('//subprojects/findit/subproject.star')
 master_only_exec('//subprojects/goma/subproject.star')
 master_only_exec('//subprojects/webrtc/subproject.star')

infra/config/subprojects/README.md

@@ -3,6 +3,7 @@ Definitions of LUCI entities for the chromium project.
 The following subprojects exist:
 
 * chromium - Builders that test the chromium/src codebase.
+* codesearch - Builders that test codesearch with chromium.
 * findit - Builders that are used by the Sheriff-o-Matic findit service.
 * goma - Builders that test the use of goma by chromium builders.
 * webrtc - Builders that test the integration of WebRTC with chromium.

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

@@ -46,7 +46,6 @@ luci.list_view(
         'try/chromeos-kevin-rel',
         'try/chromium_presubmit',
         'try/closure_compilation',
-        'try/codesearch-gen-chromium-win-try',
         'try/fuchsia-angle-rel',
         'try/fuchsia-compile-x64-dbg',
         'try/gpu-fyi-try-android-l-nexus-5-32',

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

@@ -299,12 +299,6 @@ try_.chromium_chromiumos_builder(
 )
 
 
-try_.chromium_codesearch_builder(
-    name = 'codesearch-gen-chromium-win-try',
-    os = os.WINDOWS_10,
-)
-
-
 try_.chromium_dawn_builder(
     name = 'linux-dawn-rel',
 )

infra/config/subprojects/codesearch/README.md

+Definitions of LUCI entities that test codesearch with chromium.
+
+* consoles - Manually curated consoles for codesearch subproject builders.
+* codesearch.star - Builders that test codesearch with chromium.

infra/config/subprojects/codesearch/codesearch.star

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+load('//lib/builders.star', 'cpu', 'goma', 'os')
+load('//lib/try.star', 'try_')
+
+luci.bucket(
+    name = 'codesearch',
+    acls = [
+        acl.entry(
+            roles = acl.BUILDBUCKET_READER,
+            groups = 'all',
+        ),
+        acl.entry(
+            roles = acl.BUILDBUCKET_TRIGGERER,
+            groups = 'project-chromium-tryjob-access',
+        ),
+        acl.entry(
+            roles = acl.BUILDBUCKET_OWNER,
+            groups = 'service-account-chromium-tryserver',
+        ),
+    ],
+)
+
+try_.defaults.bucket.set('codesearch')
+try_.defaults.build_numbers.set(True)
+try_.defaults.builderless.set(True)
+try_.defaults.cores.set(8)
+try_.defaults.cpu.set(cpu.X86_64)
+try_.defaults.cq_group.set('cq')
+try_.defaults.executable.set('recipe:chromium_codesearch')
+try_.defaults.execution_timeout.set(9 * time.hour)
+try_.defaults.expiration_timeout.set(2 * time.hour)
+try_.defaults.goma_backend.set(goma.backend.RBE_PROD)
+try_.defaults.mastername.set('tryserver.chromium.codesearch')
+try_.defaults.os.set(os.LINUX_DEFAULT)
+try_.defaults.pool.set('luci.chromium.try')
+try_.defaults.service_account.set('chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com')
+try_.defaults.swarming_tags.set(['vpython:native-python-wrapper'])
+
+try_.defaults.caches.set([
+    swarming.cache(
+        name = 'win_toolchain',
+        path = 'win_toolchain',
+    ),
+])
+
+try_.builder(
+    name = 'gen-android-try',
+)
+
+try_.builder(
+    name = 'gen-chromiumos-try',
+)
+
+try_.builder(
+    name = 'gen-fuchsia-try',
+)
+
+try_.builder(
+    name = 'gen-linux-try',
+)
+
+try_.builder(
+    name = 'gen-win-try',
+    os = os.WINDOWS_10,
+)
+
+

infra/config/subprojects/codesearch/consoles/luci.chromium.codesearch.star

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+luci.list_view(
+    name = 'luci.chromium.codesearch',
+    entries = [
+      'codesearch/gen-android-try',
+      'codesearch/gen-chromiumos-try',
+      'codesearch/gen-fuchsia-try',
+      'codesearch/gen-linux-try',
+      'codesearch/gen-win-try',
+    ],
+)

infra/config/subprojects/codesearch/subproject.star

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+exec('./codesearch.star')
+exec('./consoles/luci.chromium.codesearch.star')
+

tools/mb/mb_config.pyl

@@ -821,11 +821,11 @@
     },
 
     'tryserver.chromium.codesearch': {
-      'codesearch-gen-chromium-android-try': 'codesearch_gen_chromium_android_bot',
-      'codesearch-gen-chromium-chromiumos-try': 'codesearch_gen_chromium_chromiumos_bot',
-      'codesearch-gen-chromium-fuchsia-try': 'codesearch_gen_chromium_fuchsia_bot',
-      'codesearch-gen-chromium-linux-try': 'codesearch_gen_chromium_bot',
-      'codesearch-gen-chromium-win-try': 'codesearch_gen_chromium_bot',
+      'gen-android-try': 'codesearch_gen_chromium_android_bot',
+      'gen-chromiumos-try': 'codesearch_gen_chromium_chromiumos_bot',
+      'gen-fuchsia-try': 'codesearch_gen_chromium_fuchsia_bot',
+      'gen-linux-try': 'codesearch_gen_chromium_bot',
+      'gen-win-try': 'codesearch_gen_chromium_bot',
     },
 
     'tryserver.chromium.dawn': {