Update drone.yml and deploy.sh (#129)

* Add missing deploys to delete
* Alter get pr branch command to be more like other new repos

Author: jamiecarterHO

.drone.yml

@@ -270,7 +270,7 @@ steps:
       - name: dockersock
         path: /root/.dockersock
     commands:
-      - drone build info $GIT_REPO $DRONE_BUILD_NUMBER --format {{.Message}} | grep -o '[^ ]\+$' -m1 | sed 's|UKHomeOffice/||g' | tr '[:upper:]' '[:lower:]' | tr '/' '-' > /root/.dockersock/branch_name.txt
+      - drone build info $GIT_REPO $DRONE_BUILD_NUMBER --format {{.Message}} | grep -o " '.*' " | tr -d "[ ']" | tr '[:upper:]' '[:lower:]' | tr '/' '-' > /root/.dockersock/branch_name.txt
     when:
       branch: master
       event: push
@@ -289,7 +289,7 @@ steps:
       - name: dockersock
         path: /root/.dockersock
     commands:
-      - sh bin/deploy.sh tear_down
+      - bin/deploy.sh tear_down
     when:
       branch: master
       event: push

bin/deploy.sh

@@ -14,7 +14,7 @@ if [[ $1 == 'tear_down' ]]; then
   export KUBE_NAMESPACE=$BRANCH_ENV
   export DRONE_SOURCE_BRANCH=$(cat /root/.dockersock/branch_name.txt)
   $kd --delete -f kube/configmaps/configmap.yml
-  $kd --delete -f kube/redis -f kube/app -f kube/ims-resolver
+  $kd --delete -f kube/redis -f kube/app -f kube/ims-resolver -f kube/file-vault
   # echo "Torn Down UAT Branch - paf-$DRONE_SOURCE_BRANCH.internal.$BRANCH_ENV.homeoffice.gov.uk"
   echo "Torn Down Branch - paf-${DRONE_SOURCE_BRANCH}.internal.${BRANCH_ENV}.homeoffice.gov.uk"
   exit 0