From: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
Date: Wed, 14 May 2025 14:25:15 +0000 (+0200)
Subject: qa/tasks/cephadm: allow to select from 'cephadm' and 'cephadm.py'
X-Git-Tag: testing/wip-vshankar-testing-20250730.064735-debug~45^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ea09fd631d5f283ef7b321c2c2c5e581dc12662a;p=ceph-ci.git

qa/tasks/cephadm: allow to select from 'cephadm' and 'cephadm.py'

After quincy the following releases of the src/cephadm/cephadm script
became  src/cephadm/cephadm.py, so just allow to select custom path.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index f64744dabf7..695062a67f1 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -282,6 +282,7 @@ def _fetch_cephadm_from_rpm(ctx):
 def _fetch_cephadm_from_github(ctx, config, ref):
     ref = config.get('cephadm_branch', ref)
     git_url = config.get('cephadm_git_url', teuth_config.get_ceph_git_url())
+    file_path = config.get('cephadm_file_path', 'src/cephadm/cephadm')
     log.info('Downloading cephadm (repo %s ref %s)...' % (git_url, ref))
     if git_url.startswith('https://github.com/'):
         # git archive doesn't like https:// URLs, which we use with github.
@@ -290,7 +291,7 @@ def _fetch_cephadm_from_github(ctx, config, ref):
         ctx.cluster.run(
             args=[
                 'curl', '--silent',
-                'https://raw.githubusercontent.com/' + rest + '/' + ref + '/src/cephadm/cephadm',
+                f'https://raw.githubusercontent.com/{rest}/{ref}/{file_path}',
                 run.Raw('>'),
                 ctx.cephadm,
                 run.Raw('&&'),
@@ -305,7 +306,7 @@ def _fetch_cephadm_from_github(ctx, config, ref):
                 run.Raw('&&'),
                 'cd', 'testrepo',
                 run.Raw('&&'),
-                'git', 'show', f'{ref}:src/cephadm/cephadm',
+                'git', 'show', f'{ref}:{file_path}',
                 run.Raw('>'),
                 ctx.cephadm,
                 run.Raw('&&'),