From: Sebastian Wagner <sewagner@redhat.com>
Date: Wed, 25 Aug 2021 13:49:39 +0000 (+0200)
Subject: qa/tasks: Drop downloading cephadm from the git source tree
X-Git-Tag: v18.0.0~7^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ddd1790540181ce98ecf5e1f58df9c7aacaaf8c;p=ceph.git

qa/tasks: Drop downloading cephadm from the git source tree

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index bd900733b465..22c8da740b3f 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -7,7 +7,6 @@ import contextlib
 import logging
 import os
 import json
-import re
 import uuid
 import yaml
 
@@ -123,50 +122,18 @@ def download_cephadm(ctx, config, ref):
     cluster_name = config['cluster']
 
     if config.get('cephadm_mode') != 'cephadm-package':
-        ref = config.get('cephadm_branch', ref)
-        git_url = config.get('cephadm_git_url', teuth_config.get_ceph_git_url())
-        log.info('Downloading cephadm (repo %s ref %s)...' % (git_url, ref))
-        if ctx.config.get('redhat'):
-            log.info("Install cephadm using RPM")
-            # cephadm already installed from redhat.install task
-            ctx.cluster.run(
-                args=[
-                    'cp',
-                    run.Raw('$(which cephadm)'),
-                    ctx.cephadm,
-                    run.Raw('&&'),
-                    'ls', '-l',
-                    ctx.cephadm,
-                ]
-            )
-        elif git_url.startswith('https://github.com/'):
-            # git archive doesn't like https:// URLs, which we use with github.
-            rest = git_url.split('https://github.com/', 1)[1]
-            rest = re.sub(r'\.git/?$', '', rest).strip() # no .git suffix
-            ctx.cluster.run(
-                args=[
-                    'curl', '--silent',
-                    'https://raw.githubusercontent.com/' + rest + '/' + ref + '/src/cephadm/cephadm',
-                    run.Raw('>'),
-                    ctx.cephadm,
-                    run.Raw('&&'),
-                    'ls', '-l',
-                    ctx.cephadm,
-                ],
-            )
-        else:
-            ctx.cluster.run(
-                args=[
-                    'git', 'archive',
-                    '--remote=' + git_url,
-                    ref,
-                    'src/cephadm/cephadm',
-                    run.Raw('|'),
-                    'tar', '-xO', 'src/cephadm/cephadm',
-                    run.Raw('>'),
-                    ctx.cephadm,
-                ],
-            )
+        # cephadm already installed from install task
+        ctx.cluster.run(
+            args=[
+                'cp',
+                run.Raw('$(which cephadm)'),
+                ctx.cephadm,
+                run.Raw('&&'),
+                'ls', '-l',
+                ctx.cephadm,
+            ]
+        )
+
         # sanity-check the resulting file and set executable bit
         cephadm_file_size = '$(stat -c%s {})'.format(ctx.cephadm)
         ctx.cluster.run(