summaryrefslogtreecommitdiffstats
path: root/etc/conf/functest_config.yml
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-12-20 01:49:22 -0500
committerxudan <xudan16@huawei.com>2018-12-20 21:57:03 -0500
commit78b0062ce9dc4d23b967112a0896f12cc6526e1c (patch)
tree9709b51d30bf87a1b2458f118d90cd1b2610e53c /etc/conf/functest_config.yml
parent8ab783f403984b3ef9a6c3010a9a81c0f29c4236 (diff)
Simplify project conf files
1. use copy commands instead of pre_copy 2. remove redundant items in project conf files 3. make the volume mapping clearer Change-Id: I6c6aa58fac65d7e40105e0a54f6544ee5c47db31 Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'etc/conf/functest_config.yml')
-rw-r--r--etc/conf/functest_config.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index 451b1675..a7b00e60 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -17,7 +17,8 @@
{% endif %}
{% set openrc_file = '/home/opnfv/functest/conf/env_file' %}
{% set result_dir = '/home/opnfv/functest/results' %}
-{% set config_dir = '/home/opnfv/userconfig' %}
+{% set userconfig_dir = '/home/opnfv/userconfig' %}
+{% set patches_dir = '/home/opnfv/patches' %}
{% set images_dir = '/home/opnfv/functest/images' %}
functest:
@@ -30,17 +31,16 @@ functest:
volumes:
- '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}'
- {{cacert_volume}}
- - '-v {{dovetail_home}}:{{config_dir}}'
+ - '-v {{dovetail_home}}/pre_config:/home/opnfv/pre_config'
+ - '-v {{dovetail_home}}/userconfig:{{userconfig_dir}}'
+ - '-v {{dovetail_home}}/patches:{{patches_dir}}'
- '-v {{dovetail_home}}/results:{{result_dir}}'
- '-v {{dovetail_home}}/images:{{images_dir}}'
- config:
- dir: {{config_dir}}
+ patches_dir: {{patches_dir}}
pre_condition:
- 'echo test for precondition in functest'
cmds:
- 'run_tests -t {{validate_testcase}} -r'
post_condition:
- 'echo test for postcondition in functest'
- result:
- dir: {{result_dir}}
openrc: {{openrc_file}}