try out dumping

Author: nammn

main.go

@@ -191,8 +191,7 @@ func main() {
 
 		if tp != nil {
 			// Give enough time for the root span to be exported
-			log.Info("Waiting for root span to be exported...")
-			time.Sleep(5 * time.Second)
+			log.Info("exporting spans...")
 
 			// Force a flush of any pending spans
 			shutdownCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second)

scripts/evergreen/e2e/e2e.sh

@@ -46,14 +46,6 @@ dump_cluster_information() {
   fi
 }
 
-cleanup_operator() {
-  local context="${1}"
-  local namespace="${2}"
-  if ! timeout 5s helm uninstall --wait --kube-context="${context}" -n ${namespace} mongodb-kubernetes-operator; then
-    echo "Warning: Helm uninstall failed or timed out. Continuing anyway."
-  fi
-}
-
 cleanup_openshift_cluster(){
   if [[ "${TEST_RESULTS}" -ne 0 ]]; then
     # Mark namespace as failed to be cleaned later
@@ -154,19 +146,19 @@ else
   timeout --foreground "${timeout_sec}" scripts/evergreen/e2e/single_e2e.sh || TEST_RESULTS=$?
 fi
 
-dump_cluster_information
-
 # We only have static clusters in OpenShift; otherwise, there's no need to mark and clean them up here.
 if [[ "${CLUSTER_TYPE}" == "openshift" ]]; then
+  dump_cluster_information
   cleanup_openshift_cluster
 else
   if [[ "${KUBE_ENVIRONMENT_NAME}" == "multi" ]]; then
     echo "Tearing down operator on ${CENTRAL_CLUSTER}"
-    cleanup_operator "${CENTRAL_CLUSTER}" "${NAMESPACE}"
+    delete_operator "${NAMESPACE}"
   else
     # If the test passed, then the namespace is removed
-    cleanup_operator "$(kubectl config current-context)" "${NAMESPACE}"
+    delete_operator "${NAMESPACE}"
   fi
+  dump_cluster_information
 fi
 
 

scripts/funcs/kubernetes

@@ -42,11 +42,10 @@ EOF
 
 delete_operator() {
     local ns="$1"
-    local name=${OPERATOR_NAME:=mongodb-enterprise-operator}
+    local name=${OPERATOR_NAME:=mongodb-kubernetes-operator}
 
     title "Removing the Operator deployment ${name}"
-    ! kubectl --namespace "${ns}" get deployments | grep -q "${name}" \
-        || kubectl delete deployment "${name}" -n "${ns}" || true
+    kubectl delete deployment "${name}" -n "${ns}" --wait=true --timeout=10|| true
 }
 
 # wait_for_operator waits for the Operator to start