infra: Add metrics_project property to $build/siso even on Win builders
https://crrev.com/c/6242373 switched the gn recipe to use Siso.
However, Win msvc builders failed because they don't have `chromium-reclient-metrics` property.
https://ci.chromium.org/ui/p/dawn/builders/try/win-msvc-dbg-x64/b8723159590914280305/infra
This CL adds the missing property to the builders.
Bug: 393606976
Change-Id: I6c7940aa3cfdb7ed4a957b687ad9cb5a15b46c0c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/226055
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index f500023..51a39bb 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -412,7 +412,7 @@
name: "dawn/cmake"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-trusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-trusted\"}"
properties_j: "asan:false"
properties_j: "clang:false"
properties_j: "debug:true"
@@ -435,6 +435,7 @@
' "enable_cloud_monitoring": true,'
' "enable_cloud_profiler": true,'
' "enable_cloud_trace": true,'
+ ' "metrics_project": "chromium-reclient-metrics",'
' "project": "rbe-chromium-untrusted"'
' },'
' "asan": false,'
@@ -455,7 +456,7 @@
name: "dawn/cmake"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-trusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-trusted\"}"
properties_j: "asan:false"
properties_j: "clang:false"
properties_j: "debug:false"
@@ -478,6 +479,7 @@
' "enable_cloud_monitoring": true,'
' "enable_cloud_profiler": true,'
' "enable_cloud_trace": true,'
+ ' "metrics_project": "chromium-reclient-metrics",'
' "project": "rbe-chromium-untrusted"'
' },'
' "asan": false,'
@@ -1060,7 +1062,7 @@
name: "dawn/gn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-trusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-trusted\"}"
properties_j: "clang:false"
properties_j: "debug:true"
properties_j: "gen_fuzz_corpus:false"
@@ -1082,6 +1084,7 @@
' "enable_cloud_monitoring": true,'
' "enable_cloud_profiler": true,'
' "enable_cloud_trace": true,'
+ ' "metrics_project": "chromium-reclient-metrics",'
' "project": "rbe-chromium-untrusted"'
' },'
' "clang": false,'
@@ -1101,7 +1104,7 @@
name: "dawn/gn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-trusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-trusted\"}"
properties_j: "clang:false"
properties_j: "debug:false"
properties_j: "gen_fuzz_corpus:false"
@@ -1123,6 +1126,7 @@
' "enable_cloud_monitoring": true,'
' "enable_cloud_profiler": true,'
' "enable_cloud_trace": true,'
+ ' "metrics_project": "chromium-reclient-metrics",'
' "project": "rbe-chromium-untrusted"'
' },'
' "clang": false,'
@@ -1338,7 +1342,7 @@
name: "dawn/cmake"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-untrusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-untrusted\"}"
properties_j: "asan:false"
properties_j: "clang:false"
properties_j: "debug:true"
@@ -1361,7 +1365,7 @@
name: "dawn/cmake"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-untrusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-untrusted\"}"
properties_j: "asan:false"
properties_j: "clang:false"
properties_j: "debug:false"
@@ -1613,7 +1617,7 @@
name: "dawn/gn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-untrusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-untrusted\"}"
properties_j: "clang:false"
properties_j: "debug:true"
properties_j: "gen_fuzz_corpus:false"
@@ -1635,7 +1639,7 @@
name: "dawn/gn"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
- properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"project\":\"rbe-chromium-untrusted\"}"
+ properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"project\":\"rbe-chromium-untrusted\"}"
properties_j: "clang:false"
properties_j: "debug:false"
properties_j: "gen_fuzz_corpus:false"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 1a99268..1aa958c 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -375,6 +375,7 @@
"enable_cloud_monitoring": True,
"enable_cloud_profiler": True,
"enable_cloud_trace": True,
+ "metrics_project": "chromium-reclient-metrics",
},
}
if not msvc:
@@ -386,7 +387,6 @@
}
properties["$build/reclient"] = reclient_props
properties["$build/siso"]["remote_jobs"] = remote_jobs
- properties["$build/siso"]["metrics_project"] = "chromium-reclient-metrics"
return properties
