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 <xiubli@redhat.com>

diff --git a/scripts/suite.py b/scripts/suite.py
index 4ac7d9cac53d5f3bdbe97f73702c5633839399e5..77561b7e03c43a114f88d3b50b03a0a50392ec65 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -86,6 +86,9 @@ Standard arguments:
   --validate-sha1 <bool>
                               Validate that git SHA1s passed to -S exist.
                               [default: true]
+  --kdb <bool>
+                              Enable/disable kdb in kernel
+                              [default: true]
   --sleep-before-teardown <seconds>
                               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 9bb876f2be1a6305b21ff2f2b82f9a75690d3dd0..de4f50b59bb5be944bab4fdd8e29192314dcfe94 100644 (file)
--- 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 b69b80b58efd424222acf0addd86e65ede42e571..8c51656947bbbc47162f227400338eedec884135 100644 (file)
--- 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: