From f688d83877d75a7fb0b0c099bb84497e21804e59 Mon Sep 17 00:00:00 2001
From: Lars Fronius <lars@fronius.me>
Date: Thu, 27 Sep 2018 13:06:45 +0200
Subject: [PATCH] retry application deletion and some boyscouting

---
 codeship-services.yml                              |  8 ++++----
 codeship-steps.yml                                 |  8 ++++----
 deployment/test/elastic_beanstalk/integration-test | 12 +++++-------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/codeship-services.yml b/codeship-services.yml
index 4800d52..a2262b1 100644
--- a/codeship-services.yml
+++ b/codeship-services.yml
@@ -3,7 +3,7 @@ base:
     image: codeship/aws-base
     path: ./base
     dockerfile_path: Dockerfile
-deployment_ansible:
+deployment-ansible:
   build:
     dockerfile: Dockerfile.ansible
   encrypted_env_file: aws.env.encrypted
@@ -17,17 +17,17 @@ deployment:
   encrypted_env_file: aws.env.encrypted
   volumes:
     - ./deployment:/deploy
-dockercfg_generator:
+dockercfg-generator:
   build:
     image: codeship/aws-ecr-dockercfg-generator
     path: ./dockercfg-generator
     dockerfile_path: Dockerfile
-dockercfg_test:
+dockercfg-test:
   build:
     image: 870119404647.dkr.ecr.us-east-1.amazonaws.com/codeship-testing
     path: ./dockercfg-generator
     dockerfile_path: Dockerfile.test
-dockercfg_test_generator:
+dockercfg-test-generator:
   image: codeship/aws-ecr-dockercfg-generator
   add_docker: true
   encrypted_env_file: aws.env.encrypted
diff --git a/codeship-steps.yml b/codeship-steps.yml
index 0770f51..5aadef3 100644
--- a/codeship-steps.yml
+++ b/codeship-steps.yml
@@ -3,7 +3,7 @@
   command: true
 - name: Test Deployment Ansible
   type: serial
-  service: deployment_ansible
+  service: deployment-ansible
   steps:
     - name: Check for tooling Ansible
       command: /deploy/test/test_tools_available.sh
@@ -47,11 +47,11 @@
           - name: Code Deploy
             command: /deploy/test/code_deploy/integration-test
     - name: Test dockercfg Generator
-      service: dockercfg_test
+      service: dockercfg-test
       type: push
       image_name: 870119404647.dkr.ecr.us-east-1.amazonaws.com/codeship-testing
       registry: https://870119404647.dkr.ecr.us-east-1.amazonaws.com
-      dockercfg_service: dockercfg_test_generator
+      dockercfg_service: dockercfg-test-generator
 - name: Deploy (to Docker Hub)
   type: serial
   steps:
@@ -62,7 +62,7 @@
       image_name: codeship/aws-deployment
       encrypted_dockercfg_path: dockercfg.encrypted
     - name: Push dockercfg Generator
-      service: dockercfg_generator
+      service: dockercfg-generator
       tag: master
       type: push
       image_name: codeship/aws-ecr-dockercfg-generator
diff --git a/deployment/test/elastic_beanstalk/integration-test b/deployment/test/elastic_beanstalk/integration-test
index 27c5569..ef2e153 100755
--- a/deployment/test/elastic_beanstalk/integration-test
+++ b/deployment/test/elastic_beanstalk/integration-test
@@ -11,14 +11,12 @@ function cleanup() {
     --application-name "${APPLICATION_NAME}" \
     --environment-names "${ENVIRONMENT_NAME}"
 
-  info "Terminate Elastic Beanstalk environment called ${ENVIRONMENT_NAME}"
-  aws elasticbeanstalk terminate-environment \
-    --environment-name ${ENVIRONMENT_NAME}
-
   info "Delete Elastic Beanstalk application named ${APPLICATION_NAME}"
-  aws elasticbeanstalk delete-application \
+  until aws elasticbeanstalk delete-application \
     --terminate-env-by-force \
-    --application-name ${APPLICATION_NAME}
+    --application-name "${APPLICATION_NAME}"; do
+    echo "Unable do delete elastic beanstalk application, retrying until success."
+  done
 }
 trap cleanup EXIT SIGINT SIGTERM
 
@@ -63,7 +61,7 @@ codeship_aws eb_deploy \
   "${S3_BUCKET}"
 
 info "Checking Environment if deployment matches ci commit hash"
-deployed_commit_id=`curl -s $(environment_cname)`
+deployed_commit_id=$(curl -s "$(environment_cname)")
 
 if [ "${deployed_commit_id}" == "${CI_COMMIT_ID}" ]; then
   info "Matching commit hashes ${CI_COMMIT_ID}, deployment successful"