Revert of Use [CACHE]/cipd/goma for goma_dir in recipes/chromium_codesearch.py

scripts/slave/recipes/chromium_codesearch.py

 # Copyright 2014 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.
 
 from recipe_engine.types import freeze
 
 DEPS = [
+  'depot_tools/bot_update',
   'chromium',
   'commit_position',
-  'depot_tools/bot_update',
+  'file',
   'depot_tools/gclient',
-  'file',
-  'goma',
   'gsutil',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
 ]
 
 BUCKET_NAME = 'chrome-codesearch'
@@ skipping 15 matching lines @@
   'tools/deps2git': '%s/chromium/tools/deps2git' % CHROMIUM_GIT_URL,
   'tools/gsd_generate_index':\
       '%s/chromium/tools/gsd_generate_index' % CHROMIUM_GIT_URL,
   'tools/perf': '%s/chromium/tools/perf' % CHROMIUM_GIT_URL,
 })
 
 LINUX_GN_ARGS = [
   'is_clang=true',
   'is_component_build=true',
   'is_debug=true',
+  'goma_dir="/b/build/goma"',
   'symbol_level=1',
   'target_cpu="x64"',
+  'use_goma=true',
 ]
 
 CHROMEOS_GN_ARGS = LINUX_GN_ARGS + [
   'target_os="chromeos"',
   'use_ozone=true',
 ]
 
 SPEC = freeze({
   # The builders have the following parameters:
   # - compile_targets: the compile targets.
@@ skipping 34 matching lines @@
       'platform': 'chromeos',
     },
   },
 })
 
 def GenerateCompilationDatabase(api, debug_path, targets, platform):
   # TODO(akuegel): If we ever build on Windows or Mac, this needs to be
   # adjusted.
   gn_path = api.path['checkout'].join('buildtools', 'linux64', 'gn')
   args = LINUX_GN_ARGS if platform == 'linux' else CHROMEOS_GN_ARGS
-  args.extend(['use_goma=true',
-               'goma_dir=%s' % api.goma.goma_dir])
   command = [gn_path, 'gen', debug_path, '--args=%s' % ' '.join(args)]
   api.step('generate build files for %s' % platform, command,
            cwd=api.path['checkout'])
   command = ['ninja', '-C', debug_path] + list(targets)
   # Add the parameters for creating the compilation database.
   command += ['-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx']
-
-  command += ['-j', api.goma.recommended_goma_jobs]
-
-  with api.goma.build_with_goma(
-      ninja_log_outdir=debug_path,
-      ninja_log_command=command,
-      ninja_log_compiler='goma'):
-    return api.step('generate compilation database for %s' % platform,
-                    command,
-                    stdout=api.raw_io.output())
+  return api.step('generate compilation database for %s' % platform,
+                  command,
+                  stdout=api.raw_io.output())
 
 
 def RunSteps(api):
   buildername = api.properties.get('buildername')
 
   bot_config = SPEC.get('builders', {}).get(buildername)
   platform = bot_config.get('platform', 'linux')
 
   # Checkout the repositories that are either directly needed or should be
   # included in the source archive.
   gclient_config = api.gclient.make_config('chromium')
   for name, url in ADDITIONAL_REPOS.iteritems():
     solution = gclient_config.solutions.add()
     solution.name = name
     solution.url = url
   api.gclient.c = gclient_config
   update_step = api.bot_update.ensure_checkout()
   api.chromium.set_build_properties(update_step.json.output['properties'])
 
   # Remove the llvm-build directory, so that gclient runhooks will download
   # the pre-built clang binary and not use the locally compiled binary from
   # the 'compile translation_unit clang tool' step.
   api.file.rmtree('llvm-build',
                   api.path['checkout'].join('third_party', 'llvm-build'))
 
   debug_path = api.path['checkout'].join('out', 'Debug')
   targets = bot_config.get('compile_targets', [])
   api.chromium.set_config('codesearch', BUILD_CONFIG='Debug')
-  api.chromium.ensure_goma()
   api.chromium.runhooks()
 
   result = GenerateCompilationDatabase(api, debug_path, targets, platform)
 
   try:
     api.chromium.compile(targets)
   except api.step.StepFailure as f: # pragma: no cover
     # Even if compilation fails, the Grok indexer may still be able to extract
     # (almost) all cross references. And the downside of failing on compile
     # error is that Codesearch gets stale.
@@ skipping 103 matching lines @@
     api.test(
         'full_%s_fail' % _sanitize_nonalpha('ChromiumOS Codesearch')) +
     api.step_data('generate compilation database for chromeos',
                   stdout=api.raw_io.output('some compilation data')) +
     api.step_data('generate compilation database for linux',
                   stdout=api.raw_io.output('some compilation data')) +
     api.step_data('run translation_unit clang tool', retcode=2) +
     api.properties.generic(buildername='ChromiumOS Codesearch',
                            mastername='chromium.infra.cron')
   )