[COMMIT scylladb master] test: pass scylla extra CMD args from test.py args

[Commit Bot]

From: Artsiom Mishuta <artsiom...@scylladb.com>
Committer: Artsiom Mishuta <artsiom...@scylladb.com>
Branch: master

test: pass scylla extra CMD args from test.py args

this commit introduces a test.py option --extra-scylla-cmdline-options
to pass extra scylla cmdline options for all tests.

Options should be space-separated:
'--logger-log-level raft=trace --default-log-level error'

---
diff --git a/test.py b/test.py
--- a/test.py
+++ b/test.py
@@ -334,6 +334,7 @@ async def add_test(self, shortname, casename) -> None:
# Default seastar arguments, if not provided in custom test options,
# are two cores and 2G of RAM
args = self.custom_args.get(shortname, ["-c2 -m2G"])
+ args = merge_cmdline_options(args, self.options.extra_scylla_cmdline_options)
for a in args:
await self.create_test(shortname, casename, self, a)

@@ -431,7 +432,7 @@ def create_server(create_cfg: ScyllaCluster.CreateServerParams):
if type(cmdline_options) == str:
cmdline_options = [cmdline_options]
cmdline_options = merge_cmdline_options(cmdline_options, create_cfg.cmdline_from_test)
-
+ cmdline_options = merge_cmdline_options(cmdline_options, options.extra_scylla_cmdline_options)
# There are multiple sources of config options, with increasing priority
# (if two sources provide the same config option, the higher priority one wins):
# 1. the defaults
@@ -1345,6 +1346,9 @@ def parse_cmd_line() -> argparse.Namespace:
scylla_additional_options = parser.add_argument_group('Additional options for Scylla tests')
scylla_additional_options.add_argument('--x-log2-compaction-groups', action="store", default="0", type=int,
help="Controls number of compaction groups to be used by Scylla tests. Value of 3 implies 8 groups.")
+ scylla_additional_options.add_argument('--extra-scylla-cmdline-options', action="store", default=[], type=str,
+ help="Passing extra scylla cmdline options for all tests. Options should be space separated:"
+ "'--logger-log-level raft=trace --default-log-level error'")

boost_group = parser.add_argument_group('boost suite options')
boost_group.add_argument('--random-seed', action="store",
@@ -1419,6 +1423,9 @@ def prepare_dir(dirname, pattern):
print(palette.fail("Failed to read output of `ninja unit_test_list`: please run ./configure.py first"))
raise

+ if args.extra_scylla_cmdline_options:
+ args.extra_scylla_cmdline_options = args.extra_scylla_cmdline_options.split()
+
return args