From 15c3a1fcc70898250adf8b6e45d71a7410403413 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Mon, 23 Nov 2020 10:03:30 -0600
Subject: [PATCH] Fix CI tests and be a little more flexible with cleanup
---
ci_tests/cleanup_basic_grb_test.sh | 16 +++++++++-------
ci_tests/run_basic_grb_test.sh | 2 ++
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ci_tests/cleanup_basic_grb_test.sh b/ci_tests/cleanup_basic_grb_test.sh
index 4078fde..8045a2d 100755
--- a/ci_tests/cleanup_basic_grb_test.sh
+++ b/ci_tests/cleanup_basic_grb_test.sh
@@ -23,10 +23,12 @@ check_and_uninstall() {
ns=$(./helpers/get_namespace.sh)
source ./ci_tests/get_release_names.sh
-check_and_uninstall "${ns}" "${GRB_RELEASE_NAME}"
-check_and_uninstall "${ns}" "${RABBITMQ_RELEASE_NAME}"
-check_and_uninstall "${ns}" "${GEO2GRID_RELEASE_NAME}"
-check_and_uninstall "${ns}" "${TILEGEN_RELEASE_NAME}"
-check_and_uninstall "${ns}" "${MAPSERVER_RELEASE_NAME}"
-check_and_uninstall "${ns}" "${MAPCACHE_RELEASE_NAME}"
-check_and_uninstall "${ns}" "${CLIENT_RELEASE_NAME}"
+EXIT_STATUS=0
+check_and_uninstall "${ns}" "${GRB_RELEASE_NAME}" || EXIT_STATUS=$?
+check_and_uninstall "${ns}" "${RABBITMQ_RELEASE_NAME}" || EXIT_STATUS=$?
+check_and_uninstall "${ns}" "${GEO2GRID_RELEASE_NAME}" || EXIT_STATUS=$?
+check_and_uninstall "${ns}" "${TILEGEN_RELEASE_NAME}" || EXIT_STATUS=$?
+check_and_uninstall "${ns}" "${MAPSERVER_RELEASE_NAME}" || EXIT_STATUS=$?
+check_and_uninstall "${ns}" "${MAPCACHE_RELEASE_NAME}" || EXIT_STATUS=$?
+check_and_uninstall "${ns}" "${CLIENT_RELEASE_NAME}" || EXIT_STATUS=$?
+exit $EXIT_STATUS
diff --git a/ci_tests/run_basic_grb_test.sh b/ci_tests/run_basic_grb_test.sh
index 3971fc7..7557548 100755
--- a/ci_tests/run_basic_grb_test.sh
+++ b/ci_tests/run_basic_grb_test.sh
@@ -70,6 +70,8 @@ sleep 30
debug "Getting GRB pod name"
GRB_POD_NAME=$(get_pod_name "${GRB_RELEASE_NAME}")
debug "GRB pod name: ${GRB_POD_NAME}"
+GEO2GRID_POD_NAME=$(get_pod_name "${GEO2GRID_RELEASE_NAME}")
+debug "Geo2Grid pod name: ${GEO2GRID_POD_NAME}"
run_grb_checks || error "GRB checks failed"
run_geo2grid_checks || error "Geo2Grid checks failed"
--
GitLab