autoroller: Add CQ_EXTRA_TRYBOTS, CQ feature and --skip-cq flag.

tools/autoroller/roll_chromium_revision.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Script to roll chromium_revision in the WebRTC DEPS file."""
 
 import argparse
 import base64
 import collections
 import logging
 import os
 import re
 import subprocess
 import sys
 import urllib
 
 
 CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src'
 CHROMIUM_COMMIT_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s'
 CHROMIUM_LOG_TEMPLATE = CHROMIUM_SRC_URL + '/+log/%s'
 CHROMIUM_FILE_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s/%s'
 
+# Run these CQ trybots in addition to the default ones in infra/config/cq.cfg.
+EXTRA_TRYBOTS = 'tryserver.webrtc:win_baremetal,mac_baremetal,linux_baremetal'
+
 COMMIT_POSITION_RE = re.compile('^Cr-Commit-Position: .*#([0-9]+).*$')
 CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION=(\d+)$')
 ROLL_BRANCH_NAME = 'roll_chromium_revision'
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 CHECKOUT_ROOT_DIR = os.path.realpath(os.path.join(SCRIPT_DIR, os.pardir,
                                                   os.pardir))
 sys.path.append(CHECKOUT_ROOT_DIR)
 import setup_links
 
@@ skipping 215 matching lines @@
   current_cr_rev = current_cr_rev[0:7]
   new_cr_rev = new_cr_rev[0:7]
   rev_interval = '%s..%s' % (current_cr_rev, new_cr_rev)
   git_number_interval = '%s:%s' % (current_commit_pos, new_commit_pos)
 
   commit_msg = ['Roll chromium_revision %s (%s)\n' % (rev_interval,
                                                     git_number_interval)]
   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:')
 
     for c in changed_deps_list:
       commit_msg.append('* %s: %s/+log/%s..%s' % (c.path, c.url,
                                                   c.current_rev[0:7],
                                                   c.new_rev[0:7]))
       if 'libvpx' in c.path:
         tbr_authors += 'marpan@webrtc.org, stefan@webrtc.org, '
 
     change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval, 'DEPS')
     commit_msg.append('DEPS diff: %s\n' % change_url)
   else:
     commit_msg.append('No dependencies changed.')
 
   if clang_change.current_rev != clang_change.new_rev:
     commit_msg.append('Clang version changed %s:%s' %
                       (clang_change.current_rev, clang_change.new_rev))
     change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval,
                                            CLANG_UPDATE_SCRIPT_URL_PATH)
-    commit_msg.append('Details: %s' % change_url)
+    commit_msg.append('Details: %s\n' % change_url)
     tbr_authors += 'pbos@webrtc.org'
   else:
-    commit_msg.append('No update to Clang.')
+    commit_msg.append('No update to Clang.\n')
 
-  commit_msg.append('\nTBR=%s\n' % tbr_authors)
+  commit_msg.append('TBR=%s' % tbr_authors)
+  commit_msg.append('CQ_EXTRA_TRYBOTS=%s' % EXTRA_TRYBOTS)
   return '\n'.join(commit_msg)
 
 
 def UpdateDeps(deps_filename, old_cr_revision, new_cr_revision):
   """Update the DEPS file with the new revision."""
   with open(deps_filename, 'rb') as deps_file:
     deps_content = deps_file.read()
   deps_content = deps_content.replace(old_cr_revision, new_cr_revision)
   with open(deps_filename, 'wb') as deps_file:
     deps_file.write(deps_content)
@@ skipping 48 matching lines @@
   if not dry_run:
     _RunCommand(['git', 'cl', 'upload'], extra_env={'EDITOR': 'true'})
 
 
 def _LaunchTrybots(dry_run, skip_try):
   logging.info('Sending tryjobs...')
   if not dry_run and not skip_try:
     _RunCommand(['git', 'cl', 'try'])
 
 
+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,
                  help='Removes any previous local roll branch.')
   p.add_argument('-r', '--revision',
                  help=('Chromium Git revision to roll to. Defaults to the '
                        'Chromium HEAD revision if omitted.'))
   p.add_argument('--dry-run', action='store_true', default=False,
                  help=('Calculate changes and modify DEPS, but don\'t create '
                        'any local branch, commit, upload CL or send any '
                        'tryjobs.'))
   p.add_argument('--allow-reverse', action='store_true', default=False,
                  help=('Allow rolling back in time (disabled by default but '
                        'may be useful to be able do to manually).'))
   p.add_argument('-s', '--skip-try', action='store_true', default=False,
-                 help='Do everything except sending tryjobs.')
+                 help='Skip sending tryjobs (default: %(default)s)')
+  p.add_argument('--skip-cq', action='store_true', default=False,
+                 help='Skip sending the CL to the CQ (default: %(default)s)')
   p.add_argument('-v', '--verbose', action='store_true', default=False,
                  help='Be extra verbose in printing of log messages.')
   opts = p.parse_args()
 
   if opts.verbose:
     logging.basicConfig(level=logging.DEBUG)
   else:
     logging.basicConfig(level=logging.INFO)
 
   if not _IsTreeClean():
@@ skipping 35 matching lines @@
                  '--allow-reverse flag.\n'
                  'Aborting without action.', current_cr_rev, current_commit_pos,
                  new_cr_rev, new_commit_pos)
     return 0
 
   _CreateRollBranch(opts.dry_run)
   UpdateDeps(deps_filename, current_cr_rev, new_cr_rev)
   _LocalCommit(commit_msg, opts.dry_run)
   _UploadCL(opts.dry_run)
   _LaunchTrybots(opts.dry_run, opts.skip_try)
+  _SendToCQ(opts.dry_run, opts.skip_cq)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())