Merge "Add extra_args for tempest image"
diff --git a/tcp_tests/fixtures/runtest_fixtures.py b/tcp_tests/fixtures/runtest_fixtures.py
index 53342ae..225b005 100644
--- a/tcp_tests/fixtures/runtest_fixtures.py
+++ b/tcp_tests/fixtures/runtest_fixtures.py
@@ -24,6 +24,7 @@
"""
tempest_threads = settings.TEMPEST_THREADS
tempest_pattern = settings.TEMPEST_PATTERN
+ tempest_extra_args = settings.TEMPEST_EXTRA_ARGS
cluster_name = settings.LAB_CONFIG_NAME
domain_name = settings.DOMAIN_NAME
runtest = RuntestManager(
@@ -31,6 +32,7 @@
underlay_actions, salt_actions,
cluster_name=cluster_name,
domain_name=domain_name,
+ tempest_extra_args=tempest_extra_args,
tempest_threads=tempest_threads,
tempest_pattern=tempest_pattern)
return runtest
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index 66095dc..bc71427 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -39,6 +39,7 @@
def __init__(self, config, underlay, salt_api, cluster_name,
domain_name, tempest_threads,
tempest_pattern=settings.TEMPEST_PATTERN,
+ tempest_extra_args=settings.TEMPEST_EXTRA_ARGS,
run_cmd=None):
self.__config = config
self.underlay = underlay
@@ -47,6 +48,7 @@
self.domain_name = domain_name
self.tempest_threads = tempest_threads
self.tempest_pattern = tempest_pattern
+ self.tempest_extra_args = tempest_extra_args
self.run_cmd = run_cmd or self.run_cmd
self.master_name = self.underlay.get_target_node_names(
self.master_host)[0]
@@ -166,21 +168,23 @@
image_nameversion = "{}:{}".format(self.image_name, self.image_version)
docker_args = (
- " -t "
- " --net host "
- " --name {container_name} "
- " -e ARGS=\"-r {tempest_pattern} -w {tempest_threads}\""
+ " -t"
+ " --net host"
+ " --name {container_name}"
+ " -e ARGS=\"-r {tempest_pattern}"
+ " -w {tempest_threads} {tempest_extra_args}\""
" -v {cfg_dir}/tempest.conf:/etc/tempest/tempest.conf"
" -v /tmp/:/tmp/"
" -v {cfg_dir}:/root/tempest"
" -v /etc/ssl/certs/:/etc/ssl/certs/"
- " -d "
+ " -d"
" {image_nameversion} {run_cmd}"
.format(
container_name=self.container_name,
image_nameversion=image_nameversion,
tempest_pattern=self.tempest_pattern,
tempest_threads=self.tempest_threads,
+ tempest_extra_args=self.tempest_extra_args,
cfg_dir=TEMPEST_CFG_DIR,
run_cmd=self.run_cmd,
))
diff --git a/tcp_tests/settings.py b/tcp_tests/settings.py
index 347e8e6..6a4a885 100644
--- a/tcp_tests/settings.py
+++ b/tcp_tests/settings.py
@@ -82,6 +82,7 @@
TEMPEST_PATTERN = os.environ.get('TEMPEST_PATTERN', 'tempest')
TEMPEST_TIMEOUT = int(os.environ.get('TEMPEST_TIMEOUT', 60 * 60 * 6))
TEMPEST_THREADS = int(os.environ.get('TEMPEST_THREADS', 2))
+TEMPEST_EXTRA_ARGS = os.environ.get('TEMPEST_EXTRA_ARGS', '')
TEMPEST_TARGET = os.environ.get('TEMPEST_TARGET', 'gtw01')
SALT_VERSION = os.environ.get('SALT_VERSION', '2017.7')