From 23d362ba4c2db4112368f7062390207ff36611dc Mon Sep 17 00:00:00 2001
From: Marcello Testi <marcello.testi@sparkfabrik.com>
Date: Tue, 1 Sep 2020 15:02:06 +0200
Subject: [PATCH] refs #53: Gracefully exit lucy run when ecs-cli up fails

---
 lucy/lucy.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lucy/lucy.sh b/lucy/lucy.sh
index 1b05344..b52d579 100755
--- a/lucy/lucy.sh
+++ b/lucy/lucy.sh
@@ -84,6 +84,18 @@ else
   echo "Creating cluster/$CLUSTER_NAME"
   ecs-cli up --cluster $CLUSTER_NAME --size $INSTANCE_COUNT --capability-iam --instance-type $INSTANCE_TYPE --keypair $KEY_NAME \
     --security-group $SECURITY_GROUP --vpc $VPC_ID --subnets $SUBNET_ID --force --verbose
+  CHECKUP=$?
+  if [ ! $CHECKUP -eq 0 ]
+  then
+    echo "Cluster/instances creation command wasn't successful. See above for details."
+    FINDCLUSTER=$(aws ecs list-clusters --query "clusterArns[?ends_with(@, 'cluster/JMeter')]" --output text)
+    if [ ! -z "$FINDCLUSTER" -a -z "$RETAIN_CLUSTER" ]
+    then
+      echo "Deleting cluster/$CLUSTER_NAME"
+      ecs-cli down --cluster $CLUSTER_NAME --force
+    fi
+    exit $CHECKUP
+  fi
 fi
 
 # Step 2 - Wait for the cluster to have all container instances registered