From: Zack Cerza <zack@redhat.com>
Date: Tue, 26 Jul 2022 15:27:26 +0000 (-0600)
Subject: Merge pull request #1779 from ceph/dc-suite-fix
X-Git-Tag: 1.2.0~152
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f965ce157b8dcdaf2da92a5b5d1a63e787efdd9;p=teuthology.git

Merge pull request #1779 from ceph/dc-suite-fix

Fix scheduling regression
---

5f965ce157b8dcdaf2da92a5b5d1a63e787efdd9
diff --cc teuthology/suite/run.py
index 239dc509f,29f18ede3..ab2d8f064
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@@ -268,9 -264,16 +265,16 @@@ class Run(object)
                  f"file://{config.teuthology_path}",
                  teuthology_branch
              )
+         else:
+             if not teuthology_branch:
+                 teuthology_branch = 'main'
+             teuthology_sha1 = util.git_ls_remote(
+                 'teuthology',
+                 teuthology_branch
+             )
          if not teuthology_sha1:
              exc = BranchNotFoundError(teuthology_branch, build_git_url('teuthology'))
 -            util.schedule_fail(message=str(exc), name=self.name)
 +            util.schedule_fail(message=str(exc), name=self.name, dry_run=self.args.dry_run)
          log.info("teuthology branch: %s %s", teuthology_branch, teuthology_sha1)
          return teuthology_branch, teuthology_sha1