From 7740de804c37a9bd1ca1ca8f8a42635d81682f91 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Wed, 14 May 2025 16:25:15 +0200 Subject: [PATCH] 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 (cherry picked from commit ea09fd631d5f283ef7b321c2c2c5e581dc12662a) --- qa/tasks/cephadm.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index fdc701223b0..7c5d03b2da6 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('&&'), -- 2.39.5