Add custom swarming timeouts for chromium.perf.* tests.

tools/perf/generate_perf_json.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script to generate chromium.perf.json and chromium.perf.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 420 matching lines @@
          ('cc_perftests', 2),
          ('load_library_perf_tests', 2),
          ('tracing_perftests', 2)]
       }
     ])
 
   return waterfall
 
 
 def generate_isolate_script_entry(swarming_dimensions, test_args,
-  isolate_name, step_name, override_compile_targets=None):
+    isolate_name, step_name, override_compile_targets=None,
+    swarming_timeout=None):
   result = {
     'args': test_args,
     'isolate_name': isolate_name,
     'name': step_name,
   }
   if override_compile_targets:
     result['override_compile_targets'] = override_compile_targets
   if swarming_dimensions:
     result['swarming'] = {
       # Always say this is true regardless of whether the tester
       # supports swarming. It doesn't hurt.
       'can_use_on_swarming_builders': True,
       'expiration': 21600,
-      'hard_timeout': 7200,
+      'hard_timeout': swarming_timeout if swarming_timeout else 7200,
       'io_timeout': 3600,
       'dimension_sets': swarming_dimensions,
     }
   return result
 
 
 def generate_telemetry_test(swarming_dimensions, benchmark_name, browser):
   # The step name must end in 'test' or 'tests' in order for the
   # results to automatically show up on the flakiness dashboard.
   # (At least, this was true some time ago.) Continue to use this
   # naming convention for the time being to minimize changes.
 
   test_args = [
     benchmark_name,
     '-v',
     '--upload-results',
     '--output-format=chartjson',
     '--browser=%s' % browser
   ]
   # When this is enabled on more than just windows machines we will need
   # --device=android
 
   step_name = benchmark_name
   if browser == 'reference':
     test_args.append('--output-trace-tag=_ref')
     step_name += '.reference'
 
   return generate_isolate_script_entry(
     swarming_dimensions, test_args, 'telemetry_perf_tests',
-    step_name, ['telemetry_perf_tests'])
+    step_name, ['telemetry_perf_tests'],
+    swarming_timeout=BENCHMARK_SWARMING_TIMEOUTS.get(benchmark_name))
 
 
 def script_test_enabled_on_tester(master, test, tester_name, shard):
   for enabled_tester in test['testers'].get(master, []):
     if enabled_tester['name'] == tester_name:
       if shard in enabled_tester['shards']:
         return True
   return False
 
 
@@ skipping 99 matching lines @@
     'multipage_skpicture_printer',
     'multipage_skpicture_printer_ct',
     'rasterize_and_record_micro_ct',
     'repaint_ct',
     'multipage_skpicture_printer',
     'multipage_skpicture_printer_ct',
     'skpicture_printer',
     'skpicture_printer_ct',
 ]
 
+# Overrides the default 2 hour timeout for swarming tasks.
+BENCHMARK_SWARMING_TIMEOUTS = {
+    'loading.mobile': 14400,
+}
+
 # Certain swarming bots are not sharding correctly with the new device affinity
 # algorithm.  Reverting to legacy algorithm to try and get them to complete.
 # See crbug.com/670284
 LEGACY_DEVICE_AFFIINITY_ALGORITHM = [
   'Win Zenbook Perf',
   'Win 10 High-DPI Perf',
 ]
 
 def current_benchmarks(use_whitelist):
   benchmarks_dir = os.path.join(src_dir(), 'tools', 'perf', 'benchmarks')
@@ skipping 135 matching lines @@
   waterfall['name'] = 'chromium.perf'
   fyi_waterfall = get_fyi_waterfall_config()
   fyi_waterfall['name'] = 'chromium.perf.fyi'
 
   generate_all_tests(fyi_waterfall)
   generate_all_tests(waterfall)
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())