1 files changed, 58 insertions, 12 deletions
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index e34fa60f..91fd68e2 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -1,19 +1,65 @@
+##############################################################################
+# 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 validate_testcase = validate_testcase or '' %}
+{% set testcase = testcase or '' %}
+{% set deploy_scenario = deploy_scenario or 'unknown' %}
+{% set os_insecure = os_insecure or 'False' %}
+{% set os_verify = '' %}
+{% if os_insecure == 'True' %}
+    {% 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 = '/home/opnfv/functest/conf/env_file' %}
+{% set result_dir = '/home/opnfv/functest/results' %}
+{% set userconfig_dir = '/home/opnfv/userconfig' %}
+{% set patches_dir = '/home/opnfv/patches' %}
+{% set images_dir = '/home/opnfv/functest/images' %}
+
 functest:
-  image_name: opnfv/functest-restapi
-  docker_tag: euphrates
-  opts: '-id --privileged=true'
-  config:
-    dir: '/home/opnfv/userconfig'
-    images: '/home/opnfv/functest/images'
+  image_name: opnfv/functest-smoke
+  docker_tag: hunter
+  opts:
+    detach: true
+    stdin_open: true
+    privileged: true
+  shell: '/bin/bash'
+  envs:
+    - {{os_verify}}
+    - 'INSTALLER_TYPE=unknown'
+    - 'DEPLOY_SCENARIO={{deploy_scenario}}'
+    - 'NODE_NAME=unknown'
+    - 'TEST_DB_URL=file://{{result_dir}}/functest_results.txt'
+    - 'CI_DEBUG={{debug}}'
+    - 'BUILD_TAG={{build_tag}}-{{testcase}}'
+  volumes:
+    - '{{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'
   cmds:
-    - 'functest env prepare'
-    - 'functest testcase run {{validate_testcase}} -r'
+    - 'run_tests -t {{validate_testcase}} -r'
   post_condition:
     - 'echo test for postcondition in functest'
-  result:
-    dir: '/home/opnfv/functest/results'
-    file_path: 'functest_results.txt'
-  openrc: '/home/opnfv/functest/conf/openstack.creds'
+  openrc: {{openrc_file}}