Commit 22f0a7ab authored by Nghia Nguyen's avatar Nghia Nguyen Committed by Commit Bot

Switch 'ignore_swarming_task_failure' to 'ignore_task_failure'

This is the 2nd CL in our 3-sided patches to rename 'ignore_swarming_task_failure' to 'ignore_task_failure'

BUG=709324

Change-Id: I52efa1bbfd57585e5e28abc6876acbf6ca88af41
Reviewed-on: https://chromium-review.googlesource.com/471046Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#463017}
parent 1170eb93
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -481,7 +481,7 @@ def get_waterfall_config(): ...@@ -481,7 +481,7 @@ def get_waterfall_config():
def generate_isolate_script_entry(swarming_dimensions, test_args, def generate_isolate_script_entry(swarming_dimensions, test_args,
isolate_name, step_name, ignore_swarming_task_failure, isolate_name, step_name, ignore_task_failure,
override_compile_targets=None, override_compile_targets=None,
swarming_timeout=None): swarming_timeout=None):
result = { result = {
...@@ -498,7 +498,7 @@ def generate_isolate_script_entry(swarming_dimensions, test_args, ...@@ -498,7 +498,7 @@ def generate_isolate_script_entry(swarming_dimensions, test_args,
'can_use_on_swarming_builders': True, 'can_use_on_swarming_builders': True,
'expiration': 10 * 60 * 60, # 10 hour timeout for now (crbug.com/699312) 'expiration': 10 * 60 * 60, # 10 hour timeout for now (crbug.com/699312)
'hard_timeout': swarming_timeout if swarming_timeout else 7200, 'hard_timeout': swarming_timeout if swarming_timeout else 7200,
'ignore_swarming_task_failure': ignore_swarming_task_failure, 'ignore_task_failure': ignore_task_failure,
'io_timeout': 3600, 'io_timeout': 3600,
'dimension_sets': swarming_dimensions, 'dimension_sets': swarming_dimensions,
} }
...@@ -521,18 +521,18 @@ def generate_telemetry_test(swarming_dimensions, benchmark_name, browser): ...@@ -521,18 +521,18 @@ def generate_telemetry_test(swarming_dimensions, benchmark_name, browser):
# When this is enabled on more than just windows machines we will need # When this is enabled on more than just windows machines we will need
# --device=android # --device=android
ignore_swarming_task_failure = False ignore_task_failure = False
step_name = benchmark_name step_name = benchmark_name
if browser == 'reference': if browser == 'reference':
test_args.append('--output-trace-tag=_ref') test_args.append('--output-trace-tag=_ref')
step_name += '.reference' step_name += '.reference'
# We ignore the failures on reference builds since there is little we can do # We ignore the failures on reference builds since there is little we can do
# to fix them except waiting for the reference build to update. # to fix them except waiting for the reference build to update.
ignore_swarming_task_failure = True ignore_task_failure = True
return generate_isolate_script_entry( return generate_isolate_script_entry(
swarming_dimensions, test_args, 'telemetry_perf_tests', swarming_dimensions, test_args, 'telemetry_perf_tests',
step_name, ignore_swarming_task_failure=ignore_swarming_task_failure, step_name, ignore_task_failure=ignore_task_failure,
override_compile_targets=['telemetry_perf_tests'], override_compile_targets=['telemetry_perf_tests'],
swarming_timeout=BENCHMARK_SWARMING_TIMEOUTS.get(benchmark_name)) swarming_timeout=BENCHMARK_SWARMING_TIMEOUTS.get(benchmark_name))
...@@ -575,7 +575,7 @@ def generate_cplusplus_isolate_script_test(dimension): ...@@ -575,7 +575,7 @@ def generate_cplusplus_isolate_script_test(dimension):
return [ return [
generate_isolate_script_entry( generate_isolate_script_entry(
[get_swarming_dimension(dimension, shard)], [], name, name, [get_swarming_dimension(dimension, shard)], [], name, name,
ignore_swarming_task_failure=False) ignore_task_failure=False)
for name, shard in dimension['perf_tests'] for name, shard in dimension['perf_tests']
] ]
......
...@@ -78,7 +78,7 @@ class PerfDataGeneratorTest(unittest.TestCase): ...@@ -78,7 +78,7 @@ class PerfDataGeneratorTest(unittest.TestCase):
'args': ['speedometer', '-v', '--upload-results', 'args': ['speedometer', '-v', '--upload-results',
'--output-format=chartjson', '--browser=release'], '--output-format=chartjson', '--browser=release'],
'swarming': { 'swarming': {
'ignore_swarming_task_failure': False, 'ignore_task_failure': False,
'dimension_sets': [{'os': 'SkyNet', 'id': 'T-850', 'pool': 'T-RIP'}], 'dimension_sets': [{'os': 'SkyNet', 'id': 'T-850', 'pool': 'T-RIP'}],
'hard_timeout': 7200, 'hard_timeout': 7200,
'can_use_on_swarming_builders': True, 'can_use_on_swarming_builders': True,
...@@ -100,7 +100,7 @@ class PerfDataGeneratorTest(unittest.TestCase): ...@@ -100,7 +100,7 @@ class PerfDataGeneratorTest(unittest.TestCase):
'--output-format=chartjson', '--browser=reference', '--output-format=chartjson', '--browser=reference',
'--output-trace-tag=_ref'], '--output-trace-tag=_ref'],
'swarming': { 'swarming': {
'ignore_swarming_task_failure': True, 'ignore_task_failure': True,
'dimension_sets': [{'os': 'SkyNet', 'id': 'T-850', 'pool': 'T-RIP'}], 'dimension_sets': [{'os': 'SkyNet', 'id': 'T-850', 'pool': 'T-RIP'}],
'hard_timeout': 7200, 'hard_timeout': 7200,
'can_use_on_swarming_builders': True, 'can_use_on_swarming_builders': True,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment