Merge "Import changes for goma server" into main
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
index 765208b..e411c0f 100644
--- a/infra/config/generated/commit-queue.cfg
+++ b/infra/config/generated/commit-queue.cfg
@@ -6,7 +6,7 @@
cq_status_host: "chromium-cq-status.appspot.com"
config_groups {
- name: "Main CQ"
+ name: "Main_CQ"
gerrit {
url: "https://chromium-review.googlesource.com"
projects {
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 783ebdc..a07c85e 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -20,20 +20,20 @@
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.flex.try"
- recipe {
- name: "goma_server"
+ exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/main"
+ cmd: "luciexe"
}
+ properties:
+ '{'
+ ' "recipe": "goma_server"'
+ '}'
service_account: "goma-server-ext-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
}
}
diff --git a/infra/config/generated/project.cfg b/infra/config/generated/project.cfg
index ad4b107..20b7f59 100644
--- a/infra/config/generated/project.cfg
+++ b/infra/config/generated/project.cfg
@@ -7,7 +7,7 @@
name: "goma-server"
access: "group:all"
lucicfg {
- version: "1.29.1"
+ version: "1.30.9"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/main.star b/infra/config/main.star
index e3b19cc..f6b3308 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -1,12 +1,6 @@
#!/usr/bin/env lucicfg
-lucicfg.check_version("1.29.0", "Please update depot_tools")
-
-# Enable LUCI Realms support.
-lucicfg.enable_experiment("crbug.com/1085650")
-
-# Launch 100% of Swarming tasks for builds in "realms-aware mode"
-luci.builder.defaults.experiments.set({"luci.use_realms": 100})
+lucicfg.check_version("1.30.9", "Please update depot_tools")
luci.project(
name = "goma-server",
@@ -76,7 +70,7 @@
# The CQ group with all pre-submit builders, referenced below.
luci.cq_group(
- name = "Main CQ",
+ name = "Main_CQ",
watch = cq.refset(
repo = "https://chromium-review.googlesource.com/infra/goma/server",
refs = ["refs/heads/.+"],
@@ -89,6 +83,7 @@
executable = luci.recipe(
name = "goma_server",
cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
+ use_bbagent = True,
),
dimensions = {
"pool": "luci.flex.try",
@@ -103,7 +98,7 @@
# Add to the CQ.
luci.cq_tryjob_verifier(
builder = "try/linux_rel",
- cq_group = "Main CQ",
+ cq_group = "Main_CQ",
)
# And also to the pre-submit builders list.
