Change default workunit timeout to 1h

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index fa34c7d70bdd3c7924c2bc98af27203a9a5bb4bc..a0c438f968e0137318d0ee7d6b8f1ace5f04f906 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -41,7 +41,7 @@ def task(ctx, config):
     for individual clients. (This prevents unintended simultaneous runs.)
 
     To customize tests, you can specify environment variables as a dict. You
-    can also specify a time limit for each work unit (defaults to 6h):
+    can also specify a time limit for each work unit (defaults to 1h):
 
         tasks:
         - ceph:
@@ -53,7 +53,7 @@ def task(ctx, config):
             env:
               FOO: bar
               BAZ: quux
-            timeout: 6h
+            timeout: 1h
 
     :param ctx: Context
     :param config: Configuration
@@ -73,7 +73,7 @@ def task(ctx, config):
     if refspec is None:
         refspec = 'HEAD'
 
-    timeout = config.get('timeout', '6h')
+    timeout = config.get('timeout', '1h')
 
     log.info('Pulling workunits from ref %s', refspec)