remove luci hacks

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 23 matching lines @@
 
 try:
   import readline  # pylint: disable=F0401,W0611
 except ImportError:
   pass
 
 from third_party import colorama
 from third_party import httplib2
 from third_party import upload
 import auth
-from luci_hacks import trigger_luci_job as luci_trigger
 import clang_format
 import commit_queue
 import dart_format
 import setup_color
 import fix_encoding
 import gclient_utils
 import gerrit_util
 import git_cache
 import git_common
 import git_footers
@@ skipping 219 matching lines @@
     if response.status < 500 or try_count >= 2:
       raise httplib2.HttpLib2Error(content)
 
     # status >= 500 means transient failures.
     logging.debug('Transient errors when %s. Will retry.', operation_name)
     time.sleep(0.5 + 1.5*try_count)
     try_count += 1
   assert False, 'unreachable'
 
 
-def trigger_luci_job(changelist, masters, options):
-  """Send a job to run on LUCI."""
-  issue_props = changelist.GetIssueProperties()
-  issue = changelist.GetIssue()
-  patchset = changelist.GetMostRecentPatchset()
-  for builders_and_tests in sorted(masters.itervalues()):
-    # TODO(hinoka et al): add support for other properties.
-    # Currently, this completely ignores testfilter and other properties.
-    for builder in sorted(builders_and_tests):
-      luci_trigger.trigger(
-          builder, 'HEAD', issue, patchset, issue_props['project'])
-
-
 def trigger_try_jobs(auth_config, changelist, options, masters, category):
   rietveld_url = settings.GetDefaultServerUrl()
   rietveld_host = urlparse.urlparse(rietveld_url).hostname
   authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
   http = authenticator.authorize(httplib2.Http())
   http.force_exception_to_status_code = True
   issue_props = changelist.GetIssueProperties()
   issue = changelist.GetIssue()
   patchset = changelist.GetMostRecentPatchset()
   properties = _get_properties_from_options(options)
@@ skipping 4136 matching lines @@
   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( "--luci", action='store_true')
   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(
@@ skipping 141 matching lines @@
             '  Instead send your job to the parent.\n'
             'Bot list: %s' % builders, file=sys.stderr)
       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.luci:
-    trigger_luci_job(cl, masters, options)
-  elif not options.use_rietveld:
+  if not options.use_rietveld:
     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 476 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)