summaryrefslogtreecommitdiffstats
path: root/etc/conf/yardstick_config.yml
diff options
context:
space:
mode:
authorStamatis Katsaounis <mokats@intracom-telecom.com>2019-03-04 16:12:10 +0200
committerDan Xu <xudan16@huawei.com>2019-03-18 02:29:02 +0000
commitef2d5282306a277e591aa3c355277c6f158d8e76 (patch)
tree9f2bdf2bf77e1cfd08a058eaa696b0ed673b67fe /etc/conf/yardstick_config.yml
parent1540d41ec9291d61c1cd5b5d2f347d1d8f9c3dbe (diff)
Replace subprocess commands with Docker SDK
JIRA: DOVETAIL-752 This patch replaces all python subprocess commands with the Docker SDK relevant commands. Change-Id: Iac7caffd80a863a8a022247d735b2a7f2792e49d Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
Diffstat (limited to 'etc/conf/yardstick_config.yml')
-rw-r--r--etc/conf/yardstick_config.yml24
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: