diff options
| author |   xudan <xudan16@huawei.com> | 2019-11-13 03:32:24 -0500 |
|---|---|---|
| committer | Dan Xu <xudan16@huawei.com> | 2019-11-19 10:57:03 +0000 |
| commit | 88dee82da16683c7796036ae6e20a2d7c1f6b162 (patch) | |
| tree | d82bb8ead2c4b8bdfe66d817e9159c90f1a6fb6a /etc/conf/yardstick_config.yml | |
| parent | b88e2328f7960d88aa979d01ad6ba6f06519b899 (diff) | |
Fix exception when running HA tests without pod.yaml
1. use volumes '-v' to map files/directories which may be non-existing
2. use mounts '--mount' to map files/directories which couldn't be non-existing
JIRA: DOVETAIL-789
Change-Id: I2184e5baed3d1491a2df4d3a1a77a11e3e9b4fc8
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, 6 insertions, 5 deletions
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml index e4758c8e..21716f8f 100644 --- a/etc/conf/yardstick_config.yml +++ b/etc/conf/yardstick_config.yml @@ -23,7 +23,7 @@ {% set build_tag = build_tag or '' %} {% set cacert_volume = '' %} {% if cacert %} - {% set cacert_volume = cacert + ':' + cacert %} + {% set cacert_volume = 'source=' + cacert + ',target=' + cacert %} {% endif %} {% set openrc_file = '/etc/yardstick/openstack.creds' %} {% set pod_file = '/etc/yardstick/pod.yaml' %} @@ -43,12 +43,13 @@ yardstick: - 'CI_DEBUG={{debug}}' - 'BUILD_TAG={{build_tag}}-{{testcase}}"' volumes: - - '{{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - - {{cacert_volume}} - - '{{dovetail_home}}/pre_config/pod.yaml:{{pod_file}}' - '{{dovetail_home}}/images:/home/opnfv/images' - '{{dovetail_home}}/results:{{result_dir}}' - - '{{dovetail_home}}/pre_config:{{dovetail_home}}/pre_config' + mounts: + - 'source={{dovetail_home}}/pre_config,target={{dovetail_home}}/pre_config' + - 'source={{dovetail_home}}/pre_config/env_config.sh,target={{openrc_file}}' + - 'source={{dovetail_home}}/pre_config/pod.yaml,target={{pod_file}}' + - {{cacert_volume}} pre_condition: - 'echo this is pre_condition' cmds: |