More CI test fixes

ci_tests/cleanup_basic_grb_test.sh

@@ -10,15 +10,17 @@ error() {
 }
 
 check_and_uninstall() {
-    release_name="$1"
+    ns="$1"
+    release_name="$2"
     if [[ -z "${release_name}" ]]; then
         # the chart was never created
         debug "Release doesn't exist"
         return
     fi
     debug "Uninstalling ${release_name}"
-    helm uninstall ${release_name} | error "Could not uninstall chart $release_name"
+    helm uninstall -n "${ns}" "${release_name}" | error "Could not uninstall chart $release_name"
 }
 
+ns=$(./helpers/get_namespace.sh)
 source ./ci_tests/get_release_names.sh
-check_and_uninstall "${GRB_RELEASE_NAME}"
\ No newline at end of file
+check_and_uninstall "${ns}" "${GRB_RELEASE_NAME}"
\ No newline at end of file

ci_tests/run_basic_grb_test.sh

@@ -26,7 +26,7 @@ GRB_POD_NAME=$(kubectl -n $ns get pods --selector=app.kubernetes.io/instance=${G
 debug "GRB pod name: ${GRB_POD_NAME}"
 count=0
 while true; do
-  num_files=$(kubectl exec -n $ns ${GRB_POD_NAME} -- ls -1 /dst/products | wc -l)
+  num_files=$(kubectl exec -n $ns ${GRB_POD_NAME} -c cspp-geo-grb-notifier -- ls -1 /dst | wc -l || echo 0)
   let count=count+1
   if [[ $num_files -gt 16 ]]; then
       debug "Got at least 16 files"