infra: Update merge builder to run periodically

The Infra console view is replaced with a list view, since
the builds are no longer just post submit builds.

BUG=b:233913643
TEST=lucicfg validate main.star

Change-Id: Ia1ccc75251ccdb7ae567418235e2bf8b7d6aa16a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3692687
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Dennis Kempin 2022-06-03 20:17:04 +00:00
parent 5156976b7f
commit 079bbe99e0
4 changed files with 54 additions and 17 deletions

View file

@ -144,6 +144,27 @@ buckets {
value: 100
}
}
builders {
name: "crosvm_update_chromeos_merges"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu"
dimensions: "pool:luci.crosvm.ci"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/crosvm/crosvm"
cipd_version: "refs/heads/main"
cmd: "luciexe"
}
properties:
'{'
' "recipe": "update_chromeos_merges"'
'}'
service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
value: 100
}
}
}
}
buckets {

View file

@ -34,10 +34,11 @@ consoles {
consoles {
id: "Infra"
name: "Infra"
repo_url: "https://chromium.googlesource.com/crosvm/crosvm"
refs: "regexp:refs/heads/main"
manifest_name: "REVISION"
builders {
name: "buildbucket/luci.crosvm.ci/crosvm_push_to_github"
}
builders {
name: "buildbucket/luci.crosvm.ci/crosvm_update_chromeos_merges"
}
builder_view_only: true
}

View file

@ -64,6 +64,17 @@ job {
builder: "crosvm_push_to_github"
}
}
job {
id: "crosvm_update_chromeos_merges"
realm: "ci"
schedule: "0,30 * * * *"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
builder: "crosvm_update_chromeos_merges"
}
}
trigger {
id: "main source"
realm: "ci"

View file

@ -132,10 +132,9 @@ luci.console_view(
repo = "https://chromium.googlesource.com/crosvm/crosvm",
)
# Console showing all postsubmit infra builders
luci.console_view(
# View showing all infra builders
luci.list_view(
name = "Infra",
repo = "https://chromium.googlesource.com/crosvm/crosvm",
)
def verify_builder(name, dimensions, presubmit = True, postsubmit = True, **args):
@ -233,13 +232,14 @@ def verify_chromeos_builder(board, **kwargs):
**kwargs
)
def infra_builder(name, **args):
def infra_builder(name, postsubmit, **args):
"""Creates a ci job to run infra recipes that are not involved in verifying changes.
The builders are added to a separate infra dashboard.
Args:
name: Name of the builder
postsubmit: True if the builder should run after each submitted commit.
**args: Passed to luci.builder
"""
luci.builder(
@ -253,14 +253,15 @@ def infra_builder(name, **args):
},
**args
)
luci.gitiles_poller(
name = "main source",
bucket = "ci",
repo = "https://chromium.googlesource.com/crosvm/crosvm",
triggers = ["ci/%s" % name],
)
luci.console_view_entry(
console_view = "Infra",
if postsubmit:
luci.gitiles_poller(
name = "main source",
bucket = "ci",
repo = "https://chromium.googlesource.com/crosvm/crosvm",
triggers = ["ci/%s" % name],
)
luci.list_view_entry(
list_view = "Infra",
builder = "ci/%s" % name,
)
@ -286,11 +287,14 @@ infra_builder(
executable = luci.recipe(
name = "push_to_github",
),
postsubmit = True,
)
infra_builder(
name = "crosvm_merge_into_chromeos",
name = "crosvm_update_chromeos_merges",
executable = luci.recipe(
name = "merge_into_chromeos",
name = "update_chromeos_merges",
),
schedule = "0,30 * * * *", # Run every 30 minutes
postsubmit = False,
)