From 7b3f420ede5d9d2e72c3b9a8352c0a33af265656 Mon Sep 17 00:00:00 2001
From: jinyuanliu <jayonlau@gmail.com>
Date: Tue, 2 Nov 2021 02:46:53 -0400
Subject: [PATCH] Fix helm test method

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

Change-Id: I90397f437595016a5f7fb0ff9388319101027b5c
---
 tools/deployment/component/barbican/barbican.sh   | 6 +++++-
 tools/deployment/developer/common/085-barbican.sh | 8 +++++---
 tools/deployment/developer/common/100-horizon.sh  | 8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tools/deployment/component/barbican/barbican.sh b/tools/deployment/component/barbican/barbican.sh
index f6fe87707f..20cb66f11e 100755
--- a/tools/deployment/component/barbican/barbican.sh
+++ b/tools/deployment/component/barbican/barbican.sh
@@ -16,6 +16,7 @@ set -xe
 
 #NOTE: Get the over-rides to use
 : ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(./tools/deployment/common/get-values-overrides.sh barbican)"}
+: ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Lint and package chart
 make barbican
@@ -29,4 +30,7 @@ helm upgrade --install barbican ./barbican \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-helm test barbican
+# Run helm test
+if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
+    ./tools/deployment/common/run-helm-tests.sh barbican
+fi
diff --git a/tools/deployment/developer/common/085-barbican.sh b/tools/deployment/developer/common/085-barbican.sh
index 0ee96b88f9..115539630f 100755
--- a/tools/deployment/developer/common/085-barbican.sh
+++ b/tools/deployment/developer/common/085-barbican.sh
@@ -16,6 +16,7 @@ set -xe
 
 #NOTE: Get the over-rides to use
 : ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(./tools/deployment/common/get-values-overrides.sh barbican)"}
+: ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Lint and package chart
 make barbican
@@ -29,6 +30,7 @@ helm upgrade --install barbican ./barbican \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-# Delete the test pod if it still exists
-kubectl delete pods -l application=barbican,release_group=barbican,component=test --namespace=openstack --ignore-not-found
-helm test barbican
+# Run helm tests
+if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
+    ./tools/deployment/common/run-helm-tests.sh barbican
+fi
diff --git a/tools/deployment/developer/common/100-horizon.sh b/tools/deployment/developer/common/100-horizon.sh
index 836434c712..3ee2b9c624 100755
--- a/tools/deployment/developer/common/100-horizon.sh
+++ b/tools/deployment/developer/common/100-horizon.sh
@@ -16,6 +16,7 @@ set -xe
 
 #NOTE: Get the over-rides to use
 : ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(./tools/deployment/common/get-values-overrides.sh horizon)"}
+: ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Lint and package chart
 make horizon
@@ -32,6 +33,7 @@ helm upgrade --install horizon ./horizon \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-# Delete the test pod if it still exists
-kubectl delete pods -l application=horizon,release_group=horizon,component=test --namespace=openstack --ignore-not-found
-helm test horizon
+# Run helm tests
+if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
+    ./tools/deployment/common/run-helm-tests.sh horizon
+fi