qa: increase timeout for cleanup

Apparently 15m is not long enough for some workunits like fsstress.

Fixes: http://tracker.ceph.com/issues/36365
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit dc6e7eadf8ee21ec1ecc5b3fcf49967966ad96e0)

diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py
index 0a46ade76ab3e503b61330973f44a2152fc8bc66..17cfaf7f124d31effe1f6a07f029ef8603271c5b 100644 (file)
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -410,7 +410,7 @@ def _run_tests(ctx, refspec, role, tests, env, basedir,
                 )
                 if cleanup:
                     args=['sudo', 'rm', '-rf', '--', scratch_tmp]
-                    remote.run(logger=log.getChild(role), args=args, timeout=(15*60))
+                    remote.run(logger=log.getChild(role), args=args, timeout=(60*60))
     finally:
         log.info('Stopping %s on %s...', tests, role)
         args=['sudo', 'rm', '-rf', '--', workunits_file, clonedir]