From de778a27892cf182db8176290922195e729d7a7a Mon Sep 17 00:00:00 2001
From: Garrett Beaty <gbeaty@chromium.org>
Date: Fri, 28 Mar 2025 16:46:44 -0700
Subject: [PATCH] [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}
---
.../ci/Dawn Android arm Builder/properties.json | 1 +
.../ci/Dawn Android arm DEPS Builder/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../Dawn Android arm Release (Pixel 4)/properties.json | 1 +
.../ci/Dawn Android arm64 Builder/properties.json | 1 +
.../ci/Dawn Android arm64 DEPS Builder/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../ci/Dawn Chromium Presubmit/properties.json | 1 +
.../ci/Dawn Linux TSAN Release/properties.json | 1 +
.../builders/ci/Dawn Linux x64 Builder/properties.json | 1 +
.../ci/Dawn Linux x64 DEPS Builder/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../ci/Dawn Linux x64 Release (NVIDIA)/properties.json | 1 +
.../builders/ci/Dawn Mac arm64 Builder/properties.json | 1 +
.../ci/Dawn Mac arm64 DEPS Builder/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../Dawn Mac arm64 Release (Apple M2)/properties.json | 1 +
.../builders/ci/Dawn Mac x64 Builder/properties.json | 1 +
.../ci/Dawn Mac x64 DEPS Builder/properties.json | 1 +
.../ci/Dawn Mac x64 DEPS Release (AMD)/properties.json | 1 +
.../Dawn Mac x64 DEPS Release (Intel)/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../ci/Dawn Mac x64 Release (AMD)/properties.json | 1 +
.../ci/Dawn Mac x64 Release (Intel)/properties.json | 1 +
.../ci/Dawn Win10 x64 ASAN Builder/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../builders/ci/Dawn Win10 x64 Builder/properties.json | 1 +
.../ci/Dawn Win10 x64 DEPS Builder/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../ci/Dawn Win10 x64 Release (Intel)/properties.json | 1 +
.../ci/Dawn Win10 x64 Release (NVIDIA)/properties.json | 1 +
.../builders/ci/Dawn Win10 x86 Builder/properties.json | 1 +
.../ci/Dawn Win10 x86 DEPS Builder/properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../properties.json | 1 +
.../ci/Dawn Win10 x86 Release (Intel)/properties.json | 1 +
.../ci/Dawn Win10 x86 Release (NVIDIA)/properties.json | 1 +
.../ci/Dawn Win11 arm64 Builder/properties.json | 1 +
.../ci/Dawn Win11 arm64 DEPS Builder/properties.json | 1 +
infra/config/project.star | 10 +++++++---
infra/config/scripts/branch.py | 1 +
infra/config/scripts/tests/branch_integration_test.py | 2 ++
infra/config/scripts/tests/branch_unit_test.py | 1 +
infra/config/settings.json | 1 +
.../config/subprojects/chromium/ci/chromium.dawn.star | 8 ++++++++
65 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/infra/config/generated/builders/ci/Dawn Android arm Builder/properties.json b/infra/config/generated/builders/ci/Dawn Android arm Builder/properties.json
index 3bf9aae953307..3f34f5b23931c 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm Builder/properties.json
@@ -156,6 +156,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/properties.json
index c6eccb3b44007..a4299cc7be1f8 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/properties.json
@@ -153,6 +153,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Nexus 5X)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Nexus 5X)/properties.json
index 6e1125da946b8..be7d7a90e2f4a 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Nexus 5X)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Nexus 5X)/properties.json
@@ -92,6 +92,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Pixel 4)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Pixel 4)/properties.json
index 91748ae676bd9..37799951cee70 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Pixel 4)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm DEPS Release (Pixel 4)/properties.json
@@ -92,6 +92,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm Release (Nexus 5X)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm Release (Nexus 5X)/properties.json
index 48632704a8110..c30b5dafbb5f4 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm Release (Nexus 5X)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm Release (Nexus 5X)/properties.json
@@ -94,6 +94,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm Release (Pixel 4)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm Release (Pixel 4)/properties.json
index d57a44dc58038..497eb439246c9 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm Release (Pixel 4)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm Release (Pixel 4)/properties.json
@@ -94,6 +94,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json
index ac58461c253b4..dd0b596a32ab6 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm64 Builder/properties.json
@@ -203,6 +203,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/properties.json
index e027f12c793b2..99aa14d983b48 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/properties.json
@@ -113,6 +113,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release (Pixel 6)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release (Pixel 6)/properties.json
index 86510706b97f8..cbbfa0d52415e 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release (Pixel 6)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release (Pixel 6)/properties.json
@@ -91,6 +91,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release (Pixel 6)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release (Pixel 6)/properties.json
index 8d9e93f927e29..b1ab1d55e90d4 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release (Pixel 6)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release (Pixel 6)/properties.json
@@ -93,5 +93,6 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"recipe": "chromium"
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 Release (Pixel 6)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm64 Release (Pixel 6)/properties.json
index d7e5a7a9ba4a7..7b12895a6d35d 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm64 Release (Pixel 6)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm64 Release (Pixel 6)/properties.json
@@ -93,6 +93,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 Release (Samsung S24)/properties.json b/infra/config/generated/builders/ci/Dawn Android arm64 Release (Samsung S24)/properties.json
index afbcee6e9de41..8847c05ca555e 100644
--- a/infra/config/generated/builders/ci/Dawn Android arm64 Release (Samsung S24)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Android arm64 Release (Samsung S24)/properties.json
@@ -93,6 +93,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn ChromeOS Skylab Release (volteer)/properties.json b/infra/config/generated/builders/ci/Dawn ChromeOS Skylab Release (volteer)/properties.json
index c798ea7e194d5..1e77e25c15448 100644
--- a/infra/config/generated/builders/ci/Dawn ChromeOS Skylab Release (volteer)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn ChromeOS Skylab Release (volteer)/properties.json
@@ -79,5 +79,6 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"recipe": "chromium"
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/Dawn Chromium Presubmit/properties.json b/infra/config/generated/builders/ci/Dawn Chromium Presubmit/properties.json
index ece250c6a096d..c0811eaf417cb 100644
--- a/infra/config/generated/builders/ci/Dawn Chromium Presubmit/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Chromium Presubmit/properties.json
@@ -70,6 +70,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux TSAN Release/properties.json b/infra/config/generated/builders/ci/Dawn Linux TSAN Release/properties.json
index e1d51d01702e6..0d8e61a080d79 100644
--- a/infra/config/generated/builders/ci/Dawn Linux TSAN Release/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux TSAN Release/properties.json
@@ -72,6 +72,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 Builder/properties.json
index ef571deca4d83..61cc9b9cee08c 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 Builder/properties.json
@@ -261,6 +261,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json
index 2709de66b3a43..54997c112679a 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json
@@ -141,6 +141,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json
index 24b429c18dee1..fc789bf77a9ad 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json
@@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json
index 5900fa8ea6ee7..05d004a3d1fff 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json
@@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (Intel UHD 630)/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (Intel UHD 630)/properties.json
index 73fc10868cd06..2e885b409a68f 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (Intel UHD 630)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (Intel UHD 630)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (NVIDIA GTX 1660)/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (NVIDIA GTX 1660)/properties.json
index 660dcb7018ae9..58c2195b37e2c 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (NVIDIA GTX 1660)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release (NVIDIA GTX 1660)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 630)/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 630)/properties.json
index c23d5f99ca002..cde5588103810 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 630)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 630)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 770)/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 770)/properties.json
index a725b500bc721..1256e5f066647 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 770)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 Release (Intel UHD 770)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Linux x64 Release (NVIDIA)/properties.json
index cf7225b838019..f52ce7da0792c 100644
--- a/infra/config/generated/builders/ci/Dawn Linux x64 Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Linux x64 Release (NVIDIA)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/properties.json
index a224d5422299f..954e8784fe53f 100644
--- a/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/properties.json
@@ -160,6 +160,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/properties.json
index 2f134b06d3393..7c0538ef4bd18 100644
--- a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/properties.json
@@ -111,6 +111,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release (Apple M2)/properties.json b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release (Apple M2)/properties.json
index 776355157cced..fe9d3e74df4c6 100644
--- a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release (Apple M2)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release (Apple M2)/properties.json
@@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release (Apple M2)/properties.json b/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release (Apple M2)/properties.json
index 254e1cb4549fb..a77b65ea166ed 100644
--- a/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release (Apple M2)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release (Apple M2)/properties.json
@@ -91,6 +91,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac arm64 Release (Apple M2)/properties.json b/infra/config/generated/builders/ci/Dawn Mac arm64 Release (Apple M2)/properties.json
index a6e99c02bd3a3..7e05915bf5e04 100644
--- a/infra/config/generated/builders/ci/Dawn Mac arm64 Release (Apple M2)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac arm64 Release (Apple M2)/properties.json
@@ -95,6 +95,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 Builder/properties.json
index 1459ac4f46b0a..8d66e43753184 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 Builder/properties.json
@@ -227,6 +227,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json
index a10200674f173..53b1d41109cbb 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json
@@ -144,6 +144,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json
index 5dab959689b63..148abd4408159 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json
@@ -86,6 +86,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json
index d74f70ec73090..afdace6bedb63 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json
@@ -86,6 +86,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (AMD)/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (AMD)/properties.json
index 97e19ce9d988b..f2c1876b712af 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (AMD)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (AMD)/properties.json
@@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (Intel)/properties.json
index 727c9a7d21960..b6dfe4f65797b 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release (Intel)/properties.json
@@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 Release (AMD)/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 Release (AMD)/properties.json
index ffbebc6b059df..44be969ca38b9 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 Release (AMD)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 Release (AMD)/properties.json
@@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Mac x64 Release (Intel)/properties.json
index ad5eb967d7ad9..52cc58332a337 100644
--- a/infra/config/generated/builders/ci/Dawn Mac x64 Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Mac x64 Release (Intel)/properties.json
@@ -89,6 +89,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/properties.json
index 064853a235725..cd2760f50ca94 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/properties.json
@@ -153,6 +153,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (Intel)/properties.json
index cbc69c139fdea..9ea933eff3d7b 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (Intel)/properties.json
@@ -89,5 +89,6 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"recipe": "chromium"
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (NVIDIA)/properties.json
index 03dbcda9156de..2cbd976e7866e 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release (NVIDIA)/properties.json
@@ -89,5 +89,6 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"recipe": "chromium"
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/properties.json
index 60a025734c034..b20a67143c7af 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/properties.json
@@ -261,6 +261,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json
index 488fd426f1040..3ad4389e72638 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json
@@ -141,6 +141,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json
index 82235290e2abb..5611496dfe6e9 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json
@@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json
index b293de3f8c569..501148bc9e9a0 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json
@@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (Intel)/properties.json
index 806fa77c95052..832c83e52a470 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (Intel)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (NVIDIA)/properties.json
index a8bc2cf15cbab..5dce56a1f5ba7 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release (NVIDIA)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel UHD 770)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel UHD 770)/properties.json
index 157214d51854e..f0537d9f88eaf 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel UHD 770)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel UHD 770)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel)/properties.json
index 32dcbb5e6a2c5..c902453b1d81b 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 Release (Intel)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x64 Release (NVIDIA)/properties.json
index 64a9248b910dd..a1de8d62c50d4 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x64 Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x64 Release (NVIDIA)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/properties.json
index 44de6c92d26a4..1548942af904c 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/properties.json
@@ -222,6 +222,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json
index b8d2d9c033c37..ab987d512961d 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json
@@ -141,6 +141,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json
index 1992716c654ce..93b6e933b0963 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json
@@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json
index d54ce5da9875e..be4016a08e4ad 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json
@@ -84,6 +84,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (Intel)/properties.json
index 8dc744cbc8611..96635a25697d2 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (Intel)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (NVIDIA)/properties.json
index 0714c785f3a98..3e07c5f8e97eb 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release (NVIDIA)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 Release (Intel)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 Release (Intel)/properties.json
index 0b3ab2292cd3a..fbcc27b38cde9 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 Release (Intel)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 Release (Intel)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 Release (NVIDIA)/properties.json b/infra/config/generated/builders/ci/Dawn Win10 x86 Release (NVIDIA)/properties.json
index 979ba3aa58797..2f22fd1787764 100644
--- a/infra/config/generated/builders/ci/Dawn Win10 x86 Release (NVIDIA)/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win10 x86 Release (NVIDIA)/properties.json
@@ -87,6 +87,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win11 arm64 Builder/properties.json b/infra/config/generated/builders/ci/Dawn Win11 arm64 Builder/properties.json
index 84f1e6b05a0be..31ef190d1d91c 100644
--- a/infra/config/generated/builders/ci/Dawn Win11 arm64 Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win11 arm64 Builder/properties.json
@@ -72,6 +72,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/generated/builders/ci/Dawn Win11 arm64 DEPS Builder/properties.json b/infra/config/generated/builders/ci/Dawn Win11 arm64 DEPS Builder/properties.json
index e19576a4971e3..0878c2b6c3bb4 100644
--- a/infra/config/generated/builders/ci/Dawn Win11 arm64 DEPS Builder/properties.json
+++ b/infra/config/generated/builders/ci/Dawn Win11 arm64 DEPS Builder/properties.json
@@ -69,6 +69,7 @@
]
},
"builder_group": "chromium.dawn",
+ "dawn_ref": "refs/heads/main",
"gardener_rotations": [
"dawn"
],
diff --git a/infra/config/project.star b/infra/config/project.star
index 6dbe1e36ba564..27985dbfbf802 100644
--- a/infra/config/project.star
+++ b/infra/config/project.star
@@ -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,
)
diff --git a/infra/config/scripts/branch.py b/infra/config/scripts/branch.py
index 135eee46475ad..eaf0ea8ad14bc 100755
--- a/infra/config/scripts/branch.py
+++ b/infra/config/scripts/branch.py
@@ -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: {
diff --git a/infra/config/scripts/tests/branch_integration_test.py b/infra/config/scripts/tests/branch_integration_test.py
index 27c581b05cf23..8df56616e0f08 100755
--- a/infra/config/scripts/tests/branch_integration_test.py
+++ b/infra/config/scripts/tests/branch_integration_test.py
@@ -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": {
diff --git a/infra/config/scripts/tests/branch_unit_test.py b/infra/config/scripts/tests/branch_unit_test.py
index a18fced07da50..41c59184d9e41 100755
--- a/infra/config/scripts/tests/branch_unit_test.py
+++ b/infra/config/scripts/tests/branch_unit_test.py
@@ -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": {
diff --git a/infra/config/settings.json b/infra/config/settings.json
index ba5ee1955ef58..0b4deddc95181 100644
--- a/infra/config/settings.json
+++ b/infra/config/settings.json
@@ -3,5 +3,6 @@
"project_title": "Chromium",
"ref": "refs/heads/main",
"chrome_project": "chrome",
+ "dawn_ref": "refs/heads/main",
"is_main": true
}
diff --git a/infra/config/subprojects/chromium/ci/chromium.dawn.star b/infra/config/subprojects/chromium/ci/chromium.dawn.star
index f7254281147ee..36febb0c09328 100644
--- a/infra/config/subprojects/chromium/ci/chromium.dawn.star
+++ b/infra/config/subprojects/chromium/ci/chromium.dawn.star
@@ -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,