suite.run: Fix parent commit search

We were only looking in ceph.git; look in e.g. ceph-ci.git if that is the ceph
repo being tested.

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

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index 8e8698f52c2a88b02ba8c9b33e83da793877b836..ce3276a39742554d3376eb4d68e31fb73368582c 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -680,7 +680,11 @@ Note: If you still want to go ahead, use --job-threshold 0'''
                 self.collect_jobs(arch, configs, self.args.newest, job_limit)
             if jobs_missing_packages and self.args.newest:
                 if not sha1s:
-                    sha1s = util.find_git_parents('ceph', str(self.base_config.sha1), self.args.newest)
+                    sha1s = util.find_git_parents(
+                        self.ceph_repo_name,
+                        str(self.base_config.sha1),
+                        self.args.newest
+                    )
                 if not sha1s:
                     util.schedule_fail('Backtrack for --newest failed', name, dry_run=self.args.dry_run)
                 cur_sha1 = sha1s.pop(0)

diff --git a/teuthology/suite/test/test_run_.py b/teuthology/suite/test/test_run_.py
index 3b45974c1020b561a315a7a7ecc72b53752cac6a..d1c8a06009ad59a50efcd7c6ef1cbb9d5f03ce5b 100644 (file)
--- a/teuthology/suite/test/test_run_.py
+++ b/teuthology/suite/test/test_run_.py
@@ -247,8 +247,8 @@ class TestScheduleSuite(object):
             suite_relpath='',
             suite_dir='suite_dir',
             suite_branch='main',
-            suite_repo='main',
-            ceph_repo='main',
+            suite_repo='ceph',
+            ceph_repo='ceph',
             ceph_branch='main',
             ceph_sha1='ceph_sha1',
             teuthology_branch='main',