0

[infra] Set the dawn_ref property for branched dawn builders.

Branched versions of Dawn Chromium Presubmit are checking out dawn from
main instead of the corresponding dawn branch. That builder uses the
dawn_top_of_tree gclient config, which causes HEAD to be used for the
dawn revision unless the dawn_ref property is set.

This change sets the dawn_ref property for all of chromium.dawn so that
when the branch projects are set up the dawn_ref property for all of
those builders will be set to the corresponding dawn branch. The
majority of the branched builders in that group do not use the
dawn_top_of_tree config, but the property will have no effect on those
builders.

Bug: 407114936
Change-Id: Ia86781b8b6a5ba31f1a6ca9b97098608f4d1664a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6410673
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1439779}
This commit is contained in:
Garrett Beaty 2025-03-28 16:46:44 -07:00 committed by Chromium LUCI CQ
parent 48508f3aaa
commit de778a2789
65 changed files with 79 additions and 3 deletions
infra/config
generated/builders/ci
Dawn Android arm Builder
Dawn Android arm DEPS Builder
Dawn Android arm DEPS Release (Nexus 5X)
Dawn Android arm DEPS Release (Pixel 4)
Dawn Android arm Release (Nexus 5X)
Dawn Android arm Release (Pixel 4)
Dawn Android arm64 Builder
Dawn Android arm64 DEPS Builder
Dawn Android arm64 DEPS Release (Pixel 6)
Dawn Android arm64 Experimental Release (Pixel 6)
Dawn Android arm64 Release (Pixel 6)
Dawn Android arm64 Release (Samsung S24)
Dawn ChromeOS Skylab Release (volteer)
Dawn Chromium Presubmit
Dawn Linux TSAN Release
Dawn Linux x64 Builder
Dawn Linux x64 DEPS Builder
Dawn Linux x64 DEPS Release (Intel UHD 630)
Dawn Linux x64 DEPS Release (NVIDIA)
Dawn Linux x64 Experimental Release (Intel UHD 630)
Dawn Linux x64 Experimental Release (NVIDIA GTX 1660)
Dawn Linux x64 Release (Intel UHD 630)
Dawn Linux x64 Release (Intel UHD 770)
Dawn Linux x64 Release (NVIDIA)
Dawn Mac arm64 Builder
Dawn Mac arm64 DEPS Builder
Dawn Mac arm64 DEPS Release (Apple M2)
Dawn Mac arm64 Experimental Release (Apple M2)
Dawn Mac arm64 Release (Apple M2)
Dawn Mac x64 Builder
Dawn Mac x64 DEPS Builder
Dawn Mac x64 DEPS Release (AMD)
Dawn Mac x64 DEPS Release (Intel)
Dawn Mac x64 Experimental Release (AMD)
Dawn Mac x64 Experimental Release (Intel)
Dawn Mac x64 Release (AMD)
Dawn Mac x64 Release (Intel)
Dawn Win10 x64 ASAN Builder
Dawn Win10 x64 ASAN Release (Intel)
Dawn Win10 x64 ASAN Release (NVIDIA)
Dawn Win10 x64 Builder
Dawn Win10 x64 DEPS Builder
Dawn Win10 x64 DEPS Release (Intel)
Dawn Win10 x64 DEPS Release (NVIDIA)
Dawn Win10 x64 Experimental Release (Intel)
Dawn Win10 x64 Experimental Release (NVIDIA)
Dawn Win10 x64 Release (Intel UHD 770)
Dawn Win10 x64 Release (Intel)
Dawn Win10 x64 Release (NVIDIA)
Dawn Win10 x86 Builder
Dawn Win10 x86 DEPS Builder
Dawn Win10 x86 DEPS Release (Intel)
Dawn Win10 x86 DEPS Release (NVIDIA)
Dawn Win10 x86 Experimental Release (Intel)
Dawn Win10 x86 Experimental Release (NVIDIA)
Dawn Win10 x86 Release (Intel)
Dawn Win10 x86 Release (NVIDIA)
Dawn Win11 arm64 Builder
Dawn Win11 arm64 DEPS Builder
project.star
scripts
settings.json
subprojects/chromium/ci

@ -156,6 +156,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -153,6 +153,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -92,6 +92,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -92,6 +92,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -94,6 +94,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -94,6 +94,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -203,6 +203,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -113,6 +113,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -91,6 +91,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -93,5 +93,6 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"recipe": "chromium"
}

