1 files changed, 43 insertions, 12 deletions

diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index 8cd5d9a6..3c4273f8 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
 ---
 
 {% set attack_host = attack_host or '' %}
@@ -7,27 +16,49 @@
 {% 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 = 'source=' + cacert + ',target=' + cacert %}
 {% endif %}
+{% set openrc_file = '/etc/yardstick/openstack.creds' %}
+{% set pod_file = '/etc/yardstick/pod.yaml' %}
+{% set result_dir = '/tmp/yardstick' %}
 
 yardstick:
   image_name: opnfv/yardstick
-  docker_tag: stable
-  opts: '-id --privileged=true'
-  envs: "{{os_verify}} -e YARDSTICK_BRANCH=fraser"
-  config:
-    dir: '/home/opnfv/userconfig'
+  docker_tag: opnfv-8.0.0
+  opts:
+    detach: true
+    stdin_open: true
+    privileged: true
+  shell: '/bin/bash'
+  envs:
+    - {{os_verify}}
+    - 'YARDSTICK_BRANCH=fraser'
+    - 'CI_DEBUG={{debug}}'
+    - 'BUILD_TAG={{build_tag}}-{{testcase}}"'
+  volumes:
+    - '{{dovetail_home}}/images:/home/opnfv/images'
+    - '{{dovetail_home}}/results:{{result_dir}}'
+  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:
-    - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds &&
+    - "cd /home/opnfv/repos/yardstick && source {{openrc_file}} &&
          yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
-         --output-file /tmp/yardstick/{{testcase}}.out
-         --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml',
+         --output-file {{result_dir}}/{{testcase}}.out
+         --task-args '{'file': '{{pod_file}}',
                        'attack_host': {{attack_host}},
                        'attack_process': {{attack_process}}}'"
   post_condition:
     - 'echo this is post_condition'
-  result:
-    dir: '/tmp/yardstick'
-  openrc: '/etc/yardstick/openstack.creds'
+  openrc: {{openrc_file}}