infra: Add siso properties to builders This is a preparation for builders to switch from Ninja to Siso. - Add $build/siso properties. - Set shadow properties to test CI builders with LED - Rename "reclient" with "rbe"/"siso" so that we can deprecate reclient later easily. This is required to change the dawn/gn recipe. https://crrev.com/c/6242373 Bug: 393606976 Change-Id: Ibb42187f4393df5fad47aec0a758a987a83bb2b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/225254 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Auto-Submit: Junji Watanabe <jwata@google.com>
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg index 8a7054c..4f4f315 100644 --- a/infra/config/global/generated/cr-buildbucket.cfg +++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -21,6 +21,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:true" @@ -30,6 +31,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": false,' + ' "clang": true,' + ' "debug": true,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -43,6 +68,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:true" properties_j: "clang:true" properties_j: "debug:true" @@ -52,6 +78,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": true,' + ' "clang": true,' + ' "debug": true,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -65,6 +115,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:true" @@ -74,6 +125,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": false,' + ' "clang": true,' + ' "debug": true,' + ' "target_cpu": "x64",' + ' "ubsan": true' + '}' } } builders { @@ -87,6 +162,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:false" @@ -96,6 +172,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": false,' + ' "clang": true,' + ' "debug": false,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -109,6 +209,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:true" properties_j: "clang:true" properties_j: "debug:false" @@ -118,6 +219,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": true,' + ' "clang": true,' + ' "debug": false,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -131,6 +256,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:false" @@ -140,6 +266,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": false,' + ' "clang": true,' + ' "debug": false,' + ' "target_cpu": "x64",' + ' "ubsan": true' + '}' } } builders { @@ -153,6 +303,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:true" @@ -166,6 +317,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": false,' + ' "clang": true,' + ' "debug": true,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -179,6 +354,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:false" @@ -192,6 +368,30 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "asan": false,' + ' "clang": true,' + ' "debug": false,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -204,6 +404,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}" properties_j: "asan:false" properties_j: "clang:false" properties_j: "debug:true" @@ -217,6 +418,22 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true' + ' },' + ' "asan": false,' + ' "clang": false,' + ' "debug": true,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -229,6 +446,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}" properties_j: "asan:false" properties_j: "clang:false" properties_j: "debug:false" @@ -242,6 +460,22 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true' + ' },' + ' "asan": false,' + ' "clang": false,' + ' "debug": false,' + ' "target_cpu": "x64",' + ' "ubsan": false' + '}' } } builders { @@ -255,6 +489,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:true" @@ -263,6 +498,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": false,' + ' "gen_fuzz_corpus": true,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -308,6 +566,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -316,6 +575,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": true,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -329,6 +611,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -337,6 +620,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": true,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x86"' + '}' } } builders { @@ -350,6 +656,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -358,6 +665,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": false,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -371,6 +701,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -379,6 +710,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": false,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x86"' + '}' } } builders { @@ -392,6 +746,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -404,6 +759,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": true,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -417,6 +795,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -429,6 +808,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": false,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -442,6 +844,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -454,6 +857,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": true,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -467,6 +893,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -479,6 +906,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": true,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x86"' + '}' } } builders { @@ -492,6 +942,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -504,6 +955,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": false,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -517,6 +991,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":250}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -529,6 +1004,29 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/reclient": {' + ' "instance": "rbe-chromium-untrusted",' + ' "jobs": 250,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "scandeps_server": true' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "metrics_project": "chromium-reclient-metrics",' + ' "remote_jobs": 250' + ' },' + ' "clang": true,' + ' "debug": false,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x86"' + '}' } } builders { @@ -541,6 +1039,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}" properties_j: "clang:false" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -553,6 +1052,21 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true' + ' },' + ' "clang": false,' + ' "debug": true,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } builders { @@ -565,6 +1079,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}" properties_j: "clang:false" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -577,6 +1092,21 @@ service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + properties: + '{' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true' + ' },' + ' "clang": false,' + ' "debug": false,' + ' "gen_fuzz_corpus": false,' + ' "target_cpu": "x64"' + '}' } } } @@ -618,6 +1148,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:true" @@ -637,6 +1168,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:true" properties_j: "clang:true" properties_j: "debug:true" @@ -656,6 +1188,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:true" @@ -675,6 +1208,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:false" @@ -694,6 +1228,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:true" properties_j: "clang:true" properties_j: "debug:false" @@ -713,6 +1248,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:false" @@ -732,6 +1268,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:true" @@ -755,6 +1292,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "asan:false" properties_j: "clang:true" properties_j: "debug:false" @@ -777,6 +1315,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}" properties_j: "asan:false" properties_j: "clang:false" properties_j: "debug:true" @@ -799,6 +1338,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}" properties_j: "asan:false" properties_j: "clang:false" properties_j: "debug:false" @@ -822,6 +1362,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -840,6 +1381,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -858,6 +1400,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -876,6 +1419,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -894,6 +1438,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -916,6 +1461,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -953,6 +1499,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -975,6 +1522,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -997,6 +1545,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -1019,6 +1568,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":150,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}" + properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_monitoring\":true,\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"metrics_project\":\"chromium-reclient-metrics\",\"remote_jobs\":150}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "gen_fuzz_corpus:false" @@ -1040,6 +1590,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}" properties_j: "clang:false" properties_j: "debug:true" properties_j: "gen_fuzz_corpus:false" @@ -1061,6 +1612,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}" 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 c19dc75..ba3cf87 100755 --- a/infra/config/global/main.star +++ b/infra/config/global/main.star
@@ -235,12 +235,12 @@ return "Invalid Dimension" -reclient = struct( - instance = struct( +siso = struct( + project = struct( DEFAULT_TRUSTED = "rbe-chromium-trusted", DEFAULT_UNTRUSTED = "rbe-chromium-untrusted", ), - jobs = struct( + remote_jobs = struct( HIGH_JOBS_FOR_CI = 250, LOW_JOBS_FOR_CQ = 150, ), @@ -356,7 +356,7 @@ return dimensions -def get_common_properties(os, clang, reclient_instance, reclient_jobs): +def get_common_properties(os, clang, rbe_project, remote_jobs): """Add the common properties for a builder that don't depend on being CI vs Try Args: @@ -368,14 +368,24 @@ properties = {} msvc = os.category == os_category.WINDOWS and not clang + properties = { + "$build/siso": { + "configs": ["builder"], + "enable_cloud_monitoring": True, + "enable_cloud_profiler": True, + "enable_cloud_trace": True, + }, + } if not msvc: reclient_props = { - "instance": reclient_instance, - "jobs": reclient_jobs, + "instance": rbe_project, + "jobs": remote_jobs, "metrics_project": "chromium-reclient-metrics", "scandeps_server": True, } properties["$build/reclient"] = reclient_props + properties["$build/siso"]["remote_jobs"] = remote_jobs + properties["$build/siso"]["metrics_project"] = "chromium-reclient-metrics" return properties @@ -395,10 +405,17 @@ properties_ci = get_common_properties( os, clang, - reclient.instance.DEFAULT_TRUSTED, - reclient.jobs.HIGH_JOBS_FOR_CI, + siso.project.DEFAULT_TRUSTED, + siso.remote_jobs.HIGH_JOBS_FOR_CI, ) properties_ci.update(properties) + shadow_properties_ci = get_common_properties( + os, + clang, + siso.project.DEFAULT_UNTRUSTED, + siso.remote_jobs.HIGH_JOBS_FOR_CI, + ) + shadow_properties_ci.update(properties) schedule_ci = None if fuzzer: schedule_ci = "0 0 0 * * * *" @@ -417,6 +434,7 @@ notifies = ["gardener-notifier"], service_account = "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com", shadow_service_account = "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com", + shadow_properties = shadow_properties_ci, ) def add_try_builder(name, os, properties): @@ -434,8 +452,8 @@ properties_try = get_common_properties( os, clang, - reclient.instance.DEFAULT_UNTRUSTED, - reclient.jobs.LOW_JOBS_FOR_CQ, + siso.project.DEFAULT_UNTRUSTED, + siso.remote_jobs.LOW_JOBS_FOR_CQ, ) properties_try.update(properties) luci.builder(