From: Dan Mick <dan.mick@redhat.com>
Date: Mon, 27 Jun 2016 21:45:58 +0000 (-0700)
Subject: suite/run.py: rebuild base config on sha1 backtrack
X-Git-Tag: 1.1.0~591^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F886%2Fhead;p=teuthology.git

suite/run.py: rebuild base config on sha1 backtrack

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index bce780f82..fbbc63634 100644
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -422,12 +422,15 @@ class Run(object):
             jobs_missing_packages, jobs_to_schedule = \
                 self.collect_jobs(arch, configs, self.args.newest)
             if jobs_missing_packages and self.args.newest:
-                self.base_config.sha1 = \
+                new_sha1 = \
                     util.find_git_parent('ceph', self.base_config.sha1)
-                if self.base_config.sha1 is None:
+                if new_sha1 is None:
                     util.schedule_fail(
                         name, message='Backtrack for --newest failed'
                     )
+                # rebuild the base config to resubstitute sha1
+                self.config_input['ceph_hash'] = new_sha1
+                self.base_config = self.build_base_config()
                 backtrack += 1
                 continue
             if backtrack: