From: Zack Cerza <zack@redhat.com>
Date: Wed, 14 Sep 2016 16:16:51 +0000 (-0600)
Subject: suite.Run: include suite_sha1 in job config
X-Git-Tag: 1.1.0~535^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F952%2Fhead;p=teuthology.git

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 b6e6d0c1..6320c5bd 100644
--- 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 1bec9ae1..693dff56 100644
--- 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', {})],
         )