[chromium_swarming] remove --auth-service-account-json usage
This is not used.
Bug: 1127205
Change-Id: Id75bcb2db1f2ae184bc0ab4b477b8582d021f86f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2409738
Reviewed-by: Ye Kuang <yekuang@google.com>
Commit-Queue: Ye Kuang <yekuang@google.com>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
diff --git a/recipes/recipe_modules/chromium_swarming/api.py b/recipes/recipe_modules/chromium_swarming/api.py
index 4e9c146..d506160 100644
--- a/recipes/recipe_modules/chromium_swarming/api.py
+++ b/recipes/recipe_modules/chromium_swarming/api.py
@@ -175,7 +175,6 @@
self._default_tags = set()
self._default_user = None
self._pending_tasks = set()
- self._service_account_json = None
self._show_outputs_ref_in_collect_step = True
self._swarming_server = 'https://chromium-swarm.appspot.com'
self._verbose = False
@@ -203,16 +202,6 @@
return self.m.json.output()
@property
- def service_account_json(self):
- """Service account json to use for swarming."""
- return self._service_account_json
-
- @service_account_json.setter
- def service_account_json(self, value):
- """Service account json to use for swarming."""
- self._service_account_json = value
-
- @property
def swarming_server(self):
"""URL of Swarming server to use, default is a production one."""
return self._swarming_server
@@ -863,9 +852,6 @@
if task_request.service_account:
args.extend(['--service-account', task_request.service_account])
- if self.service_account_json:
- args.extend(['--auth-service-account-json', self.service_account_json])
-
if task.wait_for_capacity:
args.append('--wait-for-capacity')
@@ -1448,9 +1434,6 @@
'--verbose',
]
- if self.service_account_json:
- args.extend(['--auth-service-account-json', self.service_account_json])
-
result = self.m.python(
'wait for tasks%s' % (suffix or ''),
self.resource('wait_for_finished_task_set.py'),
@@ -1714,8 +1697,6 @@
]
args.extend(('-requests-json', self.m.json.input(requests_json)))
- if self.service_account_json:
- args.extend(['-service-account-json', self.service_account_json])
return args
def _gen_trigger_step_test_data(self, task, shard_indices):
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic.json
index 55ce750..59ac0a0 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic.json
@@ -346,8 +346,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -434,8 +432,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -522,8 +518,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -610,8 +604,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -749,9 +741,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -829,9 +819,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -931,9 +919,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"130100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"130100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json
index 55ce750..59ac0a0 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json
@@ -346,8 +346,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -434,8 +432,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -522,8 +518,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -610,8 +604,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -749,9 +741,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -829,9 +819,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -931,9 +919,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"130100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"130100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json
index 007f0d1..bb18d92 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json
@@ -346,8 +346,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:true",
"--tag",
@@ -434,8 +432,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:true",
"--tag",
@@ -522,8 +518,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:true",
"--tag",
@@ -610,8 +604,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:true",
"--tag",
@@ -749,9 +741,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -829,9 +819,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -931,9 +919,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"130100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"130100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json
index b850973..9a6b69d 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json
@@ -374,8 +374,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"bucket:try",
"--tag",
@@ -523,9 +521,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json
index eab63f8..4ba893b 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json
@@ -332,8 +332,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -420,8 +418,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -559,9 +555,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}, {\"task_id\": \"110100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}, {\"task_id\": \"110100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json
index cee5f0c..5188191 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json
@@ -326,8 +326,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -465,9 +463,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json
index 3fe3668..96ded78 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json
@@ -326,8 +326,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -465,9 +463,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json
index f30e34b..f895da3 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json
@@ -326,8 +326,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -465,9 +463,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json
index 935b39b..b3f254d 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json
@@ -332,8 +332,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -420,8 +418,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -559,9 +555,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}, {\"task_id\": \"110100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}, {\"task_id\": \"110100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json
index 8519a1b..3e84860 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json
@@ -326,8 +326,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -465,9 +463,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json
index 82a62a8..bf86893 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json
@@ -332,8 +332,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -472,9 +470,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json
index 3ec5149..3d0f4d8 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json
@@ -332,8 +332,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -472,9 +470,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json
index 5f62424..899e784 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json
@@ -332,8 +332,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -472,9 +470,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json
index 702d79c..a3d4e00 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json
@@ -332,8 +332,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -472,9 +470,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json
index 560f922..e68ec87 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json
@@ -332,8 +332,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -472,9 +470,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json
index 3c2dbc1..e80acfe 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json
@@ -44,8 +44,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json
index a21fd29..e9ec7d0 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json
@@ -338,8 +338,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -433,8 +431,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -573,9 +569,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}, {\"task_id\": \"110100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}, {\"task_id\": \"110100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json
index cfd97f8..de17b59 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json
@@ -338,8 +338,6 @@
"--named-cache",
"foo",
"cache/foo",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -477,9 +475,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/service_account.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/service_account.json
index b10c426..a5d8e8e 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/service_account.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/service_account.json
@@ -348,8 +348,6 @@
"1",
"--service-account",
"test@example.com",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -438,8 +436,6 @@
"1",
"--service-account",
"test@example.com",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -528,8 +524,6 @@
"1",
"--service-account",
"test@example.com",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -618,8 +612,6 @@
"1",
"--service-account",
"test@example.com",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -757,9 +749,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -837,9 +827,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"110000\"}, {\"task_id\": \"120100\"}]}"
],
"env_prefixes": {
"PATH": [
@@ -939,9 +927,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"130100\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"130100\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json
index c1d670c..ca4a6c9 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json
@@ -326,8 +326,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -465,9 +463,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json
index 44f654e..109a5a5 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json
@@ -326,8 +326,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -465,9 +463,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json
index 54acfa2..480516b 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json
@@ -326,8 +326,6 @@
"--env",
"TESTING",
"1",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json",
"--tag",
"build_is_experimental:false",
"--tag",
@@ -465,9 +463,7 @@
"json",
"-verbose",
"-requests-json",
- "{\"tasks\": [{\"task_id\": \"10000\"}]}",
- "-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "{\"tasks\": [{\"task_id\": \"10000\"}]}"
],
"env_prefixes": {
"PATH": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.expected/wait_for_tasks.json b/recipes/recipe_modules/chromium_swarming/examples/full.expected/wait_for_tasks.json
index 6a5c380..361709d 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.expected/wait_for_tasks.json
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.expected/wait_for_tasks.json
@@ -14,9 +14,7 @@
"[[\"10000\"], [\"110000\", \"120100\"], [\"130100\"]]",
"--attempts",
"0",
- "--verbose",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "--verbose"
],
"name": "wait for tasks",
"~followup_annotations": [
@@ -47,9 +45,7 @@
"[[\"10000\"], [\"110000\", \"120100\"], [\"130100\"]]",
"--attempts",
"0",
- "--verbose",
- "--auth-service-account-json",
- "/creds/service_accounts/service-account-chromium-builder.json"
+ "--verbose"
],
"name": "wait for tasks (2)",
"~followup_annotations": [
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.py b/recipes/recipe_modules/chromium_swarming/examples/full.py
index 1d437f0..f02259c 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.py
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.py
@@ -69,8 +69,6 @@
api.chromium_swarming.set_default_env('TESTING', '1')
api.chromium_swarming.verbose = True
api.chromium_swarming.task_output_stdout = 'json'
- api.chromium_swarming.service_account_json = (
- '/creds/service_accounts/service-account-chromium-builder.json')
api.chromium_swarming.set_default_dimension('inexistent', None)
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/set_up_swarming.py b/recipes/recipe_modules/chromium_tests/tests/api/set_up_swarming.py
index dcf55a4..e9ff223 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/set_up_swarming.py
+++ b/recipes/recipe_modules/chromium_tests/tests/api/set_up_swarming.py
@@ -36,9 +36,6 @@
api.chromium_tests.set_up_swarming(bot_config)
api.assertions.assertEqual(api.chromium_swarming.swarming_server,
api.properties.get('expected_swarming_server'))
- api.assertions.assertEqual(
- api.chromium_swarming.service_account_json,
- api.properties.get('expected_swarming_service_account'))
api.assertions.assertEqual(api.chromium_swarming.default_dimensions,
api.properties.get('expected_swarming_dimensions'))
api.assertions.assertEqual(api.isolate.isolate_server,
@@ -54,7 +51,6 @@
api.platform.name('linux'),
api.properties(
expected_swarming_server='https://example/swarming',
- expected_swarming_service_account=None,
expected_swarming_dimensions={
'cpu': 'x86-64',
'gpu': None,
