diff --git a/docs/dawn/infra.md b/docs/dawn/infra.md index de9898ad34..aa01925344 100644 --- a/docs/dawn/infra.md +++ b/docs/dawn/infra.md @@ -85,7 +85,7 @@ Using the [[chromium/tools/build]//scripts/slave/recipes/chromium_trybot.py](htt ## Bot Allocation -Bots are physically allocated based on the configuration in [[chromium/infradata/config]//configs/chromium-swarm/starlark/bots/dawn.star](https://chrome-internal.googlesource.com/infradata/config/+/refs/heads/master/configs/chromium-swarm/starlark/bots/dawn.star) (Google only). +Bots are physically allocated based on the configuration in [[chromium/infradata/config]//configs/chromium-swarm/starlark/bots/dawn.star](https://chrome-internal.googlesource.com/infradata/config/+/refs/heads/main/configs/chromium-swarm/starlark/bots/dawn.star) (Google only). `dawn/try` bots are using builderless configurations which means they use builderless GCEs shared with Chromium bots and don't need explicit allocation. diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg index 732cf74342..9c58b0180f 100644 --- a/infra/config/global/generated/cr-buildbucket.cfg +++ b/infra/config/global/generated/cr-buildbucket.cfg @@ -19,7 +19,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:false" @@ -41,7 +41,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:true" @@ -62,7 +62,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:true" @@ -83,7 +83,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:false" @@ -104,7 +104,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:false" @@ -125,7 +125,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:true" @@ -150,7 +150,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:false" @@ -175,7 +175,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:true" @@ -200,7 +200,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:true" @@ -225,7 +225,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:false" @@ -250,7 +250,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "clang:true" properties_j: "debug:false" @@ -275,7 +275,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "clang:false" properties_j: "debug:true" properties_j: "target_cpu:\"x64\"" @@ -295,7 +295,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "clang:false" properties_j: "debug:false" properties_j: "target_cpu:\"x64\"" @@ -331,7 +331,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -353,7 +353,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -375,7 +375,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -397,7 +397,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -419,7 +419,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -445,7 +445,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -471,7 +471,7 @@ buckets { recipe { name: "run_presubmit" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "repo_name:\"dawn\"" properties_j: "runhooks:true" @@ -491,7 +491,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -517,7 +517,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -543,7 +543,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -569,7 +569,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:true" @@ -595,7 +595,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:false" properties_j: "debug:true" @@ -616,7 +616,7 @@ buckets { recipe { name: "dawn" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/master" + cipd_version: "refs/heads/main" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" properties_j: "clang:false" properties_j: "debug:false" diff --git a/infra/config/global/main.star b/infra/config/global/main.star index 0a67b26294..051e75799a 100755 --- a/infra/config/global/main.star +++ b/infra/config/global/main.star @@ -128,7 +128,7 @@ def get_builder_executable(): return luci.recipe( name = "dawn", cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build", - cipd_version = "refs/heads/master", + cipd_version = "refs/heads/main", ) def get_presubmit_executable(): @@ -140,7 +140,7 @@ def get_presubmit_executable(): return luci.recipe( name = "run_presubmit", cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build", - cipd_version = "refs/heads/master", + cipd_version = "refs/heads/main", ) def get_os_from_arg(arg):