[Benchmarking] Increase shard timeout to 6 hours.

With the work to move gtests onto the shard maps, the overhead should
be reduced and we can change this from 5.5 hours to 6 hours.
This will reduce the chance of timeouts of these shards.

This is an adjustment from the earlier change
https://chromium-review.googlesource.com/c/chromium/src/+/1977965

Bug: 1041692, 1041696
Change-Id: I88661366c3f2ed058ed3d3b247c309d0f3e48957
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006612
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Auto-Submit: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732716}

testing/buildbot/chromium.perf.fyi.json

@@ -31,9 +31,9 @@
             }
           ],
           "expiration": 7200,
-          "hard_timeout": 19800,
+          "hard_timeout": 21600,
           "ignore_task_failure": false,
-          "io_timeout": 19800,
+          "io_timeout": 21600,
           "shards": 3
         },
         "trigger_script": {
@@ -77,9 +77,9 @@
             }
           ],
           "expiration": 7200,
-          "hard_timeout": 19800,
+          "hard_timeout": 21600,
           "ignore_task_failure": false,
-          "io_timeout": 19800,
+          "io_timeout": 21600,
           "shards": 1
         },
         "trigger_script": {
@@ -124,9 +124,9 @@
             }
           ],
           "expiration": 7200,
-          "hard_timeout": 19800,
+          "hard_timeout": 21600,
           "ignore_task_failure": false,
-          "io_timeout": 19800,
+          "io_timeout": 21600,
           "shards": 4
         },
         "trigger_script": {
@@ -169,9 +169,9 @@
             }
           ],
           "expiration": 7200,
-          "hard_timeout": 19800,
+          "hard_timeout": 21600,
           "ignore_task_failure": false,
-          "io_timeout": 19800,
+          "io_timeout": 21600,
           "shards": 4
         },
         "trigger_script": {
@@ -215,9 +215,9 @@
             }
           ],
           "expiration": 7200,
-          "hard_timeout": 19800,
+          "hard_timeout": 21600,
           "ignore_task_failure": false,
-          "io_timeout": 19800,
+          "io_timeout": 21600,
           "shards": 1
         },
         "trigger_script": {
@@ -260,9 +260,9 @@
             }
           ],
           "expiration": 7200,
-          "hard_timeout": 19800,
+          "hard_timeout": 21600,
           "ignore_task_failure": false,
-          "io_timeout": 19800,
+          "io_timeout": 21600,
           "shards": 1
         },
         "trigger_script": {

tools/perf/core/perf_data_generator.py

@@ -1082,16 +1082,16 @@ def generate_performance_test(tester_config, test, builder_name):
     # to shards perf benchmarks on Win builders, reduce this hard timeout limit
     # to ~2 hrs.
     # Note that the builder seems to time out after 7 hours (crbug.com/1036447),
-    # so we must timeout the shards within ~5.5 hours to allow for other
+    # so we must timeout the shards within ~6 hours to allow for other
     # overhead. If the overall builder times out then we
     # don't get data even from the passing shards.
-    'hard_timeout': int(5.5 * 60 * 60), # 5.5 hours timeout for full suite
+    'hard_timeout': int(6 * 60 * 60), # 6 hours timeout for full suite
     'ignore_task_failure': False,
     # 5.5 hour timeout. Note that this is effectively the timeout for a
     # benchmarking subprocess to run since we intentionally do not stream
     # subprocess output to the task stdout.
     # TODO(crbug.com/865538): Reduce this once we can reduce hard_timeout.
-    'io_timeout': int(5.5 * 60 * 60),
+    'io_timeout': int(6 * 60 * 60),
     'dimension_sets': [
       tester_config['dimension']
     ],