From e9311ddb60638c1dd39325e279b97c9a7d09b8a4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 15 Dec 2016 13:35:02 -0500 Subject: [PATCH] qa/tasks/admin_socket: subst in repo name It is either ceph.git or ceph-ci.git. Signed-off-by: Sage Weil (cherry picked from commit bcbe45d948f1c4da02e27b3be5f29a8b52745e28) --- .../osd/tasks/admin_socket_objecter_requests.yaml | 2 +- .../thrash/workloads/admin_socket_objecter_requests.yaml | 2 +- qa/tasks/admin_socket.py | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) 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 b1ddad8d3b0b2..3b1a8920b8523 100644 --- 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 b1ddad8d3b0b2..3b1a8920b8523 100644 --- 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 44235385a8ae6..3301372756be2 100644 --- 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( -- 2.39.5