summaryrefslogtreecommitdiffstats
path: root/scripts/conf
diff options
context:
space:
mode:
authorxudan2189 <xudanstudy@gmail.com>2016-09-21 04:40:44 -0400
committerxudan <xudan16@huawei.com>2016-09-23 03:25:07 -0400
commitc554b6951f8ee8298d3f8ae8f53ba468dbf4c164 (patch)
tree1c00e69f31fcd3b04d88073700eddf1f1d620b06 /scripts/conf
parentd8ee3fd2cb9e221466e49703a25e9b7e1343be62 (diff)
Move copyfile to container and remove hard-code
JIRA: DOVETAIL-17 Change-Id: Id4ad126169cf83c6c72a7b599f3309f0f930e461 Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'scripts/conf')
-rw-r--r--scripts/conf/dovetail_config.py4
-rw-r--r--scripts/conf/yardstick_config.yml5
2 files changed, 4 insertions, 5 deletions
diff --git a/scripts/conf/dovetail_config.py b/scripts/conf/dovetail_config.py
index 8d60cd97..92d1f479 100644
--- a/scripts/conf/dovetail_config.py
+++ b/scripts/conf/dovetail_config.py
@@ -26,7 +26,3 @@ container_config = {}
container_config['functest'] = dovetail_config['functest']
container_config['yardstick'] = dovetail_config['yardstick']
-
-container_config['functest']['has_pull'] = False
-container_config['yardstick']['has_pull'] = False
-container_config['yardstick']['has_build_images'] = False
diff --git a/scripts/conf/yardstick_config.yml b/scripts/conf/yardstick_config.yml
index 5c04a286..9eda6e54 100644
--- a/scripts/conf/yardstick_config.yml
+++ b/scripts/conf/yardstick_config.yml
@@ -9,9 +9,12 @@ yardstick:
result_dir: '/tmp/yardstick/result'
shell_dir: '/tmp/yardstick'
shell_dir_name: 'prepare_test_yard'
+ testcase:
+ build_test_cmd: '/tmp/yardstick/build_run_test.sh %s.yaml /tmp/yardstick/result/%s.out'
+ test_cmd: '/tmp/yardstick/run_test.sh %s.yaml /tmp/yardstick/result/%s.out'
result:
dir: '/tmp/yardstick/result'
store_type: 'file'
db_url: 'http://testresults.opnfv.org/test/api/v1/results?case=%s&last=1'
- file_path: '/tmp/yardstick/result/yardstick.log'
+ file_path: '/home/opnfv/dovetail/results/yardstick.log'