commit 88aed614c5f2a299181084b29f60aeb46bc6a9cd
author Jason D. Clinton <jclinton@chromium.org> Sun Apr 07 20:24:05 2019 -0600
committer chrome-bot <chrome-bot@chromium.org> Mon Apr 08 11:54:41 2019 -0700
tree f8b44af032c520871419706c9d7d37b570fdf2ee
parent 4206f6a183ae23c0f0dc402e04631ec6ab5a2216

Fixup confusing Gerrit cmdline args after CQ+2 transition

BUG=chromium:902504
TEST=./run_tests

Change-Id: I672cb926d74ac7de08cd83cd5486af6f56cc9252
Reviewed-on: https://chromium-review.googlesource.com/1557592
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>

scripts/gerrit.py

diff --git a/scripts/gerrit.py b/scripts/gerrit.py
index 778e55e..558e457 100644
--- a/scripts/gerrit.py
+++ b/scripts/gerrit.py
@@ -41,7 +41,6 @@
     'COMR': ['CQ', 'Commit Queue   ',],
     'CRVW': ['CR', 'Code Review    ',],
     'SUBM': ['S ', 'Submitted      ',],
-    'TRY':  ['T ', 'Trybot Ready   ',],
     'VRIF': ['V ', 'Verified       ',],
 }
 
@@ -362,25 +361,14 @@
 
 
 def UserActReady(opts, *args):
-  """Mark CLs with a ready status"""
+  """Mark CLs with CQ dryrun (1) or ready (2) status"""
   num = args[-1]
   for arg in args[:-1]:
     helper, cl = GetGerrit(opts, arg)
     helper.SetReview(cl, labels={'Commit-Queue': num},
                      dryrun=opts.dryrun, notify=opts.notify)
 UserActReady.arg_min = 2
-UserActReady.usage = '<CLs...> <0|1>'
-
-
-def UserActTryready(opts, *args):
-  """Mark CLs with a CQ+1 try status"""
-  num = args[-1]
-  for arg in args[:-1]:
-    helper, cl = GetGerrit(opts, arg)
-    helper.SetReview(cl, labels={'Commit-Queue': num},
-                     dryrun=opts.dryrun, notify=opts.notify)
-UserActTryready.arg_min = 2
-UserActTryready.usage = '<CLs...> <0|1>'
+UserActReady.usage = '<CLs...> <0|1|2>'
 
 
 def UserActSubmit(opts, *args):