More suite filter changes.

Comment change, and update help message to reflect the ability to
use a comma separated list as a filter.

diff --git a/scripts/suite.py b/scripts/suite.py
index ea3d0fca39358f6a9e787c801710cdc6bbe7defe..4cfc88a7c71926a3b06b1ab33b52d88d73d8a87e 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -65,9 +65,12 @@ Scheduler arguments:
   --timeout <timeout>         How long, in seconds, to wait for jobs to finish
                               before sending email. This does not kill jobs.
                               [default: 32400]
-  --filter <string>           Only run jobs containing the string specified.
-  --filter-out <string>       Do not run jobs containing the string specified.
-
+  --filter KEYWORDS           Only run jobs whose name contains at least one
+                              of the keywords in the comma separated keyword
+                              string specified.
+  --filter-out KEYWORDS       Do not run jobs whose name contains any of
+                              the keywords in the comma separated keyword
+                              string specified.
 """
 
 

diff --git a/teuthology/suite.py b/teuthology/suite.py
index ba3ffda8def91a5eddaba0328edb66146f290c8e..6d24aeac8ca61620cf8964fb9bbd170231cecd6d 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -448,6 +448,8 @@ def schedule_suite(job_config,
                 'Stopped after {limit} jobs due to --limit={limit}'.format(
                     limit=limit))
             break
+        # Break apart the filter parameter (one string) into comma separated
+        # components to be used in searches.
         if filter_in:
             filter_list = [x.strip() for x in filter_in.split(',')]
             if not any([x in description for x in filter_list]):