7 files changed, 26 insertions, 0 deletions

diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index 266fb2b6..8a0a39bc 100644
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -20,6 +20,7 @@ bottlenecks:
   image_name: opnfv/bottlenecks
   docker_tag: latest
   opts: '-id --privileged=true'
+  shell: '/bin/bash'
   envs: '-e DEPLOY_SCENARIO={{deploy_scenario}} -e Yardstick_TAG=stable
          -e OUTPUT_FILE={{testcase}}.out -e CI_DEBUG={{debug}}
          -e BUILD_TAG={{build_tag}}-{{testcase}}'
diff --git a/etc/conf/functest-k8s_config.yml b/etc/conf/functest-k8s_config.yml
index 927af1d7..b5ad12b6 100644
--- a/etc/conf/functest-k8s_config.yml
+++ b/etc/conf/functest-k8s_config.yml
@@ -13,6 +13,7 @@ functest-k8s:
   image_name: opnfv/functest-kubernetes-healthcheck
   docker_tag: gambia
   opts: '-id'
+  shell: '/bin/bash'
   envs: '-e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO=k8-deploy -e NODE_NAME=unknown
          -e TEST_DB_URL=file:///home/opnfv/functest/results/functest_results.txt
          -e CI_DEBUG={{debug}} -e BUILD_TAG={{build_tag}}-{{testcase}}'
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index a7b00e60..bf637541 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -25,6 +25,7 @@ functest:
   image_name: opnfv/functest-smoke
   docker_tag: gambia
   opts: '-id --privileged=true'
+  shell: '/bin/bash'
   envs: '{{os_verify}} -e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO={{deploy_scenario}} -e NODE_NAME=unknown
          -e TEST_DB_URL=file://{{result_dir}}/functest_results.txt
          -e CI_DEBUG={{debug}} -e BUILD_TAG={{build_tag}}-{{testcase}}'
diff --git a/etc/conf/onap-vtp_config.yml b/etc/conf/onap-vtp_config.yml
index 85944c3b..72ebeab2 100644
--- a/etc/conf/onap-vtp_config.yml
+++ b/etc/conf/onap-vtp_config.yml
@@ -11,6 +11,7 @@ onap-vtp:
   image_name: nexus3.onap.org:10001/onap/cli
   docker_tag: 2.0.5
   opts: '-td '
+  shell: '/bin/bash'
   envs: '-e OPEN_CLI_MODE=daemon -e BUILD_TAG={{build_tag}}-{{testcase}}
          -e OPEN_CLI_PRODUCT_IN_USE=onap-vtp'
   volumes:
diff --git a/etc/conf/onap-vvp_config.yml b/etc/conf/onap-vvp_config.yml
new file mode 100644
index 00000000..a7d08ea8
--- /dev/null
+++ b/etc/conf/onap-vvp_config.yml
@@ -0,0 +1,20 @@
+---
+
+{% set build_tag = build_tag or '' %}
+{% set heat_templates_dir = heat_templates_dir or '' %}
+{% set result_dir = '/reports' %}
+
+onap-vvp:
+  image_name: nexus3.onap.org:10001/onap/vvp/validation-scripts
+  docker_tag: latest
+  opts: '-td --entrypoint=""'
+  shell: '/bin/ash'
+  volumes:
+    - '-v {{heat_templates_dir}}:/template'
+    - '-v {{dovetail_home}}/results:{{result_dir}}'
+  pre_condition:
+    - 'echo this is pre_condition'
+  cmds:
+    - 'pytest --template-directory=/template --output-directory=/reports --report-format=json --continue-on-failure'
+  post_condition:
+    - 'echo this is post_condition'
diff --git a/etc/conf/vnftest_config.yml b/etc/conf/vnftest_config.yml
index 82e068b5..4104d763 100644
--- a/etc/conf/vnftest_config.yml
+++ b/etc/conf/vnftest_config.yml
@@ -3,6 +3,7 @@ vnftest:
   image_name: onap/vnfsdk/vnftest
   docker_tag: latest
   opts: '-id --privileged=true'
+  shell: '/bin/bash'
   config:
     dir: '/home/onap/userconfig'
   pre_condition:
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index 8f3db551..e43989e2 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -24,6 +24,7 @@ yardstick:
   image_name: opnfv/yardstick
   docker_tag: latest
   opts: '-id --privileged=true'
+  shell: '/bin/bash'
   envs: "{{os_verify}} -e YARDSTICK_BRANCH=fraser -e CI_DEBUG={{debug}}
          -e BUILD_TAG={{build_tag}}-{{testcase}}"
   volumes: