update sources to v12.1.1

[ceph.git] / ceph / qa / tasks / workunit.py

diff --git a/ceph/qa/tasks/workunit.py b/ceph/qa/tasks/workunit.py
index 888b75eefff5a03427f74aff9ecd2d8fab9a994c..ffd8b2202844c8c170bd37e72279d057349e8d72 100644 (file)
--- a/ceph/qa/tasks/workunit.py
+++ b/ceph/qa/tasks/workunit.py
@@ -4,6 +4,7 @@ Workunit task -- Run ceph on sets of specific clients
 import logging
 import pipes
 import os
+import re
 
 from copy import deepcopy
 from util import get_remote_for_role
@@ -377,9 +378,12 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None):
         remote.run(logger=log.getChild(role),
                    args=refspec.clone(git_url, clonedir))
     except CommandFailedError:
-        if not git_url.endswith('/ceph-ci.git'):
+        if git_url.endswith('/ceph-ci.git'):
+            alt_git_url = git_url.replace('/ceph-ci.git', '/ceph.git')
+        elif git_url.endswith('/ceph-ci'):
+            alt_git_url = re.sub(r'/ceph-ci$', '/ceph.git', git_url)
+        else:
             raise
-        alt_git_url = git_url.replace('/ceph-ci.git', '/ceph.git')
         log.info(
             "failed to check out '%s' from %s; will also try in %s",
             refspec,