project.config: require passing LUCI TryBots Currently, LUCI-TryBot-Result+1 (LUCI) or TryBot-Result+1 (legacy) is sufficient to allow submission. Remove the latter, thus requiring LUCI TryBots. Drop the "LUCI-Pass" submit requirement for release branches, as it is now redundant with "TryBots-Pass". Add a new "Legacy-TryBots-Pass" submit requirement that requires legacy TryBots to pass only if they have been requested (Run-TryBot+1). This is helpful to prevent auto-submit from proceeding while legacy slowbots are running, for example. Change-Id: I79de8e951507282232429b17355cbd412ea8bd3f Reviewed-on: https://go-review.googlesource.com/c/All-Projects/+/564618 Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
diff --git a/project.config b/project.config index 38067be..594e7ca 100644 --- a/project.config +++ b/project.config
@@ -127,8 +127,8 @@ [label "TryBot-Bypass"] function = NoBlock defaultValue = 0 - value = 0 Require TryBot-Result+1 to submit - value = +1 Ignore missing or failing TryBot-Result + value = 0 Require LUCI-TryBot-Result+1 to submit + value = +1 Ignore missing or failing LUCI-TryBot-Result copyCondition = changekind:NO_CODE_CHANGE [label "Bot-Commit"] value = 0 No score @@ -185,15 +185,15 @@ submittableIf = label:Code-Review=MAX,user=non_uploader canOverrideInChildProjects = true [submit-requirement "TryBots-Pass"] - description = Changes must pass TryBots unless TryBot-Bypass+1 is set. + description = Changes must pass LUCI TryBots unless TryBot-Bypass+1 is set. Vote Commit-Queue+1 to trigger TryBots. applicableIf = -branch:refs/meta/config - submittableIf = label:LUCI-TryBot-Result=MAX OR label:TryBot-Result=MAX + submittableIf = label:LUCI-TryBot-Result=MAX overrideIf = label:TryBot-Bypass=MAX canOverrideInChildProjects = true -[submit-requirement "LUCI-Pass"] - description = Changes on release branches must pass LUCI unless TryBot-Bypass+1 is set. - applicableIf = branch:\"^refs/heads/release-branch.+\" - submittableIf = label:LUCI-TryBot-Result=MAX +[submit-requirement "Legacy-TryBots-Pass"] + description = Legacy TryBots must pass if requested, unless TryBot-Bypass+1 is set. + applicableIf = label:Run-TryBot=MAX + submittableIf = label:TryBot-Result=MAX overrideIf = label:TryBot-Bypass=MAX canOverrideInChildProjects = true [submit-requirement "No-Unresolved-Comments"]