suite: ensure that convolutions are cycled out to satisfy mincyclicity

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 722ff96d3822379446800b362b73f89395223ff8..4a865115d8c90e391ec4fcfdbe08c57f0a54652d 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -1018,7 +1018,12 @@ def _build_matrix(path, _isfile=os.path.isfile,
                     item=fn)
                 if submat is not None:
                     submats.append(submat)
-            return matrix.Product(item, submats)
+            mat = matrix.Product(item, submats)
+            if mat and mat.cyclicity() < mincyclicity:
+                mat = matrix.Cycle(
+                (mincyclicity + mat.cyclicity() - 1) / mat.cyclicity(),
+                mat)
+            return mat
         else:
             # list items
             submats = []