Merge "[Functest] Exclude vnf tests for virtual deployments"

diff --combined jjb/functest/functest-alpine.sh
index d15b985,8caf19e..35311c3
--- 1/jjb/functest/functest-alpine.sh
--- 2/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -71,7 -71,11 +71,11 @@@ set +
  if [ ${FUNCTEST_SUITE_NAME} == 'healthcheck' ]; then
      tiers=(healthcheck)
  else
-     tiers=(healthcheck smoke features vnf)
+     if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
+         tiers=(healthcheck smoke features vnf)
+     else
+         tiers=(healthcheck smoke features)
+     fi
  fi
  
  cmd_opt='prepare_env start && run_tests -r -t all'
@@@ -80,7 -84,7 +84,7 @@@ for tier in ${tiers[@]}; d
      FUNCTEST_IMAGE=opnfv/functest-${tier}
      echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
      docker pull ${FUNCTEST_IMAGE}>/dev/null
 -    cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
 +    cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
      echo "Running Functest tier '${tier}'. CMD: ${cmd}"
      eval ${cmd}
  done