Add --suite-branch and --suite-base

The former lets you specify a specific ceph-qa-suite branch to use for
testing. The latter lets you specify an as-is directory to use, for
example if you want ro run tests that you don't want to commit yet.

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/scripts/suite.py b/scripts/suite.py
index a30a6e183d6b65ebbe55191efbfaddfab7d7c420..2a9676d75b650e6640e8c6de511224b38d76be37 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -4,8 +4,7 @@ import teuthology.suite
 
 doc = """
 usage: teuthology-suite [-h]
-       teuthology-suite --suite <suite> [options]
-       teuthology-suite  -s <suite> [options] [<config_yaml>...]
+       teuthology-suite  --suite <suite> [options] [<config_yaml>...]
 
 Run a suite of ceph integration tests. A suite is a directory containing
 facets. A facet is a directory containing config snippets. Running a suite
@@ -42,6 +41,11 @@ Standard arguments:
   -d <distro>, --distro <distro>
                               Distribution to run against
                               [default: ubuntu]
+  --suite-branch <suite_branch>
+                              Use this suite branch instead of the ceph branch
+  --suite-base <suite_base>   Use this alternative directory as-is when
+                              assembling jobs from yaml fragments. This causes
+                              <suite_branch> to be ignored.
 
 Scheduler arguments:
   --owner <owner>             Job owner

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 5fd22be12ba9b0ba59e1f6a32c03ecf4a8f4a548..dfb137508bc189d382e5ecef384198006851ae2b 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -39,6 +39,8 @@ def main(args):
     teuthology_branch = args['--teuthology-branch']
     machine_type = args['--machine-type']
     distro = args['--distro']
+    suite_branch = args['--suite-branch'] or ceph_branch
+    suite_base = args['--suite-base']
 
     limit = int(args['--limit'])
     priority = int(args['--priority'])
@@ -53,7 +55,10 @@ def main(args):
     name = make_run_name(nice_suite, ceph_branch, kernel_branch, kernel_flavor,
                          machine_type)
 
-    suite_repo_path = fetch_suite_repo(ceph_branch, test_name=name)
+    if suite_base:
+        suite_repo_path = suite_base
+    else:
+        suite_repo_path = fetch_suite_repo(suite_branch, test_name=name)
 
     config_string = create_initial_config(nice_suite, ceph_branch,
                                           teuthology_branch, kernel_branch,