From: Sage Weil <sage@newdream.net>
Date: Tue, 5 Jul 2011 22:14:42 +0000 (-0700)
Subject: set flavor to 'local' if pushing from local src dir
X-Git-Tag: 1.1.0~2907^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d04256aa9602eec075a693f0826c1b1455738513;p=teuthology.git

set flavor to 'local' if pushing from local src dir
always record in summary
---

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 8ff3e31861..ab9fe159dd 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -114,7 +114,6 @@ def binaries(ctx, config):
             sha1=config.get('sha1'),
             flavor=config.get('flavor'),
             )
-        ctx.summary['flavor'] = config.get('flavor', 'default')
         if ctx.archive is not None:
             with file(os.path.join(ctx.archive, 'ceph-sha1'), 'w') as f:
                 f.write(sha1 + '\n')
@@ -665,9 +664,14 @@ def task(ctx, config):
         "task ceph only supports a dictionary for configuration"
 
     flavor = None
-    if config.get('coverage'):
-        log.info('Recording coverage for this run.')
-        flavor = 'gcov'
+    if config.get('path'):
+        # local dir precludes any other flavors
+        flavor = 'local'
+    else:
+        if config.get('coverage'):
+            log.info('Recording coverage for this run.')
+            flavor = 'gcov'
+    ctx.summary['flavor'] = flavor or 'default'
 
     coverage_dir = '/tmp/cephtest/archive/coverage'
     log.info('Creating coverage directory...')