git cl try: Trigger CQ Dry Run by default.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 4532 matching lines @@
       # Fall back to deprecated method: get try slaves from PRESUBMIT.py files.
       options.bot = presubmit_support.DoGetTrySlaves(
           change,
           change.LocalPaths(),
           settings.GetRoot(),
           None,
           None,
           options.verbose,
           sys.stdout)
 
-      if not options.bot:
-        # Get try masters from cq.cfg if any.
-        # TODO(tandrii): some (but very few) projects store cq.cfg in different
-        # location.
-        cq_cfg = os.path.join(change.RepositoryRoot(),
-                              'infra', 'config', 'cq.cfg')
-        if os.path.exists(cq_cfg):
-          masters = {}
-          cq_masters = commit_queue.get_master_builder_map(
-              cq_cfg, include_experimental=False, include_triggered=False)
-          for master, builders in cq_masters.iteritems():
-            for builder in builders:
-              # Skip presubmit builders, because these will fail without LGTM.
-              masters.setdefault(master, {})[builder] = ['defaulttests']
-          if masters:
-            print('Loaded default bots from CQ config (%s)' % cq_cfg)
-            return masters
-          else:
-            print('CQ config exists (%s) but has no try bots listed' % cq_cfg)
-
     if not options.bot:
-      parser.error('No default try builder to try, use --bot')
+      return {}
 
     builders_and_tests = {}
     # TODO(machenbach): The old style command-line options don't support
     # multiple try masters yet.
     old_style = filter(lambda x: isinstance(x, basestring), options.bot)
     new_style = filter(lambda x: isinstance(x, tuple), options.bot)
 
     for bot in old_style:
       if ':' in bot:
         parser.error('Specifying testfilter is no longer supported')
       elif ',' in bot:
         parser.error('Specify one bot per --bot flag')
       else:
         builders_and_tests.setdefault(bot, [])
 
     for bot, tests in new_style:
       builders_and_tests.setdefault(bot, []).extend(tests)
 
     # Return a master map with one master to be backwards compatible. The
     # master name defaults to an empty string, which will cause the master
     # not to be set on rietveld (deprecated).
     return {options.master: builders_and_tests}
 
   masters = GetMasterMap()
+  if not masters:
+    # Default to triggering Dry Run (see http://crbug.com/625697).
+    if options.verbose:
+      print('git cl try with no bots now defaults to CQ Dry Run.')
+    try:
+      cl.SetCQState(_CQState.DRY_RUN)
+      print('scheduled CQ Dry Run on %s' % cl.GetIssueURL())
+      return 0
+    except KeyboardInterrupt:
+      raise
+    except:

[Paweł Hajdan Jr., 2016/07/13 09:55:46]

I'd usually catch Exception here, with no need then to explicitly mention
KeyboardInterrupt. Up to you.

[tandrii(chromium), 2016/07/13 09:57:51]

the purpose of explicitly mentioning Keyboard interrupt is to avoid printing
warning below.

+      print('WARNING: failed to trigger CQ Dry Run.\n'
+            'Either:\n'
+            ' * your project has no CQ\n'
+            ' * you don\'t have permission to trigger Dry Run\n'
+            ' * bug in this code (see stack trace below).\n'
+            'Consider specifying which bots to trigger manually '
+            'or asking your project owners for permissions '
+            'or contacting Chrome Infrastructure team at '
+            'https://www.chromium.org/infra\n\n')
+      # Still raise exception so that stack trace is printed.
+      raise
 
   for builders in masters.itervalues():
     if any('triggered' in b for b in builders):
       print('ERROR You are trying to send a job to a triggered bot. This type '
             'of bot requires an\ninitial job from a parent (usually a builder).'
             '  Instead send your job to the parent.\n'
             'Bot list: %s' % builders, file=sys.stderr)
       return 1
 
   patchset = cl.GetMostRecentPatchset()
@@ skipping 133 matching lines @@
 
   cl = Changelist(auth_config=auth_config)
   if options.clear:
     state = _CQState.CLEAR
   elif options.dry_run:
     state = _CQState.DRY_RUN
   else:
     state = _CQState.COMMIT
   if not cl.GetIssue():
     parser.error('Must upload the issue first')
-  cl._codereview_impl.SetCQState(state)
+  cl.SetCQState(state)
   return 0
 
 
 def CMDset_close(parser, args):
   """Closes the issue."""
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
   auth_config = auth.extract_auth_config_from_options(options)
   if args:
     parser.error('Unrecognized args: %s' % ' '.join(args))
@@ skipping 340 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)