summaryrefslogtreecommitdiffstats
path: root/etc/conf/bottlenecks_config.yml
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2019-11-13 03:32:24 -0500
committerDan Xu <xudan16@huawei.com>2019-11-19 10:57:03 +0000
commit88dee82da16683c7796036ae6e20a2d7c1f6b162 (patch)
treed82bb8ead2c4b8bdfe66d817e9159c90f1a6fb6a /etc/conf/bottlenecks_config.yml
parentb88e2328f7960d88aa979d01ad6ba6f06519b899 (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/bottlenecks_config.yml')
-rw-r--r--etc/conf/bottlenecks_config.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index bd5e106a..d36f9bbf 100644
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -17,7 +17,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 = '/tmp/admin_rc.sh' %}
{% set result_dir = '/home/opnfv/bottlenecks/results' %}
@@ -40,12 +40,13 @@ bottlenecks:
- 'CI_DEBUG={{debug}}'
- 'BUILD_TAG={{build_tag}}-{{testcase}}'
volumes:
- - '/var/run/docker.sock:/var/run/docker.sock'
- '{{dovetail_home}}/results/bottlenecks:/tmp'
- - '{{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}'
- - {{cacert_volume}}
- '{{dovetail_home}}/images:{{images_dir}}'
- '{{dovetail_home}}/results:{{result_dir}}'
+ mounts:
+ - 'source=/var/run/docker.sock,target=/var/run/docker.sock'
+ - 'source={{dovetail_home}}/pre_config/env_config.sh,target={{openrc_file}}'
+ - {{cacert_volume}}
pre_condition:
- 'cp {{images_dir}}/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}'
cmds: