From: Warren Usui <warren.usui@inktank.com>
Date: Wed, 29 Oct 2014 00:27:21 +0000 (-0700)
Subject: Allow more strings in filters
X-Git-Tag: 1.1.0~1074^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddba3121cdb0460af11e48123c0f8f82b53f4c04;p=teuthology.git

Allow more strings in filters

A comma separated list can now be used in filter and filter-out.

Fixes: #9925
Signed-off-by: Warren Usui <warren.usui@inktank.com>
---

diff --git a/teuthology/suite.py b/teuthology/suite.py
index b0b3519dc..ba3ffda8d 100644
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -449,13 +449,25 @@ def schedule_suite(job_config,
                     limit=limit))
             break
         if filter_in:
-            if filter_in not in description:
-                if all([x.find(filter_in) < 0 for x in fragment_paths]):
+            filter_list = [x.strip() for x in filter_in.split(',')]
+            if not any([x in description for x in filter_list]):
+                all_filt = []
+                for filt_samp in filter_list:
+                    all_filt.extend([x.find(filt_samp) < 0 for x in fragment_paths])
+                if all(all_filt):
                     continue
         if filter_out:
-            if filter_out in description or any([filter_out in z for z in
-                                                 fragment_paths]):
+            filter_list = [x.strip() for x in filter_out.split(',')]
+            if any([x in description for x in filter_list]):
                 continue
+            all_filt_val = False
+            for filt_samp in filter_list:
+                flist = [filt_samp in x for x in fragment_paths]
+                if any(flist):
+                    all_filt_val = True
+                    continue
+            if all_filt_val:
+                continue        
 
         raw_yaml = '\n'.join([file(a, 'r').read() for a in fragment_paths])