summaryrefslogtreecommitdiffstats
path: root/dovetail/test_runner.py
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-04-07 23:42:50 -0400
committerGeorg Kunz <georg.kunz@ericsson.com>2018-04-10 10:21:21 +0000
commitd596c9988d82cb6876b0acd12e79a89319bdbd0b (patch)
tree8cb05f39c1e447dddb383d272d2a83af944127af /dovetail/test_runner.py
parent8b0d80d556dfd7935b6464ec76b49c9c0e6249e0 (diff)
Decoupling Yardstick Docker config items from source code
There are some special Docker setting items when creating Yardstick Docker Containers. 1. Remove the extra settings which are required by Yardstick Danube. 2. Remove the settings for pushing results to DB because Dovetail plan to disable this function. 3. Move the other special Functest settings to config files. JIRA: DOVETAIL-640 Change-Id: Ic2d90393e227d7886b14d805eaa307b7aef56e4a Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/test_runner.py')
-rw-r--r--dovetail/test_runner.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py
index b059047f..fbc33b6f 100644
--- a/dovetail/test_runner.py
+++ b/dovetail/test_runner.py
@@ -47,7 +47,7 @@ class DockerRunner(object):
file_path = dt_cfg.dovetail_config[self.type]['config']['dir']
src_path = os.path.join(file_path, 'pre_config', exist_file)
- Container.pre_copy(container_id, src_path, dest_path)
+ Container.copy_file(container_id, src_path, dest_path)
return dest_path
def run(self):
@@ -166,6 +166,7 @@ class YardstickRunner(DockerRunner):
config_item = {}
config_item['validate_testcase'] = testcase.validate_testcase()
config_item['testcase'] = testcase.name()
+ config_item['os_insecure'] = os.getenv("OS_INSECURE")
return config_item
def _update_yardstick_config(self, testcase):