diff options
| author |   xudan <xudan16@huawei.com> | 2018-12-20 01:49:22 -0500 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-12-20 21:57:03 -0500 |
| commit | 78b0062ce9dc4d23b967112a0896f12cc6526e1c (patch) | |
| tree | 9709b51d30bf87a1b2458f118d90cd1b2610e53c /etc/conf/bottlenecks_config.yml | |
| parent | 8ab783f403984b3ef9a6c3010a9a81c0f29c4236 (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/bottlenecks_config.yml')
| -rw-r--r-- | etc/conf/bottlenecks_config.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml index 5866aa3a..266fb2b6 100644 --- a/etc/conf/bottlenecks_config.yml +++ b/etc/conf/bottlenecks_config.yml @@ -12,6 +12,7 @@ {% endif %} {% set openrc_file = '/tmp/admin_rc.sh' %} {% set result_dir = '/home/opnfv/bottlenecks/results' %} +{% set images_dir = '/home/opnfv/images' %} {% set config_dir = '/home/opnfv/userconfig' %} {% set image_file = '/tmp/yardstick.img' %} @@ -27,12 +28,10 @@ bottlenecks: - '-v {{dovetail_home}}/results/bottlenecks:/tmp' - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - {{cacert_volume}} - - '-v {{dovetail_home}}:{{config_dir}}' + - '-v {{dovetail_home}}/images:{{images_dir}}' - '-v {{dovetail_home}}/results:{{result_dir}}' - config: - dir: {{config_dir}} pre_condition: - - 'cp {{config_dir}}/images/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}' + - 'cp {{images_dir}}/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}' cmds: - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} False' post_condition: @@ -40,8 +39,6 @@ bottlenecks: - 'cp /tmp/bottlenecks.log {{result_dir}}' - 'cp /tmp/bottlenecks.stress.ping.out {{result_dir}}' - 'rm {{image_file}}' - result: - dir: {{result_dir}} openrc: {{openrc_file}} extra_container: - 'Bottlenecks-Yardstick' |