From: Zack Cerza Date: Wed, 30 Nov 2016 21:23:18 +0000 (-0700) Subject: worker: Use suite_relpath if set X-Git-Tag: 1.1.0~487^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e5fb497240f8258175d42be7d81f3fd096b30dde;p=teuthology.git worker: Use suite_relpath if set Signed-off-by: Zack Cerza --- diff --git a/teuthology/worker.py b/teuthology/worker.py index 6dd6590bab..c82f70b6a4 100644 --- a/teuthology/worker.py +++ b/teuthology/worker.py @@ -167,7 +167,10 @@ def prep_job(job_config, log_file_path, archive_dir): suite_repo = job_config.get('suite_repo') if suite_repo: teuth_config.ceph_qa_suite_git_url = suite_repo - job_config['suite_path'] = fetch_qa_suite(suite_branch) + job_config['suite_path'] = os.path.normpath(os.path.join( + fetch_qa_suite(suite_branch), + job_config.get('suite_relpath', ''), + )) except BranchNotFoundError as exc: log.exception("Branch not found; marking job as dead") report.try_push_job_info(