From b6870e7f4a4f9fcd166699b187e675d4e0c72cfd Mon Sep 17 00:00:00 2001
From: jinyuanliu <jayonlau@gmail.com>
Date: Tue, 2 Nov 2021 02:54:18 -0400
Subject: [PATCH] Fix helm test method about compute-kit

This patch makes the helm test command more standard by calling script of common.

Change-Id: I324c4e8ee8f8cd12bae427511747a91d8d1f8c5a
---
 .../component/compute-kit/tungsten-fabric.sh           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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