suite: fix build_matrix for + case

The + means we should concatenate everything in the directory.  Do that.

This was totally broken before (and unused until now).

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

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 60d09e7a29fa8ca10b4331a6da577c3a805a2798..0ff0c50d37d9b358eab60cb0a539d34525126564 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -160,13 +160,14 @@ def build_matrix(path):
         if '+' in files:
             # concatenate items
             files.remove('+')
-            out = []
+            raw = []
             for fn in files:
-                out.extend(build_matrix(os.path.join(path, fn)))
-            return [(
-                    '+',
-                    [a[1] for a in out]
-                    )]
+                raw.extend(build_matrix(os.path.join(path, fn)))
+            out = [(
+                '{' + ' '.join(files) + '}',
+                [a[1][0] for a in raw]
+            )]
+            return out
         elif '%' in files:
             # convolve items
             files.remove('%')