From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 9 Oct 2018 20:31:26 +0000 (-0700)
Subject: qa: increase timeout for cleanup
X-Git-Tag: v13.2.3~78^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24684%2Fhead;p=ceph.git

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 022ef5d0666..ea0f5e46f3d 100644
--- a/qa/tasks/workunit.py
+++ b/qa/tasks/workunit.py
@@ -480,7 +480,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]