diff --git a/tools/deployment/component/compute-kit/tungsten-fabric.sh b/tools/deployment/component/compute-kit/tungsten-fabric.sh index 75594f9b64..719cf75d7f 100755 --- a/tools/deployment/component/compute-kit/tungsten-fabric.sh +++ b/tools/deployment/component/compute-kit/tungsten-fabric.sh @@ -15,6 +15,7 @@ set -xe stages="prepare deploy checkdns setupdns" OSH_INFRA_PATH=${OSH_INFRA_PATH:="../openstack-helm-infra"} +: ${RUN_HELM_TESTS:="yes"} function get_node_ip() { local phys_int=$(ip route get 1 | grep -o 'dev.*' | awk '{print($2)}') @@ -227,11 +228,10 @@ EOF # run couple of openstack commands and nova tests openstack compute service list openstack hypervisor list - if [ "x${RUN_HELM_TESTS}" == "xno" ]; then - exit 0 + if [ "x${RUN_HELM_TESTS}" != "xno" ]; then + ./tools/deployment/common/run-helm-tests.sh nova + ./tools/deployment/common/run-helm-tests.sh neutron fi - helm test nova --timeout 900 - helm test neutron --timeout 900 } if [[ $# == 0 ]] ; then @@ -246,4 +246,4 @@ if [[ ! $stages =~ .*${1}.* ]] ; then exit 1 fi -${1}_tf \ No newline at end of file +${1}_tf