qa/tasks/admin_socket: fix ceph-ci/main usage

When scheduling jobs with --sha1 instead of -c. The ceph-ci
branch used is 'main'. However, ceph-ci doesn't actually have
a main branch - Instead use ceph.git main branch.

```
Command failed on smithi116 with status 8: "wget -q -O
/home/ubuntu/cephtest/admin_socket_client.0/objecter_requests --
'http://git.ceph.com/?p=ceph-ci.git;a=blob_plain;f=src/test/admin_socket/objecter_requests;hb=main' && chmod u=rx -- /home/ubuntu/cephtest/admin_socket_client.0/objecter_requests"
```

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/qa/tasks/admin_socket.py b/qa/tasks/admin_socket.py
index 0d960d1a51f7cafe314e28f138231865b20f4471..2cf28d3f9ec960113a0e7f428070546b4dbc83f6 100644 (file)
--- a/qa/tasks/admin_socket.py
+++ b/qa/tasks/admin_socket.py
@@ -161,10 +161,13 @@ def _run_tests(ctx, client, tests):
                 # 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'):
+                branch_name = config.get('branch', 'main')
+                # use ceph-ci.git only if branch is not 'main'
+                # instead use ceph.git main branch
+                if git_url.count('ceph-ci') and branch_name != 'main':
                     repo_name = 'ceph-ci.git'
                 url = config['test'].format(
-                    branch=config.get('branch', 'master'),
+                    branch=branch_name,
                     repo=repo_name,
                     )
                 test_path = os.path.join(tmp_dir, command)