From a937c80fdaacbb49e5afe888a29d73b2696942a0 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Mon, 23 Nov 2020 11:13:39 -0600
Subject: [PATCH] Fix CI test geo2grid deploy not including release prefix
---
helpers/deploy_geo2grid.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/helpers/deploy_geo2grid.sh b/helpers/deploy_geo2grid.sh
index d3a74ad..6b1f36e 100755
--- a/helpers/deploy_geo2grid.sh
+++ b/helpers/deploy_geo2grid.sh
@@ -3,18 +3,26 @@
set -e
if [ $# -ne 2 ]; then
- echo "Usage: ./helpers/deploy_geo2grid.sh <values_base_dir> <deploy_suffix>"
+ echo "Usage: ./helpers/deploy_geo2grid.sh <values_base_dir> [<release_prefix>] <release_suffix>"
exit 1
fi
# ci_geosphere-test
values_base="$1"
-# Example: -g16-radf
-deploy_suffix="$2"
+
+# Prefix Example: testing-YYYYMMDD-
+# Suffix Example: -g16-radf
+if [[ $# -eq 2 ]]; then
+ release_prefix=""
+ release_suffix="$2"
+else
+ release_prefix="$2"
+ release_suffix="$3"
+fi
ns=$(./helpers/get_namespace.sh)
cd geosphere-geo2grid/chart
source cspp-geo-geo2grid/cibuild.env
echo "Deploying version $docker_tag to cluster namespace $ns"
# namespace names are the same as domain names
-helm upgrade -v 2 --install --namespace $ns -f ../../${values_base}/values-geo2grid${deploy_suffix}.yaml cspp-geo-geo2grid${deploy_suffix} cspp-geo-geo2grid/
+helm upgrade -v 2 --install --namespace $ns -f ../../${values_base}/values-geo2grid${release_suffix}.yaml "${release_prefix}cspp-geo-geo2grid${release_suffix}" cspp-geo-geo2grid/
--
GitLab