Remove 'use_swarming_recipe_to_trigger' from the builders and chromium_tests config
I'm keeping this arg in Webrtc and V8 recipe modules, because they require different set of owner approvals. Will create separate CLs to remove from them, too.
Bug: 894045
Change-Id: I41a8dbb537b26a02fc8b661609fdfe626de7224e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2508090
Auto-Submit: Ye Kuang <yekuang@google.com>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Ye Kuang <yekuang@google.com>
diff --git a/recipes/recipe_modules/chromium_swarming/examples/full.py b/recipes/recipe_modules/chromium_swarming/examples/full.py
index a9cf3b2..c35446f 100644
--- a/recipes/recipe_modules/chromium_swarming/examples/full.py
+++ b/recipes/recipe_modules/chromium_swarming/examples/full.py
@@ -40,7 +40,6 @@
'named_caches': Property(default=None),
'service_account': Property(default=None),
'wait_for_tasks': Property(default=None),
- 'use_swarming_recipe_to_trigger': Property(default=False),
'realm': Property(default=None),
'resultdb_enabled': Property(default=False),
}
@@ -49,8 +48,7 @@
def RunSteps(api, platforms, custom_trigger_script,
show_outputs_ref_in_collect_step, gtest_task, isolated_script_task,
merge, trigger_script, named_caches, service_account,
- wait_for_tasks, use_swarming_recipe_to_trigger, realm,
- resultdb_enabled):
+ wait_for_tasks, realm, resultdb_enabled):
# Checkout swarming client.
api.swarming_client.checkout('master')
@@ -189,8 +187,7 @@
# Launch all tasks.
for task in tasks:
- api.chromium_swarming.trigger_task(
- task, use_swarming_recipe_to_trigger=use_swarming_recipe_to_trigger)
+ api.chromium_swarming.trigger_task(task)
assert len(task.get_task_shard_output_dirs()) == len(task.shard_indices)
# Recipe can do something useful here locally while tasks are
diff --git a/recipes/recipe_modules/chromium_swarming/tests/task.expected/named_caches_use_swarming.json b/recipes/recipe_modules/chromium_swarming/tests/task.expected/named_caches.json
similarity index 100%
rename from recipes/recipe_modules/chromium_swarming/tests/task.expected/named_caches_use_swarming.json
rename to recipes/recipe_modules/chromium_swarming/tests/task.expected/named_caches.json
diff --git a/recipes/recipe_modules/chromium_swarming/tests/task.py b/recipes/recipe_modules/chromium_swarming/tests/task.py
index 8302e1f..917fea2 100644
--- a/recipes/recipe_modules/chromium_swarming/tests/task.py
+++ b/recipes/recipe_modules/chromium_swarming/tests/task.py
@@ -36,10 +36,7 @@
if api.properties.get('containment_type'):
task.containment_type = api.properties['containment_type']
- api.chromium_swarming.trigger_task(
- task,
- use_swarming_recipe_to_trigger=api.properties.get(
- 'use_swarming_recipe_to_trigger', False))
+ api.chromium_swarming.trigger_task(task)
kwargs = {}
if api.properties.get('allow_missing_json'):
kwargs['allow_missing_json'] = True
@@ -59,18 +56,6 @@
)
yield api.test(
- 'wait_for_capacity_use_swarming',
- api.properties(
- task_name='capacity-constrained task',
- wait_for_capacity=True,
- use_swarming_recipe_to_trigger=True),
- api.post_check(api.swarming.check_triggered_request,
- '[trigger] capacity-constrained task', lambda check, req:
- check(req[0].wait_for_capacity)),
- api.post_process(post_process.DropExpectation),
- )
-
- yield api.test(
'containment_type',
api.properties(task_name='windows gpu task', containment_type='AUTO'),
api.post_check(
@@ -84,9 +69,7 @@
yield api.test(
'cas_input_root',
api.properties(
- task_name='task with cas input',
- cas_input_root=empty_digest,
- use_swarming_recipe_to_trigger=True),
+ task_name='task with cas input', cas_input_root=empty_digest),
api.post_process(
api.swarming.check_triggered_request, '[trigger] task with cas input',
lambda check, req: check(req[0].cas_input_root == empty_digest)),
@@ -94,25 +77,11 @@
)
yield api.test(
- 'containment_type_use_swarming',
+ 'named_caches',
api.properties(
- task_name='windows gpu task',
- containment_type='AUTO',
- use_swarming_recipe_to_trigger=True),
- api.post_check(
- api.swarming.check_triggered_request, '[trigger] windows gpu task',
- lambda check, req: check(req[0].containment_type == 'AUTO')),
- api.post_process(post_process.DropExpectation),
- )
-
- yield api.test(
- 'named_caches_use_swarming',
- api.properties(
- task_name='windows gpu task',
- named_caches={
+ task_name='windows gpu task', named_caches={
'foo': 'cache/foo',
- },
- use_swarming_recipe_to_trigger=True),
+ }),
api.post_check(
api.swarming.check_triggered_request, '[trigger] windows gpu task',
lambda check, req: check(req[0].named_caches['foo'] == 'cache/foo')),
@@ -123,7 +92,6 @@
api.properties(
task_name='optional-dimension task',
wait_for_capacity=True,
- use_swarming_recipe_to_trigger=True,
optional_dimensions={
60: [{
'os': 'most-preferred-os'
diff --git a/recipes/recipe_modules/chromium_tests/api.py b/recipes/recipe_modules/chromium_tests/api.py
index e7f3fd5..2131ff9 100644
--- a/recipes/recipe_modules/chromium_tests/api.py
+++ b/recipes/recipe_modules/chromium_tests/api.py
@@ -123,14 +123,6 @@
def trybots(self):
return self._trybots
- @property
- def use_swarming_recipe_to_trigger(self):
- # TODO(894045): Remove once all tasks are switched to `swarming`
- try:
- return self.c.use_swarming_recipe_to_trigger
- except AttributeError:
- return False
-
def log(self, message):
presentation = self.m.step.active_result.presentation
presentation.logs.setdefault('stdout', []).append(message)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_android.py b/recipes/recipe_modules/chromium_tests/builders/chromium_android.py
index 16ebb21..8aa3f11 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_android.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_android.py
@@ -9,8 +9,7 @@
def _chromium_android_spec(**kwargs):
return bot_spec.BotSpec.create(
- build_gs_bucket='chromium-android-archive', **kwargs).extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
+ build_gs_bucket='chromium-android-archive', **kwargs)
SPEC = {
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_android_fyi.py b/recipes/recipe_modules/chromium_tests/builders/chromium_android_fyi.py
index 3f5d7ba..6fff1dc 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_android_fyi.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_android_fyi.py
@@ -9,8 +9,7 @@
def _chromium_android_fyi_spec(**kwargs):
return bot_spec.BotSpec.create(
- build_gs_bucket='chromium-android-archive', **kwargs).extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
+ build_gs_bucket='chromium-android-archive', **kwargs)
SPEC = {
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_chromiumos.py b/recipes/recipe_modules/chromium_tests/builders/chromium_chromiumos.py
index ad854d3..6149170 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_chromiumos.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_chromiumos.py
@@ -8,7 +8,6 @@
def _chromium_chromiumos_spec(**kwargs):
return bot_spec.BotSpec.create(
build_gs_bucket='chromium-chromiumos-archive',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_clang.py b/recipes/recipe_modules/chromium_tests/builders/chromium_clang.py
index 9868d85..2471f6d 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_clang.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_clang.py
@@ -10,7 +10,6 @@
def _chromium_clang_spec(**kwargs):
return bot_spec.BotSpec.create(
build_gs_bucket='chromium-clang-archive',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_dawn.py b/recipes/recipe_modules/chromium_tests/builders/chromium_dawn.py
index cbb99d5..0115438 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_dawn.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_dawn.py
@@ -17,7 +17,6 @@
},
simulation_platform=os,
build_gs_bucket='chromium-dawn-archive',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_devtools_frontend.py b/recipes/recipe_modules/chromium_tests/builders/chromium_devtools_frontend.py
index 43780f3..df64f63 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_devtools_frontend.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_devtools_frontend.py
@@ -9,7 +9,6 @@
return bot_spec.BotSpec.create(
build_gs_bucket='devtools-frontend',
luci_project='devtools-frontend',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_fuzz.py b/recipes/recipe_modules/chromium_tests/builders/chromium_fuzz.py
index ad68e789..b240d19 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_fuzz.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_fuzz.py
@@ -306,9 +306,3 @@
simulation_platform='linux',
),
}
-
-for name, spec in SPEC.iteritems():
- USE_SWARMING_CONFIG_KEY = 'use_swarming_recipe_to_trigger'
- if USE_SWARMING_CONFIG_KEY not in spec.chromium_tests_apply_config:
- spec = spec.extend(chromium_tests_apply_config=[USE_SWARMING_CONFIG_KEY])
- SPEC[name] = spec
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_fyi.py b/recipes/recipe_modules/chromium_tests/builders/chromium_fyi.py
index 64d30da..04a228e 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_fyi.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_fyi.py
@@ -922,7 +922,4 @@
# rather than have to do 2 different things for specs based on other specs and
# specs created within this file, just evolve all of the specs afterwards
for name, spec in SPEC.iteritems():
- if 'use_swarming_recipe_to_trigger' not in spec.chromium_tests_apply_config:
- spec = spec.extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
SPEC[name] = spec.evolve(build_gs_bucket='chromium-fyi-archive')
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_goma.py b/recipes/recipe_modules/chromium_tests/builders/chromium_goma.py
index a987efa..aa10bf5 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_goma.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_goma.py
@@ -164,9 +164,3 @@
'Chromium iOS Goma RBE ToT':
CreateIosConfig()
}
-
-for name, spec in SPEC.iteritems():
- USE_SWARMING_CONFIG_KEY = 'use_swarming_recipe_to_trigger'
- if USE_SWARMING_CONFIG_KEY not in spec.chromium_tests_apply_config:
- spec = spec.extend(chromium_tests_apply_config=[USE_SWARMING_CONFIG_KEY])
- SPEC[name] = spec
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_goma_fyi.py b/recipes/recipe_modules/chromium_tests/builders/chromium_goma_fyi.py
index b12645e..40a9886 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_goma_fyi.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_goma_fyi.py
@@ -251,7 +251,4 @@
# rather than have to do 2 different things for specs based on other specs and
# specs created within this file, just evolve all of the specs afterwards
for name, spec in SPEC.iteritems():
- USE_SWARMING_CONFIG_KEY = 'use_swarming_recipe_to_trigger'
- if USE_SWARMING_CONFIG_KEY not in spec.chromium_tests_apply_config:
- spec = spec.extend(chromium_tests_apply_config=[USE_SWARMING_CONFIG_KEY])
SPEC[name] = spec.evolve(build_gs_bucket='chromium-fyi-archive')
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_gpu.py b/recipes/recipe_modules/chromium_tests/builders/chromium_gpu.py
index 3c2e2cc..0c14bc2 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_gpu.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_gpu.py
@@ -7,8 +7,7 @@
def _chromium_gpu_spec(**kwargs):
return bot_spec.BotSpec.create(
- build_gs_bucket='chromium-gpu-archive', **kwargs).extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
+ build_gs_bucket='chromium-gpu-archive', **kwargs)
SPEC = {
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_gpu_fyi.py b/recipes/recipe_modules/chromium_tests/builders/chromium_gpu_fyi.py
index d565e02..cf20156 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_gpu_fyi.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_gpu_fyi.py
@@ -9,8 +9,6 @@
if kwargs.get('execution_mode') != bot_spec.PROVIDE_TEST_SPEC:
kwargs.setdefault('build_gs_bucket', 'chromium-gpu-fyi-archive')
kwargs.setdefault('isolate_server', 'https://isolateserver.appspot.com')
- kwargs.setdefault('chromium_tests_apply_config',
- ['use_swarming_recipe_to_trigger'])
return bot_spec.BotSpec.create(**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_linux.py b/recipes/recipe_modules/chromium_tests/builders/chromium_linux.py
index 7892fc9..7b55a5e 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_linux.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_linux.py
@@ -7,8 +7,7 @@
def _chromium_linux_spec(**kwargs):
return bot_spec.BotSpec.create(
- build_gs_bucket='chromium-linux-archive', **kwargs).extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
+ build_gs_bucket='chromium-linux-archive', **kwargs)
SPEC = {
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_mac.py b/recipes/recipe_modules/chromium_tests/builders/chromium_mac.py
index 1d106e8..b259611 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_mac.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_mac.py
@@ -7,8 +7,7 @@
def _chromium_mac_spec(**kwargs):
return bot_spec.BotSpec.create(
- build_gs_bucket='chromium-mac-archive', **kwargs).extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
+ build_gs_bucket='chromium-mac-archive', **kwargs)
SPEC = {
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_memory.py b/recipes/recipe_modules/chromium_tests/builders/chromium_memory.py
index 5b28594..08757f3 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_memory.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_memory.py
@@ -8,7 +8,6 @@
def _chromium_memory_spec(**kwargs):
return bot_spec.BotSpec.create(
build_gs_bucket='chromium-memory-archive',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_mojo.py b/recipes/recipe_modules/chromium_tests/builders/chromium_mojo.py
index d4dfd28..a9fb701 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_mojo.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_mojo.py
@@ -87,7 +87,3 @@
simulation_platform='win',
),
}
-
-for name, spec in SPEC.iteritems():
- SPEC[name] = spec.extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_perf_fyi.py b/recipes/recipe_modules/chromium_tests/builders/chromium_perf_fyi.py
index 406209a..c9b2a9a 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_perf_fyi.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_perf_fyi.py
@@ -26,9 +26,8 @@
config_name='chromium_perf',
target_bits=64,
**kwargs):
- SPEC[name] = chromium_perf.BuildSpec(
- config_name, platform, target_bits, **kwargs).extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
+ SPEC[name] = chromium_perf.BuildSpec(config_name, platform, target_bits,
+ **kwargs)
def _AddIsolatedTestSpec(name,
@@ -45,8 +44,6 @@
**kwargs)
if parent_builder_group:
spec = spec.evolve(parent_builder_group=parent_builder_group)
- spec = spec.extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
SPEC[name] = spec
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_swangle.py b/recipes/recipe_modules/chromium_tests/builders/chromium_swangle.py
index 092b2b0..39472bff 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_swangle.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_swangle.py
@@ -26,7 +26,6 @@
},
simulation_platform=os,
serialize_tests=True,
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_swarm.py b/recipes/recipe_modules/chromium_tests/builders/chromium_swarm.py
index 1a6f46f..870227b 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_swarm.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_swarm.py
@@ -18,9 +18,7 @@
},
android_config='main_builder_mb',
simulation_platform='linux',
- chromium_tests_apply_config=[
- 'use_swarming_recipe_to_trigger', 'use_cas'
- ],
+ chromium_tests_apply_config=['use_cas'],
),
'android-marshmallow-arm64-rel-swarming':
bot_spec.BotSpec.create(
@@ -35,9 +33,7 @@
},
android_config='main_builder_mb',
simulation_platform='linux',
- chromium_tests_apply_config=[
- 'use_swarming_recipe_to_trigger', 'use_cas'
- ],
+ chromium_tests_apply_config=['use_cas'],
),
'linux-rel-swarming':
bot_spec.BotSpec.create(
@@ -48,9 +44,7 @@
'BUILD_CONFIG': 'Release',
},
simulation_platform='linux',
- chromium_tests_apply_config=[
- 'use_swarming_recipe_to_trigger', 'use_cas'
- ],
+ chromium_tests_apply_config=['use_cas'],
),
'mac-rel-swarming':
bot_spec.BotSpec.create(
@@ -61,9 +55,7 @@
'BUILD_CONFIG': 'Release',
},
simulation_platform='mac',
- chromium_tests_apply_config=[
- 'use_swarming_recipe_to_trigger', 'use_cas'
- ],
+ chromium_tests_apply_config=['use_cas'],
),
'win-rel-swarming':
bot_spec.BotSpec.create(
@@ -74,9 +66,7 @@
'BUILD_CONFIG': 'Release',
},
simulation_platform='win',
- chromium_tests_apply_config=[
- 'use_swarming_recipe_to_trigger', 'use_cas'
- ],
+ chromium_tests_apply_config=['use_cas'],
),
}
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc.py b/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc.py
index 48d8fbd..98fbd79 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc.py
@@ -40,7 +40,6 @@
def _chromium_webrtc_spec(**kwargs):
return bot_spec.BotSpec.create(
build_gs_bucket='chromium-webrtc',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc_fyi.py b/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc_fyi.py
index 7cf6829..b174cfc 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc_fyi.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_webrtc_fyi.py
@@ -8,7 +8,6 @@
def _chromium_webrtc_fyi_spec(**kwargs):
return bot_spec.BotSpec.create(
build_gs_bucket='chromium-webrtc',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/chromium_win.py b/recipes/recipe_modules/chromium_tests/builders/chromium_win.py
index 54ee01c..3dab3b9 100644
--- a/recipes/recipe_modules/chromium_tests/builders/chromium_win.py
+++ b/recipes/recipe_modules/chromium_tests/builders/chromium_win.py
@@ -7,8 +7,7 @@
def _chromium_win_spec(**kwargs):
return bot_spec.BotSpec.create(
- build_gs_bucket='chromium-win-archive', **kwargs).extend(
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'])
+ build_gs_bucket='chromium-win-archive', **kwargs)
SPEC = {
diff --git a/recipes/recipe_modules/chromium_tests/builders/client_devtools_frontend_integration.py b/recipes/recipe_modules/chromium_tests/builders/client_devtools_frontend_integration.py
index a65cec5..facde4a 100644
--- a/recipes/recipe_modules/chromium_tests/builders/client_devtools_frontend_integration.py
+++ b/recipes/recipe_modules/chromium_tests/builders/client_devtools_frontend_integration.py
@@ -9,7 +9,6 @@
return bot_spec.BotSpec.create(
build_gs_bucket='devtools-frontend',
luci_project='devtools-frontend',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/client_v8_chromium.py b/recipes/recipe_modules/chromium_tests/builders/client_v8_chromium.py
index 3e31abe..6309916 100644
--- a/recipes/recipe_modules/chromium_tests/builders/client_v8_chromium.py
+++ b/recipes/recipe_modules/chromium_tests/builders/client_v8_chromium.py
@@ -9,7 +9,6 @@
return bot_spec.BotSpec.create(
build_gs_bucket='chromium-v8',
luci_project='v8',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/client_v8_fyi.py b/recipes/recipe_modules/chromium_tests/builders/client_v8_fyi.py
index 9584a86..7e984d3 100644
--- a/recipes/recipe_modules/chromium_tests/builders/client_v8_fyi.py
+++ b/recipes/recipe_modules/chromium_tests/builders/client_v8_fyi.py
@@ -9,7 +9,6 @@
return bot_spec.BotSpec.create(
build_gs_bucket='chromium-v8',
luci_project='v8',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/builders/tryserver_devtools_frontend.py b/recipes/recipe_modules/chromium_tests/builders/tryserver_devtools_frontend.py
index 22ea8e3..ae3ebcd 100644
--- a/recipes/recipe_modules/chromium_tests/builders/tryserver_devtools_frontend.py
+++ b/recipes/recipe_modules/chromium_tests/builders/tryserver_devtools_frontend.py
@@ -15,7 +15,6 @@
},
test_results_config='public_server',
simulation_platform='linux',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
)
SPEC = {
diff --git a/recipes/recipe_modules/chromium_tests/builders/tryserver_webrtc.py b/recipes/recipe_modules/chromium_tests/builders/tryserver_webrtc.py
index 2217bd2..cf649e6 100644
--- a/recipes/recipe_modules/chromium_tests/builders/tryserver_webrtc.py
+++ b/recipes/recipe_modules/chromium_tests/builders/tryserver_webrtc.py
@@ -8,7 +8,6 @@
def _tryserver_webrtc_spec(**kwargs):
return bot_spec.BotSpec.create(
luci_project='webrtc',
- chromium_tests_apply_config=['use_swarming_recipe_to_trigger'],
**kwargs)
diff --git a/recipes/recipe_modules/chromium_tests/config.py b/recipes/recipe_modules/chromium_tests/config.py
index 3c3e3ff..e1ad030 100644
--- a/recipes/recipe_modules/chromium_tests/config.py
+++ b/recipes/recipe_modules/chromium_tests/config.py
@@ -13,9 +13,6 @@
# TODO(martiniss): Remove this and all uses
CHECKOUT_PATH=Static(CHECKOUT_PATH),
- # TODO(894045): Remove once all tasks are switched to `swarming`
- use_swarming_recipe_to_trigger=Single(
- bool, empty_val=False, required=False),
# TODO(crbug.com/chrome-operations/49):
# Remove once all tasks are switched to `cas`
use_cas=Single(bool, empty_val=False),
@@ -35,10 +32,5 @@
@config_ctx()
-def use_swarming_recipe_to_trigger(c):
- c.use_swarming_recipe_to_trigger = True
-
-
-@config_ctx()
def use_cas(c):
c.use_cas = True
diff --git a/recipes/recipe_modules/chromium_tests/steps.py b/recipes/recipe_modules/chromium_tests/steps.py
index cf8fb3c..49ef13e 100644
--- a/recipes/recipe_modules/chromium_tests/steps.py
+++ b/recipes/recipe_modules/chromium_tests/steps.py
@@ -2150,10 +2150,7 @@
# Create task.
self._tasks[suffix] = self.create_task(api, suffix, task_input)
- api.chromium_swarming.trigger_task(
- self._tasks[suffix],
- use_swarming_recipe_to_trigger=api.chromium_tests
- .use_swarming_recipe_to_trigger)
+ api.chromium_swarming.trigger_task(self._tasks[suffix])
def validate_task_results(self, api, step_result):
"""Interprets output of a task (provided as StepResult object).
@@ -3123,10 +3120,7 @@
swarming_task.tags.add('platform:%s' % self._platform)
swarming_task.tags.add('test:%s' % str(task['test']['app']))
- api.chromium_swarming.trigger_task(
- swarming_task,
- use_swarming_recipe_to_trigger=api.chromium_tests
- .use_swarming_recipe_to_trigger)
+ api.chromium_swarming.trigger_task(swarming_task)
task['task'] = swarming_task
self._tasks[suffix] = swarming_task
diff --git a/recipes/recipe_modules/chromium_tests/tests/api/set_test_command_lines.py b/recipes/recipe_modules/chromium_tests/tests/api/set_test_command_lines.py
index 989eaf9..f7fee13 100644
--- a/recipes/recipe_modules/chromium_tests/tests/api/set_test_command_lines.py
+++ b/recipes/recipe_modules/chromium_tests/tests/api/set_test_command_lines.py
@@ -120,9 +120,6 @@
chromium_config='chromium',
gclient_config='chromium',
isolate_server='https://isolateserver.appspot.com',
- chromium_tests_apply_config=[
- 'use_swarming_recipe_to_trigger'
- ],
),
},
})),
