Make buildbucket default for git cl try

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."""
 
 from distutils.version import LooseVersion
@@ skipping 48 matching lines @@
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit'
 CHANGE_ID = 'Change-Id:'
 REFS_THAT_ALIAS_TO_OTHER_REFS = {
     'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
     'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
 }
 
 # Buildbucket-related constants
 BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'

[nodir, 2015/07/15 21:22:14]

Please make this configurable via an option

[sheyang, 2015/07/16 17:29:49]

Done.

 
 # Valid extensions for files we want to lint.
 DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
 DEFAULT_LINT_IGNORE_REGEX = r"$^"
 
 # Shortcut since it quickly becomes redundant.
 Fore = colorama.Fore
 
 # Initialized in main()
 settings = None
@@ skipping 2772 matching lines @@
 
   print "The tree is %s" % status
   print
   print GetTreeStatusReason()
   if status != 'open':
     return 1
   return 0
 
 
 def CMDtry(parser, args):
-  """Triggers a try job through Rietveld."""
+  """Triggers a try job through BuildBucket."""
+  parser.set_defaults(buildbucket=True)
   group = optparse.OptionGroup(parser, "Try job options")
   group.add_option(
       "-b", "--bot", action="append",
       help=("IMPORTANT: specify ONE builder per --bot flag. Use it multiple "
             "times to specify multiple builders. ex: "
             "'-b win_rel -b win_layout'. See "
             "the try server waterfall for the builders name and the tests "
             "available."))
   group.add_option(
       "-m", "--master", default='',
       help=("Specify a try master where to run the tries."))
   group.add_option(
       "-r", "--revision",
       help="Revision to use for the try job; default: the "
            "revision will be determined by the try server; see "
            "its waterfall for more info")
   group.add_option(
       "-c", "--clobber", action="store_true", default=False,
       help="Force a clobber before building; e.g. don't do an "
            "incremental build")
   group.add_option(
       "--project",
       help="Override which project to use. Projects are defined "
            "server-side to define what default bot set to use")
   group.add_option(
       "-n", "--name", help="Try job name; default to current branch name")
   group.add_option(
-      "--use-buildbucket", action="store_true", default=False,
+      "--use-buildbucket", dest='buildbucket', action="store_true",
       help="Use buildbucket to trigger try jobs.")
+  group.add_option(
+      "--nouse-buildbucket", dest='buildbucket', action="store_false",

[nodir, 2015/07/15 21:22:14]

Why do you need both options?

[sheyang, 2015/07/16 17:29:49]

Don't remember, probably just want to preserve "--use-buildbucket".

Removed.

+      help="Use Rietveld to trigger try jobs.")
   parser.add_option_group(group)
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
   auth_config = auth.extract_auth_config_from_options(options)
 
   if args:
     parser.error('Unknown arguments: %s' % args)
 
   cl = Changelist(auth_config=auth_config)
   if not cl.GetIssue():
@@ skipping 77 matching lines @@
           'Instead send your job to the parent.\n'
           'Bot list: %s' % builders)
       return 1
 
   patchset = cl.GetMostRecentPatchset()
   if patchset and patchset != cl.GetPatchset():
     print(
         '\nWARNING Mismatch between local config and server. Did a previous '
         'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
         'Continuing using\npatchset %s.\n' % patchset)
-  if options.use_buildbucket:
+  if options.buildbucket:
     try:
       trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
     except BuildbucketResponseException as ex:
       print 'ERROR: %s' % ex
       return 1
     except Exception as e:
       stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
       print 'ERROR: Exception when trying to trigger tryjobs: %s\n%s' % (
           e, stacktrace)
       return 1
@@ skipping 342 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()
   colorama.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)