do not archive on pass if 'archive-on-error: True'

Optional flag makes us suck down the archive (mostly, the logs, which
might be huge for some debugging tests) unless the test has failed.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 66ac497b6c7e3b4db47516892743dd1c87b1895b..07028aa974eb6a6fc89063fc030ddc69b5be1e3c 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -708,6 +708,10 @@ def cluster(ctx, config):
 
     try:
         yield
+    except:
+        # we need to know this below
+        ctx.summary['success'] = False
+        raise
     finally:
         (mon0_remote,) = ctx.cluster.only(firstmon).remotes.keys()
 
@@ -769,7 +773,8 @@ def cluster(ctx, config):
                     check_status=False,
                 )
 
-        if ctx.archive is not None:
+        if ctx.archive is not None and \
+                not (ctx.config.get('archive-on-error') and ctx.summary['success']):
             # archive mon data, too
             log.info('Archiving mon data...')
             path = os.path.join(ctx.archive, 'data')

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index 1adb05992af5275b3252d162c09bf6094c03a152..3b1412e65fd6cdbfd9932e630c49bc89f1e26d85 100644 (file)
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -251,8 +251,13 @@ def archive(ctx, config):
 
     try:
         yield
+    except:
+        # we need to know this below
+        ctx.summary['success'] = False
+        raise
     finally:
-        if ctx.archive is not None:
+        if ctx.archive is not None and \
+                not (ctx.config.get('archive-on-error') and ctx.summary['success']):
             log.info('Transferring archived files...')
             logdir = os.path.join(ctx.archive, 'remote')
             for remote in ctx.cluster.remotes.iterkeys():