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 <mbreizma@redhat.com>

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 8c9764ade8487550359de6633315c6fc68978899..2ed66d7f2e2e6633f7e986a74a9aa640360a78eb 100644 (file)
--- 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 3b1a8920b8523ba8aa6231c93b6a0f5b12e02b2c..543c8e4379df81db65e8cb4e01ac1193ad015137 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={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 6885f72aa44e877ca4eef88f9970946d95cd9e07..a554c9d044b4f32c4a940b608f242d95f5a0a94b 100644 (file)
--- 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 2cf28d3f9ec960113a0e7f428070546b4dbc83f6..9fe7c3fcf2f6fa9362460c96181007cefc36da9b 100644 (file)
--- 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,