@ -93,6 +93,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -93,6 +93,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -79,5 +79,6 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"recipe": "chromium"
}

@ -70,6 +70,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -72,6 +72,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -261,6 +261,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -141,6 +141,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -160,6 +160,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -111,6 +111,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -91,6 +91,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -95,6 +95,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -227,6 +227,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -144,6 +144,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -86,6 +86,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -86,6 +86,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -153,6 +153,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -89,5 +89,6 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"recipe": "chromium"
}

@ -89,5 +89,6 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"recipe": "chromium"
}

@ -261,6 +261,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -141,6 +141,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -222,6 +222,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -141,6 +141,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -72,6 +72,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -69,6 +69,7 @@
]
},
"builder_group": "chromium.dawn",
"dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],

@ -44,6 +44,7 @@ def _project_settings(
project_title,
ref,
chrome_project,
dawn_ref,
is_main,
platforms = {}):
"""Declare settings for the project.
@ -59,12 +60,14 @@ def _project_settings(
* project_title - A string identifying the project in title contexts (e.g.
titles of consoles). No conditional logic should depend on this value,
it should only be used where the title of a project is required.
* ref - The git ref containing the code for this branch.
* ref - The git ref containing the code for this branch. No logic should
depend on this value, it should only be used where a ref is required.
* chrome_project - The name of the corresponding chrome project. No logic
should depend on this value, it should only be used where the name of a
project is required.
* ref - The git ref containing the code for this branch. No logic should
depend on this value, it should only be used where a ref is required.
* dawn_ref - The git ref for dawn corresponding to this branch. No logic
should depend on this value, it should only be used where a ref is
required.
* is_main - Whether or not this is the project for the main ref.
* platforms - A mapping from a platform ID value to the settings for the
platform. The valid platform ID values are the members of the platform
@ -93,6 +96,7 @@ def _project_settings(
project_title = project_title,
ref = ref,
chrome_project = chrome_project,
dawn_ref = dawn_ref,
is_main = is_main,
platforms = platforms,
)

@ -89,6 +89,7 @@ def initial_settings(
project_title=f'Chromium M{milestone}',
ref=f'refs/branch-heads/{branch}',
chrome_project=chrome_project,
dawn_ref=f'refs/heads/chromium/{branch}',
is_main=False,
platforms={
p: {

@ -54,6 +54,7 @@ class BranchIntegrationTest(unittest.TestCase):
"project_title": "Chromium MXX",
"ref": "refs/branch-heads/YYYY",
"chrome_project": "chrome-mXX",
"dawn_ref": "refs/heads/chromium/YYYY",
"is_main": false,
"platforms": {
"android": {
@ -106,6 +107,7 @@ class BranchIntegrationTest(unittest.TestCase):
"project_title": "Chromium MXX",
"ref": "refs/branch-heads/YYYY",
"chrome_project": "chrome",
"dawn_ref": "refs/heads/chromium/YYYY",
"is_main": false,
"platforms": {
"android": {

@ -68,6 +68,7 @@ class BranchUnitTest(unittest.TestCase):
"project_title": "Chromium MMM",
"ref": "refs/branch-heads/BBBB",
"chrome_project": "CHROME",
"dawn_ref": "refs/heads/chromium/BBBB",
"is_main": false,
"platforms": {
"android": {

@ -3,5 +3,6 @@
"project_title": "Chromium",
"ref": "refs/heads/main",
"chrome_project": "chrome",
"dawn_ref": "refs/heads/main",
"is_main": true
}

@ -12,6 +12,7 @@ load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//lib/gn_args.star", "gn_args")
load("//lib/targets.star", "targets")
load("//project.star", "settings")
ci.defaults.set(
executable = ci.DEFAULT_EXECUTABLE,
@ -21,6 +22,13 @@ ci.defaults.set(
contact_team_email = "chrome-gpu-infra@google.com",
execution_timeout = ci.DEFAULT_EXECUTION_TIMEOUT,
health_spec = health_spec.DEFAULT,
# This property is read by the the dawn_top_of_tree gclient config and must
# be set for branched builders in order to check out the appropriate branch.
# Setting it for the non-branched builders and/or builders not using
# dawn_top_of_tree shouldn't cause any problems.
properties = {
"dawn_ref": settings.dawn_ref,
},
reclient_enabled = False,
service_account = ci.gpu.SERVICE_ACCOUNT,
shadow_service_account = ci.gpu.SHADOW_SERVICE_ACCOUNT,