Update test/deploy scripts

Change-Id: Ia53ec842c5b56f9cc9e42f88ceaf7b45171dd8e6
Signed-off-by: Kaspars Skels <kaspars.skels@att.com>

1 files changed, 11 insertions, 12 deletions

diff --git a/tools/test.sh b/tools/test.sh
index 256c82f..213d46a 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -34,31 +34,30 @@ fi
 
 
 help() {
-  echo "Usage: $0 <healthcheck|smoke>"
+  echo "Usage: $0 <healthcheck|smoke|vnf>"
 }
 
 
-run_healthcheck_tests() {
-  sudo docker run --env-file env \
-      -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
-      -v ${FUNCTEST_CACHE}/images:/home/opnfv/functest/images \
-      opnfv/functest-healthcheck:hunter
-}
+run_tests() {
+
+  rm -rf ${FUNCTEST_CACHE}/results && mkdir ${FUNCTEST_CACHE}/results
 
-run_smoke_tests() {
   sudo docker run --env-file env \
       -v $(pwd)/openstack.creds:/home/opnfv/functest/conf/env_file \
       -v ${FUNCTEST_CACHE}/images:/home/opnfv/functest/images \
-      opnfv/functest-smoke:hunter
+      -v ${FUNCTEST_CACHE}/results:/home/opnfv/functest/results \
+      opnfv/functest-${1}:hunter
 }
 
-
 case "$1" in
 'healthcheck')
-  run_healthcheck_tests
+  run_tests $1
   ;;
 'smoke')
-  run_smoke_tests
+  run_tests $1
+  ;;
+'vnf')
+  run_tests $1
   ;;
 *) help
    exit 1