From c610d6479f96b1db6d0ee9417f477495b2f98e69 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Wed, 19 Jan 2022 14:24:22 -0600
Subject: [PATCH] More debug messages in integration tests

---
 ci_tests/_tests_common.sh | 17 +++++++++++------
 helpers/helm_base.yaml    |  1 -
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ci_tests/_tests_common.sh b/ci_tests/_tests_common.sh
index 5a28468..7c36a98 100644
--- a/ci_tests/_tests_common.sh
+++ b/ci_tests/_tests_common.sh
@@ -180,13 +180,18 @@ run_mapserver_postgres_checks() {
     fi
 
     all_times=$(run_remote_curl_pod "${MAPSERVER_RELEASE_NAME}3" "http://${MAPSERVER_RELEASE_NAME}.${ns}/wms_times/g16/abi/radm1/C01?order=DESC")
-    echo "All times: ${all_times}"
-    one_time=$(run_remote_curl_pod "${MAPSERVER_RELEASE_NAME}4" "http://${MAPSERVER_RELEASE_NAME}.${ns}/wms_times/g16/abi/radm1/C01?order=ASC&num_times=1" | wc -m)
-    two_time=$(run_remote_curl_pod "${MAPSERVER_RELEASE_NAME}5" "http://${MAPSERVER_RELEASE_NAME}.${ns}/wms_times/g16/abi/radm1/C01?order=ASC&num_times=2" | wc -m)
-    debug "MapServer one time size: ${one_time}"
-    debug "MapServer two time size: ${two_time}"
+    debug "All times: ${all_times}"
+    debug "All times size: $(echo -n $all_times | wc -m)"
+    one_time=$(run_remote_curl_pod "${MAPSERVER_RELEASE_NAME}4" "http://${MAPSERVER_RELEASE_NAME}.${ns}/wms_times/g16/abi/radm1/C01?order=ASC&num_times=1")
+    two_time=$(run_remote_curl_pod "${MAPSERVER_RELEASE_NAME}5" "http://${MAPSERVER_RELEASE_NAME}.${ns}/wms_times/g16/abi/radm1/C01?order=ASC&num_times=2")
+    one_time_size=$(echo -n $one_time | wc -m)
+    two_time_size=$(echo -n $two_time | wc -m)
+    debug "Mapserver one time value: \"${one_time}\""
+    debug "Mapserver two time value: \"${two_time}\""
+    debug "MapServer one time size: ${one_time_size}"
+    debug "MapServer two time size: ${two_time_size}"
     # ["2020-12-25T15:29:25"] + newline(?)
-    if [[ ${one_time} -ne 24 ]]; then
+    if [[ ${one_time_size} -ne 24 ]]; then
         return 1
     fi
     # ["2020-12-25T15:29:25", "2020-12-25T15:30:28"]
diff --git a/helpers/helm_base.yaml b/helpers/helm_base.yaml
index bf0ca84..c82f76b 100644
--- a/helpers/helm_base.yaml
+++ b/helpers/helm_base.yaml
@@ -9,7 +9,6 @@
     - echo "export KUBECONFIG=\"$kubekorner_k3s_config\"" >> $ENV_FILE
     - echo "export HELM_EXPERIMENTAL_OCI=\"1\"" >> $ENV_FILE
     - source $ENV_FILE
-    - ls -l /google-cloud-sdk/bin/kubectl*
     - docker info
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - if [[ $CI_COMMIT_TAG =~ ^gamma-test-r[0-9]+_[0-9]+ ]]; then
-- 
GitLab