From 61bb120f6acc90d684a95815c365734970ab0551 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Tue, 9 Jul 2024 18:23:18 +0000 Subject: [PATCH] infra: Add android-aarch64 builder This builder will only run clippy using the new presubmit recipe. Also updates the health_check builder to use the same recipe. BUG=b:349907813 TEST=lucicfg validate main.star Change-Id: Icf8a721b6eb37675dd289d496888b62de7ea9660 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5689951 Commit-Queue: Dennis Kempin Reviewed-by: Zihan Chen --- infra/config/generated/cr-buildbucket.cfg | 24 ++++++++++++++++++++-- infra/config/generated/luci-milo.cfg | 4 ++++ infra/config/generated/luci-notify.cfg | 15 ++++++++++++++ infra/config/generated/luci-scheduler.cfg | 11 ++++++++++ infra/config/generated/project.cfg | 2 +- infra/config/main.star | 25 ++++++++++++++++++++++- tools/presubmit | 7 +++++++ 7 files changed, 84 insertions(+), 4 deletions(-) diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index b3670ddc8b..ce8fe5c8d1 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -14,6 +14,24 @@ buckets { group: "mdb/crosvm-acl-luci-admin" } swarming { + builders { + name: "android-aarch64" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu" + dimensions: "pool:luci.crosvm.ci" + recipe { + name: "presubmit" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/crosvm/crosvm" + cipd_version: "refs/heads/main" + properties_j: "group_name:\"android-aarch64\"" + } + caches { + name: "linux_builder_cache" + path: "builder" + } + service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com" + } builders { name: "build_docs" swarming_host: "chromium-swarm.appspot.com" @@ -47,9 +65,10 @@ buckets { dimensions: "os:Ubuntu" dimensions: "pool:luci.crosvm.ci" recipe { - name: "health_check" + name: "presubmit" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/crosvm/crosvm" cipd_version: "refs/heads/main" + properties_j: "group_name:\"health_checks\"" } caches { name: "linux_builder_cache" @@ -193,9 +212,10 @@ buckets { dimensions: "os:Ubuntu" dimensions: "pool:luci.crosvm.try" recipe { - name: "health_check" + name: "presubmit" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/crosvm/crosvm" cipd_version: "refs/heads/main" + properties_j: "group_name:\"health_checks\"" } caches { name: "linux_builder_cache" diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index 69cd44c531..194376b5de 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg @@ -38,6 +38,10 @@ consoles { name: "buildbucket/luci.crosvm.ci/health_check" category: "linux" } + builders { + name: "buildbucket/luci.crosvm.ci/android-aarch64" + category: "android" + } } consoles { id: "Presubmit" diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg index 435cd58601..ba2e13fa95 100644 --- a/infra/config/generated/luci-notify.cfg +++ b/infra/config/generated/luci-notify.cfg @@ -4,6 +4,21 @@ # For the schema of this file, see ProjectConfig message: # https://config.luci.app/schemas/projects:luci-notify.cfg +notifiers { + notifications { + on_change: true + email { + recipients: "crosvm-uprev@grotations.appspotmail.com" + recipients: "crosvm-uprev-apac@grotations.appspotmail.com" + recipients: "denniskempin@google.com" + } + } + builders { + bucket: "ci" + name: "android-aarch64" + repository: "https://chromium.googlesource.com/crosvm/crosvm" + } +} notifiers { notifications { on_change: true diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg index 24079c0e94..b04a85d94c 100644 --- a/infra/config/generated/luci-scheduler.cfg +++ b/infra/config/generated/luci-scheduler.cfg @@ -4,6 +4,16 @@ # For the schema of this file, see ProjectConfig message: # https://config.luci.app/schemas/projects:luci-scheduler.cfg +job { + id: "android-aarch64" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "android-aarch64" + } +} job { id: "build_docs" realm: "ci" @@ -109,6 +119,7 @@ trigger { id: "main source" realm: "ci" acl_sets: "ci" + triggers: "android-aarch64" triggers: "build_docs" triggers: "chromeos_hatch" triggers: "health_check" diff --git a/infra/config/generated/project.cfg b/infra/config/generated/project.cfg index d7c8046686..c838992b21 100644 --- a/infra/config/generated/project.cfg +++ b/infra/config/generated/project.cfg @@ -7,7 +7,7 @@ name: "crosvm" access: "group:all" lucicfg { - version: "1.43.5" + version: "1.43.8" package_dir: ".." config_dir: "generated" entry_point: "main.star" diff --git a/infra/config/main.star b/infra/config/main.star index fa6f316f28..8611e63126 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -343,14 +343,37 @@ verify_builder( "cpu": "x86-64", }, executable = luci.recipe( - name = "health_check", + name = "presubmit", ), + properties = { + "group_name": "health_checks", + }, caches = [ swarming.cache("builder", name = "linux_builder_cache"), ], category = "linux", ) +verify_builder( + name = "android-aarch64", + dimensions = { + "os": "Ubuntu", + "cpu": "x86-64", + }, + executable = luci.recipe( + name = "presubmit", + ), + properties = { + "group_name": "android-aarch64", + }, + caches = [ + swarming.cache("builder", name = "linux_builder_cache"), + ], + category = "android", + # TODO(b/349907813): Enable in presubmit once stabilized + presubmit = False, +) + infra_builder( name = "push_to_github", executable = luci.recipe( diff --git a/tools/presubmit b/tools/presubmit index 33be5c0acf..1e01029a0c 100755 --- a/tools/presubmit +++ b/tools/presubmit @@ -427,6 +427,13 @@ GROUPS: List[Group] = [ "python_tests", ], ), + Group( + name="android-aarch64", + doc="Checks run on the android-aarch64 builder", + checks=[ + "clippy_android", + ], + ), *( Group( name=f"linux_{platform}",