commit 033a1bf33777ca06c3b968f0cf61af3af13804f2
author Edward Lemur <ehmaldonado@webrtc.org> Thu Sep 14 12:50:54 2017
committer Commit Bot <commit-bot@chromium.org> Thu Sep 14 12:55:59 2017
tree c478439a28f607b954c3a3b69167f7bad9f80ffe
parent 73276ad7ed1e70ab764cd02d7189ed5839fadc20

Update autoroller to use Gerrit.

Rietveld has been having problems since the migration.

NOTRY=True

Bug: chromium:738330
Change-Id: I54538eee9f5734fac731702fb592580afcae3fae
Reviewed-on: https://webrtc-review.googlesource.com/1231
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19834}

tools_webrtc/autoroller/roll_deps.py

diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py
index 26015d2..16cecaf 100755
--- a/tools_webrtc/autoroller/roll_deps.py
+++ b/tools_webrtc/autoroller/roll_deps.py
@@ -292,8 +292,6 @@
   commit_msg.append('Change log: %s' % (CHROMIUM_LOG_TEMPLATE % rev_interval))
   commit_msg.append('Full diff: %s\n' % (CHROMIUM_COMMIT_TEMPLATE %
                                          rev_interval))
-  # TBR field will be empty unless in some custom cases, where some engineers
-  # are added.
   tbr_authors = ''
   if changed_deps_list:
     commit_msg.append('Changed dependencies:')
@@ -319,7 +317,8 @@
   else:
     commit_msg.append('No update to Clang.\n')
 
-  commit_msg.append('TBR=%s' % tbr_authors)
+  # TBR needs to be non-empty for Gerrit to process it.
+  commit_msg.append('TBR=kjellander@webrtc.org, %s' % tbr_authors)
   commit_msg.append('BUG=None')
   commit_msg.append('CQ_INCLUDE_TRYBOTS=%s' % EXTRA_TRYBOTS)
   return '\n'.join(commit_msg)
@@ -399,22 +398,16 @@
     _RunCommand(['git', 'commit', '-m', commit_msg])
 
 
-def _UploadCL(dry_run, rietveld_email=None):
+def _UploadCL(dry_run, skip_cq=False):
   logging.info('Uploading CL...')
   if not dry_run:
-    cmd = ['git', 'cl', 'upload', '-f']
-    if rietveld_email:
-      cmd.append('--email=%s' % rietveld_email)
+    cmd = ['git', 'cl', 'upload', '-f', '--gerrit']
+    if not skip_cq:
+      logging.info('Sending the CL to the CQ...')
+      cmd.extend(['--use-commit-queue', '--send-mail'])
     _RunCommand(cmd, extra_env={'EDITOR': 'true'})
 
 
-def _SendToCQ(dry_run, skip_cq):
-  logging.info('Sending the CL to the CQ...')
-  if not dry_run and not skip_cq:
-    _RunCommand(['git', 'cl', 'set_commit'])
-    logging.info('Sent the CL to the CQ.')
-
-
 def main():
   p = argparse.ArgumentParser()
   p.add_argument('--clean', action='store_true', default=False,
@@ -483,8 +476,7 @@
     logging.info("No DEPS changes detected, skipping CL creation.")
   else:
     _LocalCommit(commit_msg, opts.dry_run)
-    _UploadCL(opts.dry_run, opts.rietveld_email)
-    _SendToCQ(opts.dry_run, opts.skip_cq)
+    _UploadCL(opts.dry_run, opts.skip_cq)
   return 0