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

scripts/slave/recipes/chromium_codesearch.py

Index: scripts/slave/recipes/chromium_codesearch.py
diff --git a/scripts/slave/recipes/chromium_codesearch.py b/scripts/slave/recipes/chromium_codesearch.py
index 6fcb3e29366914cf39e78312408945b4802c5782..204f3f7b6c3f0c483218f82e90ccfffef0cb4836 100644
--- a/scripts/slave/recipes/chromium_codesearch.py
+++ b/scripts/slave/recipes/chromium_codesearch.py
@@ -45,10 +45,8 @@ 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 + [
@@ -103,6 +101,10 @@ def GenerateCompilationDatabase(api, debug_path, targets, platform):
   # adjusted.
   gn_path = api.path['checkout'].join('buildtools', 'linux64', 'gn')
   args = LINUX_GN_ARGS if platform == 'linux' else CHROMEOS_GN_ARGS
+  if (hasattr(api.chromium.c.compile_py, 'goma_dir') and

[Paweł Hajdan Jr., 2016/09/19 23:19:33]

Why do we have this weird auto-detection? Don't we always want to run goma?

[Yoshisato Yanagisawa, 2016/09/20 01:35:37]

From the modularity view point, I suggested to do so. 
GenerateCompilationDatabase cannot know ensure_goma has been called in caller or
not.  It cannot expect it can always set use_goma if we only see this function.

To make recipe unittest detect not running goma, assertion could be the choice
instead of this if statement.

[dsansome-google, 2016/09/20 04:21:43]

Checking for the presence of an attribute seems like a weird API.
Can you expose this as a "should_use_goma" boolean attribute somewhere?

Where are the docs for using goma in recipes?

[tikuta, 2016/09/20 05:22:08]

OK. let me remove this if statement.
assertion occurs in unittest if ensure_goma is not called.

Currently there is no docs for using goma in recipes explaining usage more than
example.py.
https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/goma/exam...

+      api.chromium.c.compile_py.goma_dir):
+    args.extend(['use_goma=true',
+                 'goma_dir=%s' % api.chromium.c.compile_py.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'])
@@ -140,6 +142,7 @@ def RunSteps(api):
   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)