Reset CIPD credentials after goma is setup

Goma sets some CIPD credentials for downloading the goma package, but
doesn't reset them afterwards.  This means that subsequent uses of CIPD
which otherwise wouldn't need credentials at all attempt to use the Goma
credentials.  This doesn't cause any problems AFAIK but is still a bug
IMHO.  I found this while trying to get certain recipes running on my
local machine.

Change-Id: I5fbcca3115e798dec03cc69a73be5348c0e7e5db
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Recipe-Nontrivial-Roll: release_scripts
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/1585551
Commit-Queue: Brandon Tolsch <btolsch@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
diff --git a/scripts/slave/README.recipes.md b/scripts/slave/README.recipes.md
index d92443e..77554f5 100644
--- a/scripts/slave/README.recipes.md
+++ b/scripts/slave/README.recipes.md
@@ -2322,7 +2322,7 @@
 
 &emsp; **@property**<br>&mdash; **def [bigquery\_service\_account\_json\_path](/scripts/slave/recipe_modules/goma/api.py#80)(self):**
 
-&mdash; **def [build\_with\_goma](/scripts/slave/recipe_modules/goma/api.py#519)(self, ninja_command, name=None, ninja_log_outdir=None, ninja_log_compiler=None, goma_env=None, ninja_env=None, \*\*kwargs):**
+&mdash; **def [build\_with\_goma](/scripts/slave/recipe_modules/goma/api.py#522)(self, ninja_command, name=None, ninja_log_outdir=None, ninja_log_compiler=None, goma_env=None, ninja_env=None, \*\*kwargs):**
 
 Build with ninja_command using goma
 
@@ -2366,9 +2366,9 @@
 
 &mdash; **def [ensure\_goma](/scripts/slave/recipe_modules/goma/api.py#163)(self, client_type=None):**
 
-&emsp; **@property**<br>&mdash; **def [goma\_ctl](/scripts/slave/recipe_modules/goma/api.py#194)(self):**
+&emsp; **@property**<br>&mdash; **def [goma\_ctl](/scripts/slave/recipe_modules/goma/api.py#197)(self):**
 
-&emsp; **@property**<br>&mdash; **def [goma\_dir](/scripts/slave/recipe_modules/goma/api.py#198)(self):**
+&emsp; **@property**<br>&mdash; **def [goma\_dir](/scripts/slave/recipe_modules/goma/api.py#201)(self):**
 
 &mdash; **def [initialize](/scripts/slave/recipe_modules/goma/api.py#63)(self):**
 
@@ -2394,14 +2394,14 @@
 
 &emsp; **@property**<br>&mdash; **def [service\_account\_json\_path](/scripts/slave/recipe_modules/goma/api.py#67)(self):**
 
-&mdash; **def [start](/scripts/slave/recipe_modules/goma/api.py#262)(self, env=None, \*\*kwargs):**
+&mdash; **def [start](/scripts/slave/recipe_modules/goma/api.py#265)(self, env=None, \*\*kwargs):**
 
 Start goma compiler_proxy.
 
 A user MUST execute ensure_goma beforehand.
 It is user's responsibility to handle failure of starting compiler_proxy.
 
-&mdash; **def [stop](/scripts/slave/recipe_modules/goma/api.py#346)(self, build_exit_status, ninja_log_outdir=None, ninja_log_compiler=None, ninja_log_command=None, build_step_name='', \*\*kwargs):**
+&mdash; **def [stop](/scripts/slave/recipe_modules/goma/api.py#349)(self, build_exit_status, ninja_log_outdir=None, ninja_log_compiler=None, ninja_log_command=None, build_step_name='', \*\*kwargs):**
 
 Stop goma compiler_proxy.
 
diff --git a/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_basic.json b/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_basic.json
index c252656..5c2e9a0 100644
--- a/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_basic.json
+++ b/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_basic.json
@@ -223,9 +223,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_toolchain.json b/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_toolchain.json
index f3885fa..675ef31 100644
--- a/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_toolchain.json
+++ b/scripts/slave/recipe_modules/chromium/examples/full.expected/mac_toolchain.json
@@ -233,9 +233,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json b/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
index 3d4e462..f3936bb 100644
--- a/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
+++ b/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
@@ -2819,9 +2819,7 @@
       "-ensure-file",
       "infra/tools/bqupload/${platform} latest",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "name": "upload new results.ensure_installed",
diff --git a/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json b/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json
index 60097d3..2215cc1 100644
--- a/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json
+++ b/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json
@@ -2581,9 +2581,7 @@
       "-ensure-file",
       "infra/tools/bqupload/${platform} latest",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "C:\\creds\\service_accounts\\service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[CACHE]\\builder\\sdk",
     "name": "upload new results.ensure_installed",
diff --git a/scripts/slave/recipe_modules/goma/api.py b/scripts/slave/recipe_modules/goma/api.py
index b76986a..fe7c237 100644
--- a/scripts/slave/recipe_modules/goma/api.py
+++ b/scripts/slave/recipe_modules/goma/api.py
@@ -178,17 +178,20 @@
         step_result.presentation.status = self.m.step.WARNING
 
       with self.m.context(infra_steps=True):
-        self.m.cipd.set_service_account_credentials(
-            self.service_account_json_path)
+        try:
+          self.m.cipd.set_service_account_credentials(
+              self.service_account_json_path)
 
-        goma_package = ('infra_internal/goma/client/%s' %
-            self.m.cipd.platform_suffix())
-        # For Windows there's only 64-bit goma client.
-        if self.m.platform.is_win:
-          goma_package = goma_package.replace('386', 'amd64')
-        ref = client_type
-        self._goma_dir = self.default_client_path
-        self.m.cipd.ensure(self._goma_dir, {goma_package: ref})
+          goma_package = ('infra_internal/goma/client/%s' %
+              self.m.cipd.platform_suffix())
+          # For Windows there's only 64-bit goma client.
+          if self.m.platform.is_win:
+            goma_package = goma_package.replace('386', 'amd64')
+          ref = client_type
+          self._goma_dir = self.default_client_path
+          self.m.cipd.ensure(self._goma_dir, {goma_package: ref})
+        finally:
+          self.m.cipd.set_service_account_credentials(None)
         return self._goma_dir
 
   @property
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json b/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json
index a85c17c..2ef3c3a 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json
@@ -349,9 +349,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json
index 4360d82..d0c3b56 100644
--- a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json
+++ b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_fail.json
@@ -221,9 +221,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[BUILDER_CACHE]/V8_Blink_Mac/src",
     "env": {
diff --git a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json
index 214f549..ab85c73 100644
--- a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json
+++ b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Mac_pass.json
@@ -221,9 +221,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[BUILDER_CACHE]/V8_Blink_Mac/src",
     "env": {
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_gtest_memory_mac64.json b/scripts/slave/recipes/chromium.expected/dynamic_gtest_memory_mac64.json
index d9ea461..3f3b26b 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_gtest_memory_mac64.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_gtest_memory_mac64.json
@@ -246,9 +246,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest_mac_gpu.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest_mac_gpu.json
index efcd2ba..d222c39 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest_mac_gpu.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest_mac_gpu.json
@@ -246,9 +246,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json
index 00e1e60..b5f03f8 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json
@@ -246,9 +246,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json b/scripts/slave/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json
index 432b534..3c4e760 100644
--- a/scripts/slave/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json
+++ b/scripts/slave/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json
@@ -201,9 +201,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json b/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json
index ce06874..046ee9c 100644
--- a/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json
+++ b/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fuzz_Libfuzzer_Upload_Mac_ASan.json
@@ -217,9 +217,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/chromium_libfuzzer.expected/kitchen_paths.json b/scripts/slave/recipes/chromium_libfuzzer.expected/kitchen_paths.json
index ef166f5..e3d98e6 100644
--- a/scripts/slave/recipes/chromium_libfuzzer.expected/kitchen_paths.json
+++ b/scripts/slave/recipes/chromium_libfuzzer.expected/kitchen_paths.json
@@ -233,9 +233,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json
index ca9bdeb..7ed7433 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json
@@ -291,9 +291,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot.json
index ca9bdeb..7ed7433 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot.json
@@ -291,9 +291,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
index 5025719..e4fc6f4 100644
--- a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
+++ b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -519,9 +517,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json
index 0c3be7e..b9c11c6 100644
--- a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json
+++ b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_isolate_only.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -519,9 +517,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json
index 7305eee..af1adef 100644
--- a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json
+++ b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_non-swarming_tests.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -519,9 +517,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
index 3e4feb0..7e093cd 100644
--- a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
+++ b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -519,9 +517,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/flake.expected/record_infra_failure.json b/scripts/slave/recipes/findit/chromium/flake.expected/record_infra_failure.json
index 51f930f..89dc8e7 100644
--- a/scripts/slave/recipes/findit/chromium/flake.expected/record_infra_failure.json
+++ b/scripts/slave/recipes/findit/chromium/flake.expected/record_infra_failure.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -522,9 +520,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json
index 6a8d389..a42bfee 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -538,9 +536,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1636,9 +1632,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
index d20bcc3..65a0549 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -540,9 +538,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1600,9 +1596,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -2624,9 +2618,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
index a8a0140..57ec6ef 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -540,9 +538,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1600,9 +1596,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -2624,9 +2618,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
index 43d65b8..b2c5cf6 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -540,9 +538,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1603,9 +1599,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
index 4b87c54..11dfc1e 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -543,9 +541,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1604,9 +1600,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -2625,9 +2619,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -3649,9 +3641,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
index 5131614..8aeb2b1 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -543,9 +541,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1911,9 +1907,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -2949,9 +2943,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -3979,9 +3971,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
index 7851fee..b584e8b 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -543,9 +541,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1617,9 +1613,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -2652,9 +2646,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -3684,9 +3676,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -4708,9 +4698,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/record_infra_failure.json b/scripts/slave/recipes/findit/chromium/test.expected/record_infra_failure.json
index 083a81e..8042a13 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/record_infra_failure.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/record_infra_failure.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -538,9 +536,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json b/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
index 70796f7..805a8f2 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -543,9 +541,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1607,9 +1603,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
index b30b5cf..f01b807 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -535,9 +533,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json b/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
index a9dd932..ee7629d 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -538,9 +536,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json b/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
index a88addc..3ff2337 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
@@ -215,9 +215,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -540,9 +538,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
@@ -1603,9 +1599,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/ios/try.expected/gn.json b/scripts/slave/recipes/ios/try.expected/gn.json
index d791247..a9e8851 100644
--- a/scripts/slave/recipes/ios/try.expected/gn.json
+++ b/scripts/slave/recipes/ios/try.expected/gn.json
@@ -308,9 +308,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/ios/try.expected/goma_compilation_failure.json b/scripts/slave/recipes/ios/try.expected/goma_compilation_failure.json
index 0c5c879..42b756f 100644
--- a/scripts/slave/recipes/ios/try.expected/goma_compilation_failure.json
+++ b/scripts/slave/recipes/ios/try.expected/goma_compilation_failure.json
@@ -308,9 +308,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json
index b749e13..c7f973a 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json
+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json
@@ -298,9 +298,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_canary.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_canary.json
index 5962e14..fdb696f 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_canary.json
+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_canary.json
@@ -303,9 +303,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json
index f1737da..32869b6 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json
+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma_compilation_failure.json
@@ -287,9 +287,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json
index 98a90d3..715bb69 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_debug.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json
index f2c4c24..60af629 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_arm64_release.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json
index 4032cba..62f699a 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json
index 6e1b689..2bdd789 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_debug_forced.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json
index be01739..18763e8 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_ios_release.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json
index f971295..de51f58 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
index d5aa1ff..e132903 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json
index bfc6209..67af84f 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json
index 8cfa6a2..e95a5ba 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json
index c0fbb02..03f5294 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json
index 25f87e9..7e32c88 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_arm64_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json
index efbced3..4dd1d4f 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_ios_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json
index 2b96256..410287e 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json
index 4fa01a4..ddf0320 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_asan.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json
index 4f83207..2a2e80d 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_mac_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
index 77db063..f39919d 100644
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json
@@ -243,9 +243,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json
index 2e8b00c..36a842e 100644
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg_.json
@@ -243,9 +243,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json
index c32bf5f..32d5594 100644
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic__dbg__fail.json
@@ -243,9 +243,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json
index a3044de..48256d3 100644
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_fail.json
@@ -243,9 +243,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
diff --git a/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json b/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
index 47940c7..7fcb6b8 100644
--- a/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
+++ b/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
@@ -278,9 +278,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json
index 3c151f5..29709cd 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_debug.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json
index e7821e4..20900d0 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios32_release.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json
index 2d0d208..4861a70 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_debug.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json
index 092be0d..3efa000 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_release.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
index 2caae92..a2d0f71 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
index c1014a5..85c8c11 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
index d18dbbe..5ba9c12 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
index c8bbaef..c7864f0 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
index b8c85dd..b6d581f 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
index 0855199..0f08780 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
index c705939..0874cd0 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
index c3dd741..c08176d 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
index 6a5edb3..e727a7a 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json
index 644461c..63ec369 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_dbg.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json
index 1f28a82..24ffa28 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm64_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json
index cc22b51..7af1b83 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_dbg.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json
index f580491..da6339c 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_compile_arm_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
index 77ef43d..6a3cce0 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
index c4ac8dd..8dfa083 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
index 1a90b94..37d7516 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json
index 3fe6388..320830b 100644
--- a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json
+++ b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_failure.json
@@ -210,9 +210,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json
index f737cbc..79b0dcd 100644
--- a/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json
+++ b/scripts/slave/recipes/webrtc/ios_api_framework.expected/build_ok.json
@@ -210,9 +210,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/webrtc/ios_api_framework.expected/trybot_build.json b/scripts/slave/recipes/webrtc/ios_api_framework.expected/trybot_build.json
index 47b1d36..a29fafc 100644
--- a/scripts/slave/recipes/webrtc/ios_api_framework.expected/trybot_build.json
+++ b/scripts/slave/recipes/webrtc/ios_api_framework.expected/trybot_build.json
@@ -254,9 +254,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "name": "ensure xcode.ensure_installed",
     "~followup_annotations": [
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json
index 0eac5c4..58f2a48 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_builder.json
@@ -118,9 +118,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
index c5d6aa2..4832c65 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
index fea6cad..18dc290 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
index c8e107b..a5ca0d6 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
@@ -104,9 +104,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
index cbdebfc..10bb985 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json
index 07125d6..3ad2dce 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_dbg.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json
index da3f890..b6fde1c 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_compile_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
index 28ec09a..7e7285d 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
index bbd1a87..af68f4b 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
@@ -148,9 +148,7 @@
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
       "-json-output",
-      "/path/to/tmp/json",
-      "-service-account-json",
-      "/creds/service_accounts/service-account-goma-client.json"
+      "/path/to/tmp/json"
     ],
     "env": {
       "CHROME_HEADLESS": "1"