suite: fix build_matrix when non-yaml present in % dir

First, if we get a non-yaml file, return an empty list.

Second, if we are in a % mode, exclude an empty raw result from the
combination.  Otherwise, we get no resulting jobs.

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

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 342b719a62dba9f74e2f577e4d36fed74adf13b2..365450dc5704ab413a89ae2a76a23bafaa5d4c87 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -560,6 +560,7 @@ def build_matrix(path):
     if os.path.isfile(path):
         if path.endswith('.yaml'):
             return [(None, [path])]
+        return []
     if os.path.isdir(path):
         files = sorted(os.listdir(path))
         if '+' in files:
@@ -579,8 +580,9 @@ def build_matrix(path):
             sublists = []
             for fn in files:
                 raw = build_matrix(os.path.join(path, fn))
-                sublists.append([(combine_path(fn, item[0]), item[1])
-                                for item in raw])
+                if raw:
+                    sublists.append([(combine_path(fn, item[0]), item[1])
+                                     for item in raw])
             out = []
             if sublists:
                 for sublist in itertools.product(*sublists):