diff --git a/ci_tests/_tests_common.sh b/ci_tests/_tests_common.sh index 5a28468cf9c06804f5aa529f92abd72723d5210d..7c36a9839635440dcf33c0674839601baeeb44d0 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 bf0ca849f269e1a41d54fbec13dc8f48958102d6..c82f76baeb4df56f9a71e2c2bc16220959724822 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