re-add delete at end of ci-e2e

Author: willie-yao

e2e.mk

@@ -22,11 +22,11 @@ test-e2e-run: generate-e2e-templates install-tools create-bootstrap ## Run e2e t
 
 .PHONY: test-e2e-run-cleanup
 test-e2e-run-cleanup: ## Run e2e cleanup tasks.
-	$(MAKE) cleanup-workload-identity
-	$(MAKE) clean-release-git
+	$(MAKE) cleanup-workload-identity || true
+	$(MAKE) clean-release-git || true
 	if [ "$(MGMT_CLUSTER_TYPE)" == "aks" ] && [ "$(SKIP_CLEANUP)" != "true" ]; then \
 		echo "Cleaning up AKS management cluster..."; \
-		$(MAKE) aks-delete; \
+		$(MAKE) aks-delete || true; \
 	fi
 
 .PHONY: test-e2e

scripts/ci-conformance.sh

@@ -88,6 +88,12 @@ capz::util::generate_ssh_key
 
 capz::ci-conformance::cleanup() {
     "${REPO_ROOT}/hack/log/redact.sh" || true
+    make cleanup-workload-identity || true
+    make clean-release-git || true
+    if [ "$(MGMT_CLUSTER_TYPE)" == "aks" ] && [ "$(SKIP_CLEANUP)" != "true" ]; then
+      echo "Cleaning up AKS management cluster..."
+      make aks-delete || true
+    fi
 }
 
 trap capz::ci-conformance::cleanup EXIT

scripts/ci-e2e.sh

@@ -76,6 +76,12 @@ capz::util::generate_ssh_key
 
 capz::ci-e2e::cleanup() {
     "${REPO_ROOT}/hack/log/redact.sh" || true
+    make cleanup-workload-identity || true
+    make clean-release-git || true
+    if [ "$(MGMT_CLUSTER_TYPE)" == "aks" ] && [ "$(SKIP_CLEANUP)" != "true" ]; then
+      echo "Cleaning up AKS management cluster..."
+      make aks-delete || true
+    fi
 }
 
 trap capz::ci-e2e::cleanup EXIT