Add CQ group to run Verify luci-test builder
The group runs the job when changes appear on gerrit
Change-Id: If76d9c5b4f2d99019c47dbcbfdf1ed90994d6f8e
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
new file mode 100644
index 0000000..a789708
--- /dev/null
+++ b/generated/commit-queue.cfg
@@ -0,0 +1,33 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Config message:
+# https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
+
+config_groups {
+ name: "luci-test_repo"
+ gerrit {
+ url: "https://gerrit-review.googlesource.com"
+ projects {
+ name: "luci-test"
+ ref_regexp: "refs/heads/.+"
+ }
+ }
+ verifiers {
+ gerrit_cq_ability {
+ committer_list: "project-gerrit-committers"
+ }
+ tryjob {
+ builders {
+ name: "gerrit/try/Verify luci-test CL"
+ }
+ retry_config {
+ single_quota: 1
+ global_quota: 2
+ failure_weight: 100
+ transient_failure_weight: 1
+ timeout_weight: 100
+ }
+ }
+ }
+}
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 5e9525a..40a9d06 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -25,6 +25,27 @@
value: 100
}
}
+ builders {
+ name: "Verify luci-test CL"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu"
+ dimensions: "pool:luci.gerrit.ci"
+ exe {
+ cipd_package: "infra/recipe_bundles/gerrit.googlesource.com/luci-config"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "recipe": "luci-test"'
+ '}'
+ service_account: "gerrit-luci-ci-builder@gerritcodereview-ci.iam.gserviceaccount.com"
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
}
}
buckets {
@@ -32,4 +53,27 @@
}
buckets {
name: "try"
+ swarming {
+ builders {
+ name: "Verify luci-test CL"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu"
+ dimensions: "pool:luci.gerrit.try"
+ exe {
+ cipd_package: "infra/recipe_bundles/gerrit.googlesource.com/luci-config"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "recipe": "luci-test"'
+ '}'
+ service_account: "gerrit-luci-try-builder@gerritcodereview-ci.iam.gserviceaccount.com"
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ }
}
diff --git a/generated/project.cfg b/generated/project.cfg
index 7c41c9c..0da0da5 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -6,10 +6,9 @@
name: "gerrit"
lucicfg {
- version: "1.33.2"
+ version: "1.35.2"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
- experiments: "crbug.com/1171945"
experiments: "crbug.com/1347252"
}
diff --git a/generated/realms.cfg b/generated/realms.cfg
index 60b9333..f7a4823 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -35,6 +35,7 @@
name: "ci"
bindings {
role: "role/buildbucket.builderServiceAccount"
+ principals: "user:gerrit-luci-ci-builder@gerritcodereview-ci.iam.gserviceaccount.com"
principals: "user:luci-tasks@gerritcodereview-ci.iam.gserviceaccount.com"
}
}
@@ -49,4 +50,8 @@
}
realms {
name: "try"
+ bindings {
+ role: "role/buildbucket.builderServiceAccount"
+ principals: "user:gerrit-luci-try-builder@gerritcodereview-ci.iam.gserviceaccount.com"
+ }
}
diff --git a/main.star b/main.star
index ae3ecea..12f9604 100755
--- a/main.star
+++ b/main.star
@@ -103,11 +103,11 @@
# Defines a builder to run the "luci-test" recipe in a given bucket. This will
# be hooked up to the CQ label rather than having a set schedule.
-def verify_luci-test_builder(bucket):
+def verify_luci_test_builder(bucket):
luci.builder(
name = "Verify luci-test CL",
bucket = bucket,
- executable = build.recipe(
+ executable = luci.recipe(
# The name of the recipe we just made.
name = "luci-test",
),
@@ -119,5 +119,26 @@
},
)
-verify_luci-test_builder("try")
-verify_luci-test_builder("ci")
+verify_luci_test_builder("try")
+verify_luci_test_builder("ci")
+
+# Create a CQ group to watch luci-test repo for changes.
+luci.cq_group(
+ name = "luci-test_repo",
+ acls = [
+ acl.entry(
+ acl.CQ_COMMITTER,
+ groups = "project-gerrit-committers",
+ )
+ ],
+ watch = cq.refset(
+ repo = "https://gerrit.googlesource.com/luci-test",
+ refs = ["refs/heads/.+"], # will watch all branches
+ ),
+)
+
+# Attach our "Verify luci-test CL" builder to this CQ group.
+luci.cq_tryjob_verifier(
+ builder = "try/Verify luci-test CL",
+ cq_group = "luci-test_repo",
+)
