From 0868c35dc4ab6a678081a8ab36d6a4747899564e Mon Sep 17 00:00:00 2001
From: Seth Zegelstein <szegel@amazon.com>
Date: Thu, 16 May 2024 22:15:28 +0000
Subject: [PATCH] .ci/aws: Always make kill_all_clusters succeed

Signed-off-by: Seth Zegelstein <szegel@amazon.com>
---
 .ci/aws/common.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.ci/aws/common.groovy b/.ci/aws/common.groovy
index 7bcc4a552..0155d8054 100644
--- a/.ci/aws/common.groovy
+++ b/.ci/aws/common.groovy
@@ -47,7 +47,8 @@ def kill_all_clusters(instance_type, region) {
         script: "echo ${instance_type} | tr -d '.\\n'",
         returnStdout: true
     )
-    sh ". venv/bin/activate; ./PortaFiducia/scripts/delete_manual_cluster.py --cluster-name \'*${instance_type_without_period}*\' --region ${region}"
+    sh "ps -p \$\$"
+    sh ". venv/bin/activate; ./PortaFiducia/scripts/delete_manual_cluster.py --cluster-name \'*${instance_type_without_period}*\' --region ${region} || true"
 }