From 86ace44c10cced788043f14392d6937f7fbac741 Mon Sep 17 00:00:00 2001 From: Warren Usui Date: Thu, 6 Nov 2014 16:31:04 -0800 Subject: [PATCH] More suite filter changes. Comment change, and update help message to reflect the ability to use a comma separated list as a filter. --- scripts/suite.py | 9 ++++++--- teuthology/suite.py | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/suite.py b/scripts/suite.py index ea3d0fca3..4cfc88a7c 100644 --- a/scripts/suite.py +++ b/scripts/suite.py @@ -65,9 +65,12 @@ Scheduler arguments: --timeout How long, in seconds, to wait for jobs to finish before sending email. This does not kill jobs. [default: 32400] - --filter Only run jobs containing the string specified. - --filter-out 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 ba3ffda8d..6d24aeac8 100644 --- 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]): -- 2.47.3