From 5421de55a17e9c182ea51b6c5a30326e0e05aebb Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 27 Mar 2024 01:58:21 +0000 Subject: [PATCH] suite: add the kdb option support This will allow us to disable the kdb when running the jobs. URL: https://tracker.ceph.com/issues/64471 Signed-off-by: Xiubo Li --- scripts/suite.py | 3 +++ teuthology/suite/__init__.py | 2 +- teuthology/suite/run.py | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/suite.py b/scripts/suite.py index 4ac7d9cac5..77561b7e03 100644 --- a/scripts/suite.py +++ b/scripts/suite.py @@ -86,6 +86,9 @@ Standard arguments: --validate-sha1 Validate that git SHA1s passed to -S exist. [default: true] + --kdb + Enable/disable kdb in kernel + [default: true] --sleep-before-teardown Number of seconds to sleep before teardown. Use with care, as this applies to all jobs in the diff --git a/teuthology/suite/__init__.py b/teuthology/suite/__init__.py index 9bb876f2be..de4f50b59b 100644 --- a/teuthology/suite/__init__.py +++ b/teuthology/suite/__init__.py @@ -75,7 +75,7 @@ def process_args(args): value = expand_short_repo_name( value, config.get_ceph_qa_suite_git_url()) - elif key in ('validate_sha1', 'filter_fragments'): + elif key in ('validate_sha1', 'filter_fragments', 'kdb'): value = strtobool(value) conf[key] = value return conf diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py index b69b80b58e..8c51656947 100644 --- a/teuthology/suite/run.py +++ b/teuthology/suite/run.py @@ -155,9 +155,13 @@ class Run(object): branch=self.args.kernel_branch), dry_run=self.args.dry_run, ) + kdb = True + if self.args.kdb is not None: + kdb = self.args.kdb + if kernel_hash: log.info("kernel sha1: {hash}".format(hash=kernel_hash)) - kernel_dict = dict(kernel=dict(kdb=True, sha1=kernel_hash)) + kernel_dict = dict(kernel=dict(kdb=kdb, sha1=kernel_hash)) if kernel_hash != 'distro': kernel_dict['kernel']['flavor'] = 'default' else: -- 2.39.5