project.config: accept LUCI-TryBot-Result in addition to TryBot-Result

The pre-submit testing as implemented in LUCI has reached a point where
a passing LUCI-TryBot-Result provides sufficient signal to consider the
the TryBots-Pass submit requirement met.

Change-Id: I319727b88314b8758afe32674fb5a16eaad3c5ab
Reviewed-on: https://go-review.googlesource.com/c/All-Projects/+/523735
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>

project.config

diff --git a/project.config b/project.config
index b0b484d..e34cf29 100644
--- a/project.config
+++ b/project.config
@@ -95,12 +95,14 @@
 	value = 0 This change can be submitted.
 	value = +1 Hold this change: don't submit it yet.
 [label "Run-TryBot"]
+	description = Used to start legacy TryBots.
 	function = NoBlock
 	defaultValue = 0
 	value = 0 Don't test
-	value = +1 Run TryBots
+	value = +1 Run legacy TryBots
 	copyCondition = changekind:NO_CODE_CHANGE
 [label "TryBot-Result"]
+	description = Label for reporting legacy TryBot results.
 	function = NoBlock
 	defaultValue = 0
 	value = -1 TryBots failed
@@ -108,7 +110,7 @@
 	value = +1 TryBots succeeded
 	copyCondition = changekind:NO_CODE_CHANGE
 [label "LUCI-TryBot-Result"]
-	description = Label for reporting LUCI results (used only temporarily during LUCI development)
+	description = Label for reporting LUCI TryBot results.
 	function = NoBlock
 	defaultValue = 0
 	value = -1 TryBots failed
@@ -133,10 +135,10 @@
 	function = NoBlock
 	defaultValue = 0
 [label "Commit-Queue"]
-	description = Experimental Commit Queue and TryBots
+	description = Used to start LUCI TryBots.
 	abbreviation = CQ
-	value = 0 Not ready
-	value = +1 Dry run
+	value = 0 Don't test
+	value = +1 Run LUCI TryBots
 	value = +2 Commit
 	function = NoBlock
 	copyCondition = changekind:NO_CODE_CHANGE
@@ -197,7 +199,7 @@
 	canOverrideInChildProjects = false
 [submit-requirement "TryBots-Pass"]
 	description = Changes must pass TryBots unless TryBot-Bypass+1 is set.
-	applicableIf = -branch:refs/meta/config -label:TryBot-Result=MAX
+	applicableIf = -branch:refs/meta/config -(label:LUCI-TryBot-Result=MAX OR label:TryBot-Result=MAX)
 	submittableIf = is:false
 	overrideIf = label:TryBot-Bypass=MAX
 	canOverrideInChildProjects = true