Store the suite_branch in the job config

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

diff --git a/scripts/suite.py b/scripts/suite.py
index 8fa8f07d329f6ae7ea6fa6095be9b2f0a070a2b3..f896bf57e310df9aa4a10efbd8fb8af4376177e5 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -45,7 +45,9 @@ Standard arguments:
                               Use this suite branch instead of the ceph branch
   --suite-dir <suite_dir>     Use this alternative directory as-is when
                               assembling jobs from yaml fragments. This causes
-                              <suite_branch> to be ignored.
+                              <suite_branch> to be ignored for scheduling
+                              purposes, but it will still be used for test
+                              running.
 
 Scheduler arguments:
   --owner <owner>             Job owner

diff --git a/teuthology/suite.py b/teuthology/suite.py
index ea6b540bd432786b31452b8bb8ee419121b432e3..1e7e69fac25208844f3d4011c7a769eb84330ddf 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -68,6 +68,8 @@ def main(args):
         job_config.email = email
     if owner:
         job_config.owner = owner
+    if suite_branch:
+        job_config.suite_branch = suite_branch
 
     with NamedTemporaryFile(prefix='schedule_suite_',
                             delete=False) as base_yaml: