]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
suite/run.py: rebuild base config on sha1 backtrack 886/head
authorDan Mick <dan.mick@redhat.com>
Mon, 27 Jun 2016 21:45:58 +0000 (14:45 -0700)
committerDan Mick <dan.mick@redhat.com>
Mon, 27 Jun 2016 22:51:29 +0000 (15:51 -0700)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
teuthology/suite/run.py

index bce780f8233de14dfc90be1d4e6be264f9584933..fbbc6363408068198fff5db67a647117ecab7139 100644 (file)
@@ -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: