diff options
Diffstat (limited to 'etc/conf/yardstick_config.yml')
| -rw-r--r-- | etc/conf/yardstick_config.yml | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml index e43989e2..610cbfd8 100644 --- a/etc/conf/yardstick_config.yml +++ b/etc/conf/yardstick_config.yml @@ -7,14 +7,14 @@ {% set os_insecure = os_insecure or 'False' %} {% set os_verify = '' %} {% if os_insecure == 'True' %} - {% set os_verify = ' -e OS_VERIFY= ' %} + {% set os_verify = 'OS_VERIFY=' %} {% endif %} {% set dovetail_home = dovetail_home or '' %} {% set debug = debug or 'false' %} {% set build_tag = build_tag or '' %} {% set cacert_volume = '' %} {% if cacert %} - {% set cacert_volume = ' -v ' + cacert + ':' + cacert %} + {% set cacert_volume = cacert + ':' + cacert %} {% endif %} {% set openrc_file = '/etc/yardstick/openstack.creds' %} {% set pod_file = '/etc/yardstick/pod.yaml' %} @@ -23,16 +23,22 @@ yardstick: image_name: opnfv/yardstick docker_tag: latest - opts: '-id --privileged=true' + opts: + detach: true + stdin_open: true + privileged: true shell: '/bin/bash' - envs: "{{os_verify}} -e YARDSTICK_BRANCH=fraser -e CI_DEBUG={{debug}} - -e BUILD_TAG={{build_tag}}-{{testcase}}" + envs: + - {{os_verify}} + - 'YARDSTICK_BRANCH=fraser' + - 'CI_DEBUG={{debug}}' + - 'BUILD_TAG={{build_tag}}-{{testcase}}"' volumes: - - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' + - '{{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - {{cacert_volume}} - - '-v {{dovetail_home}}/pre_config/pod.yaml:{{pod_file}}' - - '-v {{dovetail_home}}/images:/home/opnfv/images' - - '-v {{dovetail_home}}/results:{{result_dir}}' + - '{{dovetail_home}}/pre_config/pod.yaml:{{pod_file}}' + - '{{dovetail_home}}/images:/home/opnfv/images' + - '{{dovetail_home}}/results:{{result_dir}}' pre_condition: - 'echo this is pre_condition' cmds: |