From 88dee82da16683c7796036ae6e20a2d7c1f6b162 Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 13 Nov 2019 03:32:24 -0500 Subject: 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 --- etc/conf/bottlenecks_config.yml | 9 +++++---- etc/conf/functest-k8s_config.yml | 5 +++-- etc/conf/functest_config.yml | 9 +++++---- etc/conf/yardstick_config.yml | 11 ++++++----- 4 files changed, 19 insertions(+), 15 deletions(-) (limited to 'etc/conf') 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: diff --git a/etc/conf/functest-k8s_config.yml b/etc/conf/functest-k8s_config.yml index 52631673..a01f5715 100644 --- a/etc/conf/functest-k8s_config.yml +++ b/etc/conf/functest-k8s_config.yml @@ -33,9 +33,10 @@ functest-k8s: - 'CI_DEBUG={{debug}}' - 'BUILD_TAG={{build_tag}}-{{testcase}}' volumes: - - '{{dovetail_home}}/pre_config/k8.creds:{{openrc_file}}' - - '{{dovetail_home}}/pre_config/admin.conf:{{kube_file}}' - '{{dovetail_home}}/results/:{{result_dir}}' + mounts: + - 'source={{dovetail_home}}/pre_config/k8.creds,target={{openrc_file}}' + - 'source={{dovetail_home}}/pre_config/admin.conf,target={{kube_file}}' pre_condition: - 'echo test for precondition in functest' cmds: diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml index 06def4d4..91fd68e2 100644 --- a/etc/conf/functest_config.yml +++ b/etc/conf/functest_config.yml @@ -22,7 +22,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 = '/home/opnfv/functest/conf/env_file' %} {% set result_dir = '/home/opnfv/functest/results' %} @@ -47,13 +47,14 @@ functest: - 'CI_DEBUG={{debug}}' - 'BUILD_TAG={{build_tag}}-{{testcase}}' volumes: - - '{{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - - {{cacert_volume}} - - '{{dovetail_home}}/pre_config:/home/opnfv/pre_config' - '{{dovetail_home}}/userconfig:{{userconfig_dir}}' - '{{dovetail_home}}/patches:{{patches_dir}}' - '{{dovetail_home}}/results:{{result_dir}}' - '{{dovetail_home}}/images:{{images_dir}}' + mounts: + - 'source={{dovetail_home}}/pre_config/env_config.sh,target={{openrc_file}}' + - 'source={{dovetail_home}}/pre_config,target=/home/opnfv/pre_config' + - {{cacert_volume}} patches_dir: {{patches_dir}} pre_condition: - 'echo test for precondition in functest' 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: -- cgit 1.2.3-korg