From 05f80acd3dd500dcb86d39ef04194d4fbf601da1 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Sun, 12 Apr 2026 17:24:54 +0300 Subject: [PATCH] qa/tasks/admin_socket.py: replace git.ceph.com with GitHub raw URLs admin_socket tests can still fail on non-default branches due to git.ceph.com wget timeouts. Use raw URLs instead. Fixes: https://tracker.ceph.com/issues/75969 Signed-off-by: Matan Breizman --- .../thrash/workloads/admin_socket_objecter_requests.yaml | 2 +- .../osd/tasks/admin_socket_objecter_requests.yaml | 2 +- .../thrash/workloads/admin_socket_objecter_requests.yaml | 2 +- qa/tasks/admin_socket.py | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qa/suites/crimson-rados/thrash/workloads/admin_socket_objecter_requests.yaml b/qa/suites/crimson-rados/thrash/workloads/admin_socket_objecter_requests.yaml index 8c9764ade848..2ed66d7f2e2e 100644 --- a/qa/suites/crimson-rados/thrash/workloads/admin_socket_objecter_requests.yaml +++ b/qa/suites/crimson-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={repo};a=blob_plain;f=src/test/admin_socket/objecter_requests;hb={branch}" + test: "https://raw.githubusercontent.com/ceph/{repo}/{branch}/src/test/admin_socket/objecter_requests" 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 3b1a8920b852..543c8e4379df 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={repo};a=blob_plain;f=src/test/admin_socket/objecter_requests;hb={branch}" + test: "https://raw.githubusercontent.com/ceph/{repo}/{branch}/src/test/admin_socket/objecter_requests" 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 6885f72aa44e..a554c9d044b4 100644 --- a/qa/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml +++ b/qa/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml @@ -12,4 +12,4 @@ tasks: - admin_socket: client.0: objecter_requests: - test: "http://git.ceph.com/?p={repo};a=blob_plain;f=src/test/admin_socket/objecter_requests;hb={branch}" + test: "https://raw.githubusercontent.com/ceph/{repo}/{branch}/src/test/admin_socket/objecter_requests" \ No newline at end of file diff --git a/qa/tasks/admin_socket.py b/qa/tasks/admin_socket.py index 2cf28d3f9ec9..9fe7c3fcf2f6 100644 --- a/qa/tasks/admin_socket.py +++ b/qa/tasks/admin_socket.py @@ -160,12 +160,12 @@ def _run_tests(ctx, client, tests): 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' + repo_name = 'ceph' branch_name = config.get('branch', 'main') - # use ceph-ci.git only if branch is not 'main' - # instead use ceph.git main branch + # use ceph-ci only if branch is not 'main' + # instead use ceph main branch if git_url.count('ceph-ci') and branch_name != 'main': - repo_name = 'ceph-ci.git' + repo_name = 'ceph-ci' url = config['test'].format( branch=branch_name, repo=repo_name, -- 2.47.3