suite.Run: include suite_sha1 in job config

http://tracker.ceph.com/issues/17211
Fixes: #17211
Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index b6e6d0c15b7f3007cef77952ba63804d1a33d256..6320c5bd15229bb8a97dc92fe8a931890f71bd52 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -213,6 +213,7 @@ class Run(object):
             exc = BranchNotFoundError(suite_branch, 'ceph-qa-suite.git')
             util.schedule_fail(message=str(exc), name=self.name)
         log.info("ceph-qa-suite branch: %s %s", suite_branch, suite_hash)
+        return suite_hash
 
     def build_base_config(self):
         conf_dict = substitute_placeholders(dict_templ, self.config_input)

diff --git a/teuthology/suite/test/test_run_.py b/teuthology/suite/test/test_run_.py
index 1bec9ae1a6582b5070179d7c478a8c21949f78c0..693dff56207aeba78b427a9dbfb2cf528f4a84fc 100644 (file)
--- a/teuthology/suite/test/test_run_.py
+++ b/teuthology/suite/test/test_run_.py
@@ -236,6 +236,7 @@ class TestScheduleSuite(object):
         runobj.base_args = list()
         count = runobj.schedule_suite()
         assert(count == 1)
+        assert runobj.base_config['suite_sha1'] == 'suite_hash'
         m_has_packages_for_distro.assert_has_calls(
             [call('ceph_sha1', 'ubuntu', '14.04', 'basic', {})],
         )