From 8c37d3b7ebc411282ff0c56df73675d7f1757a98 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Wed, 20 Mar 2019 18:09:45 +0100 Subject: [PATCH] teuthology-suite: no default value for suite branch By default suite branch must be equal to ceph one. Signed-off-by: Kyr Shatskyy --- scripts/suite.py | 2 -- teuthology/suite/__init__.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/suite.py b/scripts/suite.py index ceb745355f..abea69d708 100644 --- a/scripts/suite.py +++ b/scripts/suite.py @@ -68,7 +68,6 @@ Standard arguments: [default: qa] --suite-branch Use this suite branch instead of the ceph branch - [default: {default_suite_branch}] --suite-dir Use this alternative directory as-is when assembling jobs from yaml fragments. This causes to be ignored for scheduling @@ -144,7 +143,6 @@ Scheduler arguments: default_suite_repo=defaults('--suite-repo', config.get_ceph_qa_suite_git_url()), default_ceph_branch=defaults('--ceph-branch', 'master'), - default_suite_branch=defaults('--suite-branch', 'master'), default_teuthology_branch=defaults('--teuthology-branch', 'master'), ) diff --git a/teuthology/suite/__init__.py b/teuthology/suite/__init__.py index ce1980de3d..488b104b39 100644 --- a/teuthology/suite/__init__.py +++ b/teuthology/suite/__init__.py @@ -54,6 +54,8 @@ def process_args(args): key = key.lstrip('--').replace('-', '_') # Rename the key if necessary key = rename_args.get(key) or key + if key == 'suite_branch': + value = value or override_arg_defaults('--suite-branch', None) if key == 'suite' and value is not None: value = normalize_suite_name(value) if key == 'suite_relpath' and value is None: -- 2.39.5