qa/tasks/admin_socket: subst in repo name

It is either ceph.git or ceph-ci.git.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bcbe45d948f1c4da02e27b3be5f29a8b52745e28)

diff --git a/qa/suites/powercycle/osd/tasks/admin_socket_objecter_requests.yaml b/qa/suites/powercycle/osd/tasks/admin_socket_objecter_requests.yaml
index b1ddad8d3b0b28927be15f309ef89266919ae100..3b1a8920b8523ba8aa6231c93b6a0f5b12e02b2c 100644 (file)
--- a/qa/suites/powercycle/osd/tasks/admin_socket_objecter_requests.yaml
+++ b/qa/suites/powercycle/osd/tasks/admin_socket_objecter_requests.yaml
@@ -10,4 +10,4 @@ tasks:
 - admin_socket:
     client.0:
       objecter_requests:
-        test: "http://git.ceph.com/?p=ceph.git;a=blob_plain;f=src/test/admin_socket/objecter_requests;hb={branch}"
+        test: "http://git.ceph.com/?p={repo};a=blob_plain;f=src/test/admin_socket/objecter_requests;hb={branch}"

diff --git a/qa/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml b/qa/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml
index b1ddad8d3b0b28927be15f309ef89266919ae100..3b1a8920b8523ba8aa6231c93b6a0f5b12e02b2c 100644 (file)
--- a/qa/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml
+++ b/qa/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml
@@ -10,4 +10,4 @@ tasks:
 - admin_socket:
     client.0:
       objecter_requests:
-        test: "http://git.ceph.com/?p=ceph.git;a=blob_plain;f=src/test/admin_socket/objecter_requests;hb={branch}"
+        test: "http://git.ceph.com/?p={repo};a=blob_plain;f=src/test/admin_socket/objecter_requests;hb={branch}"

diff --git a/qa/tasks/admin_socket.py b/qa/tasks/admin_socket.py
index 44235385a8ae64cb46ab1f6ea9a7d4532766a43c..3301372756be26c5c1bee2dfb9c78bcf807a2e3a 100644 (file)
--- a/qa/tasks/admin_socket.py
+++ b/qa/tasks/admin_socket.py
@@ -11,6 +11,7 @@ import time
 from teuthology.orchestra import run
 from teuthology import misc as teuthology
 from teuthology.parallel import parallel
+from teuthology.config import config as teuth_config
 
 log = logging.getLogger(__name__)
 
@@ -152,8 +153,14 @@ def _run_tests(ctx, client, tests):
 
             test_path = None
             if 'test' in config:
+                # hack: the git_url is always ceph-ci or ceph
+                git_url = teuth_config.get_ceph_git_url()
+                repo_name = 'ceph.git'
+                if git_url.count('ceph-ci'):
+                    repo_name = 'ceph-ci.git'
                 url = config['test'].format(
-                    branch=config.get('branch', 'master')
+                    branch=config.get('branch', 'master'),
+                    repo=repo_name,
                     )
                 test_path = os.path.join(tmp_dir, command)
                 remote.run(