Commit db37557b authored by sheyang@chromium.org's avatar sheyang@chromium.org

Make buildbucket default for git cl try

BUG=461614

Review URL: https://codereview.chromium.org/1132913005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296339 0039d316-1c4b-4281-b951-d872f2087c98
parent fed8b4e9
...@@ -67,9 +67,6 @@ REFS_THAT_ALIAS_TO_OTHER_REFS = { ...@@ -67,9 +67,6 @@ REFS_THAT_ALIAS_TO_OTHER_REFS = {
'refs/remotes/origin/lkcr': 'refs/remotes/origin/master', 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
} }
# Buildbucket-related constants
BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
# Valid extensions for files we want to lint. # Valid extensions for files we want to lint.
DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)" DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
DEFAULT_LINT_IGNORE_REGEX = r"$^" DEFAULT_LINT_IGNORE_REGEX = r"$^"
...@@ -244,7 +241,7 @@ def trigger_try_jobs(auth_config, changelist, options, masters, category, ...@@ -244,7 +241,7 @@ def trigger_try_jobs(auth_config, changelist, options, masters, category,
buildbucket_put_url = ( buildbucket_put_url = (
'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format( 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
hostname=BUILDBUCKET_HOST)) hostname=options.buildbucket_host))
buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format( buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
hostname=rietveld_host, hostname=rietveld_host,
issue=issue, issue=issue,
...@@ -3050,7 +3047,7 @@ def CMDtree(parser, args): ...@@ -3050,7 +3047,7 @@ def CMDtree(parser, args):
def CMDtry(parser, args): def CMDtry(parser, args):
"""Triggers a try job through Rietveld.""" """Triggers a try job through BuildBucket."""
group = optparse.OptionGroup(parser, "Try job options") group = optparse.OptionGroup(parser, "Try job options")
group.add_option( group.add_option(
"-b", "--bot", action="append", "-b", "--bot", action="append",
...@@ -3078,8 +3075,11 @@ def CMDtry(parser, args): ...@@ -3078,8 +3075,11 @@ def CMDtry(parser, args):
group.add_option( group.add_option(
"-n", "--name", help="Try job name; default to current branch name") "-n", "--name", help="Try job name; default to current branch name")
group.add_option( group.add_option(
"--use-buildbucket", action="store_true", default=False, "--use-rietveld", action="store_true", default=False,
help="Use buildbucket to trigger try jobs.") help="Use Rietveld to trigger try jobs.")
group.add_option(
"--buildbucket-host", default='cr-buildbucket.appspot.com',
help="Host of buildbucket. The default host is %default.")
parser.add_option_group(group) parser.add_option_group(group)
auth.add_auth_options(parser) auth.add_auth_options(parser)
options, args = parser.parse_args(args) options, args = parser.parse_args(args)
...@@ -3177,7 +3177,7 @@ def CMDtry(parser, args): ...@@ -3177,7 +3177,7 @@ def CMDtry(parser, args):
'\nWARNING Mismatch between local config and server. Did a previous ' '\nWARNING Mismatch between local config and server. Did a previous '
'upload fail?\ngit-cl try always uses latest patchset from rietveld. ' 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
'Continuing using\npatchset %s.\n' % patchset) 'Continuing using\npatchset %s.\n' % patchset)
if options.use_buildbucket: if not options.use_rietveld:
try: try:
trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try') trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
except BuildbucketResponseException as ex: except BuildbucketResponseException as ex:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment