Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 1 insertions, 6 deletions

diff --git a/buildscripts/timeouts/timeout.py b/buildscripts/timeouts/timeout.py
index 36f08db58df..3e3440f9c5b 100644
--- a/buildscripts/timeouts/timeout.py
+++ b/buildscripts/timeouts/timeout.py
@@ -9,7 +9,7 @@ from buildscripts.patch_builds.task_generation import TimeoutInfo
 
 LOGGER = structlog.getLogger(__name__)
 
-AVG_TASK_SETUP_TIME = int(timedelta(minutes=5).total_seconds())
+AVG_TASK_SETUP_TIME = int(timedelta(minutes=2).total_seconds())
 MIN_TIMEOUT_SECONDS = int(timedelta(minutes=5).total_seconds())
 MAX_EXPECTED_TIMEOUT = int(timedelta(hours=48).total_seconds())
 DEFAULT_SCALING_FACTOR = 3.0
@@ -45,11 +45,6 @@ class TimeoutEstimate(NamedTuple):
         """Create an instance with no estimation data."""
         return cls(max_test_runtime=None, expected_task_runtime=None)
 
-    @classmethod
-    def only_task_timeout(cls, expected_task_runtime) -> "TimeoutEstimate":
-        """Create an instance with only task timeout estimation."""
-        return cls(max_test_runtime=None, expected_task_runtime=expected_task_runtime)
-
     def is_specified(self) -> bool:
         """Determine if any specific timeout value has been specified."""
         return self.max_test_runtime is not None or self.expected_task_runtime is not None