From 4ad940a1c75dc8c721822364604d7aabe4f5db90 Mon Sep 17 00:00:00 2001
From: Samuel Just <sjust@redhat.com>
Date: Wed, 13 May 2015 13:15:54 -0700
Subject: [PATCH] suite: ignore files not ending in .yaml and dirs ending in
 .disable

Signed-off-by: Samuel Just <sjust@redhat.com>
---
 teuthology/suite.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 2db71e6d31..3bb53c539d 100644
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -783,23 +783,25 @@ def _build_matrix(path, _isfile=os.path.isfile,
     if _isfile(path):
         if path.endswith('.yaml'):
             return matrix.Base(item)
-        assert False, "Invalid file seen in _build_matrix"
         return None
     if _isdir(path):
+        if path.endswith('.disable'):
+            return None
         files = sorted(_listdir(path))
         if '+' in files:
             # concatenate items
             files.remove('+')
             submats = []
             for fn in sorted(files):
-                submats.append(
-                    _build_matrix(
-                        os.path.join(path, fn),
-                        _isfile,
-                        _isdir,
-                        _listdir,
-                        mincyclicity,
-                        fn))
+                submat = _build_matrix(
+                    os.path.join(path, fn),
+                    _isfile,
+                    _isdir,
+                    _listdir,
+                    mincyclicity,
+                    fn)
+                if submat is not None:
+                    submats.append(submat)
             return matrix.Concat(item, submats)
         elif '%' in files:
             # convolve items
@@ -813,7 +815,8 @@ def _build_matrix(path, _isfile=os.path.isfile,
                     _listdir,
                     mincyclicity=0,
                     item=fn)
-                submats.append(submat)
+                if submat is not None:
+                    submats.append(submat)
             return matrix.Product(item, submats)
         else:
             # list items
@@ -826,6 +829,8 @@ def _build_matrix(path, _isfile=os.path.isfile,
                     _listdir,
                     mincyclicity,
                     fn)
+                if submat is None:
+                    continue
                 if submat.cyclicity() < mincyclicity:
                     submat = matrix.Cycle(
                         int(math.ceil(
-- 
2.39.5