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/yardstick_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/yardstick_config.yml')
| -rw-r--r-- | etc/conf/yardstick_config.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml index 764ca94b..8f3db551 100644 --- a/etc/conf/yardstick_config.yml +++ b/etc/conf/yardstick_config.yml @@ -17,8 +17,8 @@ {% set cacert_volume = ' -v ' + cacert + ':' + cacert %} {% endif %} {% set openrc_file = '/etc/yardstick/openstack.creds' %} +{% set pod_file = '/etc/yardstick/pod.yaml' %} {% set result_dir = '/tmp/yardstick' %} -{% set config_dir = '/home/opnfv/userconfig' %} yardstick: image_name: opnfv/yardstick @@ -29,21 +29,18 @@ yardstick: volumes: - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - {{cacert_volume}} - - '-v {{dovetail_home}}:{{config_dir}}' + - '-v {{dovetail_home}}/pre_config/pod.yaml:{{pod_file}}' + - '-v {{dovetail_home}}/images:/home/opnfv/images' - '-v {{dovetail_home}}/results:{{result_dir}}' - config: - dir: {{config_dir}} pre_condition: - 'echo this is pre_condition' cmds: - "cd /home/opnfv/repos/yardstick && source {{openrc_file}} && yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml --output-file {{result_dir}}/{{testcase}}.out - --task-args '{'file': '{{config_dir}}/pre_config/pod.yaml', + --task-args '{'file': '{{pod_file}}', 'attack_host': {{attack_host}}, 'attack_process': {{attack_process}}}'" post_condition: - 'echo this is post_condition' - result: - dir: {{result_dir}} openrc: {{openrc_file}} |