Add Dawn android bots to CQ

Currently runs only dawn_end2end_tests and its variants

Bug: chromium:1363409
Change-Id: I4465caccb316e4d3db559c1f96fb2d4b07c8a812
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/132700
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Loko Kung <lokokung@google.com>
Kokoro: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2023-05-18 00:23:27 +00:00 committed by Dawn LUCI CQ
parent 62d9b14b6f
commit 73b49ad4aa
4 changed files with 57 additions and 11 deletions

View File

@ -29,6 +29,12 @@ config_groups {
dry_run_access_list: "project-dawn-tryjob-access" dry_run_access_list: "project-dawn-tryjob-access"
} }
tryjob { tryjob {
builders {
name: "chromium/try/android-dawn-arm-rel"
}
builders {
name: "chromium/try/android-dawn-arm64-rel"
}
builders { builders {
name: "chromium/try/dawn-try-win10-x86-rel" name: "chromium/try/dawn-try-win10-x86-rel"
includable_only: true includable_only: true
@ -107,6 +113,9 @@ config_groups {
dry_run_access_list: "project-dawn-tryjob-access" dry_run_access_list: "project-dawn-tryjob-access"
} }
tryjob { tryjob {
builders {
name: "chromium-m112/try/dawn-android-arm-deps-rel"
}
builders { builders {
name: "chromium-m112/try/dawn-mac-x64-deps-rel" name: "chromium-m112/try/dawn-mac-x64-deps-rel"
} }
@ -182,6 +191,9 @@ config_groups {
dry_run_access_list: "project-dawn-tryjob-access" dry_run_access_list: "project-dawn-tryjob-access"
} }
tryjob { tryjob {
builders {
name: "chromium-m113/try/dawn-android-arm-deps-rel"
}
builders { builders {
name: "chromium-m113/try/dawn-linux-x64-deps-rel" name: "chromium-m113/try/dawn-linux-x64-deps-rel"
} }
@ -260,6 +272,9 @@ config_groups {
dry_run_access_list: "project-dawn-tryjob-access" dry_run_access_list: "project-dawn-tryjob-access"
} }
tryjob { tryjob {
builders {
name: "chromium-m114/try/dawn-android-arm-deps-rel"
}
builders { builders {
name: "chromium-m114/try/dawn-linux-x64-deps-rel" name: "chromium-m114/try/dawn-linux-x64-deps-rel"
} }

View File

@ -355,10 +355,12 @@ def dawn_standalone_builder(name, clang, debug, cpu, fuzzer = False):
builder = "dawn:try/" + name, builder = "dawn:try/" + name,
) )
def _add_branch_verifiers(builder_name, os, includable_only = False): def _add_branch_verifiers(builder_name, os, min_milestone = None, includable_only = False):
for milestone, details in ACTIVE_MILESTONES.items(): for milestone, details in ACTIVE_MILESTONES.items():
if os not in details.platforms: if os not in details.platforms:
continue continue
if min_milestone != None and int(milestone[1:]) < min_milestone:
continue
luci.cq_tryjob_verifier( luci.cq_tryjob_verifier(
cq_group = "Dawn-CQ-" + milestone, cq_group = "Dawn-CQ-" + milestone,
builder = "{}:try/{}".format(details.chromium_project, builder_name), builder = "{}:try/{}".format(details.chromium_project, builder_name),
@ -367,24 +369,47 @@ def _add_branch_verifiers(builder_name, os, includable_only = False):
# We use the DEPS version for branches because ToT builders do not make sense on # We use the DEPS version for branches because ToT builders do not make sense on
# branches and the DEPS versions already exist. # branches and the DEPS versions already exist.
_os_to_branch_builder = { _os_arch_to_branch_builder = {
"linux": "dawn-linux-x64-deps-rel", "linux": "dawn-linux-x64-deps-rel",
"mac": "dawn-mac-x64-deps-rel", "mac": "dawn-mac-x64-deps-rel",
"win": "dawn-win10-x64-deps-rel", "win": "dawn-win10-x64-deps-rel",
"android-arm": "dawn-android-arm-deps-rel",
"android-arm64": "dawn-android-arm64-deps-rel",
} }
def chromium_dawn_tryjob(os): # The earliest milestone that the builder is relevant for
_os_arch_to_min_milestone = {
"linux": 112,
"mac": 112,
"win": 112,
"android-arm": 112,
"android-arm64": 115,
}
def chromium_dawn_tryjob(os, arch = None):
"""Adds a tryjob that tests against Chromium """Adds a tryjob that tests against Chromium
Args: Args:
os: string for the OS, should be one or linux|mac|win os: string for the OS, should be one or linux|mac|win
arch: string for the arch, or None
""" """
if arch:
luci.cq_tryjob_verifier( luci.cq_tryjob_verifier(
cq_group = "Dawn-CQ", cq_group = "Dawn-CQ",
builder = "chromium:try/" + os + "-dawn-rel", builder = "chromium:try/{os}-dawn-{arch}-rel".format(os = os, arch = arch),
) )
_add_branch_verifiers(_os_to_branch_builder[os], os) _add_branch_verifiers(
_os_arch_to_branch_builder["{os}-{arch}".format(os = os, arch = arch)],
os,
_os_arch_to_min_milestone["{os}-{arch}".format(os = os, arch = arch)],
)
else:
luci.cq_tryjob_verifier(
cq_group = "Dawn-CQ",
builder = "chromium:try/{}-dawn-rel".format(os),
)
_add_branch_verifiers(_os_arch_to_branch_builder[os], os)
luci.gitiles_poller( luci.gitiles_poller(
name = "primary-poller", name = "primary-poller",
@ -437,6 +462,8 @@ dawn_standalone_builder("cron-linux-clang-rel-x64", True, False, "x64", True)
chromium_dawn_tryjob("linux") chromium_dawn_tryjob("linux")
chromium_dawn_tryjob("mac") chromium_dawn_tryjob("mac")
chromium_dawn_tryjob("win") chromium_dawn_tryjob("win")
chromium_dawn_tryjob("android", "arm")
chromium_dawn_tryjob("android", "arm64")
luci.cq_tryjob_verifier( luci.cq_tryjob_verifier(
cq_group = "Dawn-CQ", cq_group = "Dawn-CQ",

View File

@ -5,7 +5,8 @@
"ref": "refs/heads/chromium/5615", "ref": "refs/heads/chromium/5615",
"platforms": [ "platforms": [
"mac", "mac",
"win" "win",
"android"
] ]
}, },
"113": { "113": {
@ -15,7 +16,8 @@
"platforms": [ "platforms": [
"linux", "linux",
"mac", "mac",
"win" "win",
"android"
] ]
}, },
"114": { "114": {
@ -25,7 +27,8 @@
"platforms": [ "platforms": [
"linux", "linux",
"mac", "mac",
"win" "win",
"android"
] ]
} }
} }

View File

@ -103,6 +103,7 @@ def add_milestone(milestones, milestone_num, branch):
'linux', 'linux',
'mac', 'mac',
'win', 'win',
'android',
], ],
} }