From cb6952a7042bf1d12e1ca5278fb378991061b0c6 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Thu, 12 Nov 2020 16:21:17 -0600
Subject: [PATCH] More CI test fixes
---
ci_tests/cleanup_basic_grb_test.sh | 7 ++++---
ci_tests/run_basic_grb_test.sh | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ci_tests/cleanup_basic_grb_test.sh b/ci_tests/cleanup_basic_grb_test.sh
index 31dbb28..0d87fd4 100755
--- a/ci_tests/cleanup_basic_grb_test.sh
+++ b/ci_tests/cleanup_basic_grb_test.sh
@@ -10,9 +10,10 @@ error() {
}
check_and_uninstall() {
- release_name=$1
- if [[ -z ${release_name} ]]; then
+ release_name="$1"
+ if [[ -z "${release_name}" ]]; then
# the chart was never created
+ debug "Release doesn't exist"
return
fi
debug "Uninstalling ${release_name}"
@@ -20,4 +21,4 @@ check_and_uninstall() {
}
source ./ci_tests/get_release_names.sh
-check_and_uninstall ${GRB_RELEASE_NAME}
\ No newline at end of file
+check_and_uninstall "${GRB_RELEASE_NAME}"
\ No newline at end of file
diff --git a/ci_tests/run_basic_grb_test.sh b/ci_tests/run_basic_grb_test.sh
index aec9c0e..0308a2a 100755
--- a/ci_tests/run_basic_grb_test.sh
+++ b/ci_tests/run_basic_grb_test.sh
@@ -12,8 +12,9 @@ error() {
set -e
ns=$(./helpers/get_namespace.sh)
-pushd geosphere-grb/chart
source ci_tests/get_release_names.sh
+
+pushd geosphere-grb/chart
helm upgrade -v 2 --install --namespace $ns -f ../../ci_tests/values-grb-g16.yaml ${GRB_RELEASE_NAME} cspp-geo-grb/
popd
--
GitLab