Always display make output

Author: dominicplatt2-nhs

Makefile

@@ -41,6 +41,5 @@ endif
 ansible: guard-cmd
 	@account=$(account) poetry run make --no-print-directory -C ansible $(cmd)
 
-
 remove-stale-locks:
 	@poetry run python ./scripts/terraform_force_unlock.py

azure/components/cleanup-ecs-pr-proxies-job.yml

@@ -11,22 +11,20 @@ steps:
       - bash: |
           make remove-stale-locks
           export retain_hours=72
-          ANSIBLE_FORCE_COLOR=yes make -C ansible remove-old-ecs-pr-deploys > /tmp/err.txt
+          ANSIBLE_FORCE_COLOR=yes make -C ansible remove-old-ecs-pr-deploys | tee /tmp/output.txt
           ERROR_CODE=$?
           ROLE_TIMEOUT_MSG="The AWS assume role session token is due to expire"
-          if grep -q "$ROLE_TIMEOUT_MSG" /tmp/err.txt ; then
+          if grep -q "$ROLE_TIMEOUT_MSG" /tmp/output.txt ; then
             echo "stderr for ansible has the error \"$ROLE_TIMEOUT_MSG\""
             echo "Re-assuming role and re-running step"
             echo "##vso[task.setvariable variable=has_aws_role_timedout;]true"
 
           elif [ $ERROR_CODE -ne 0 ] ; then 
-            echo "ansible has unhandled error, re-raising"
-            >&2 cat /tmp/err.txt
+            echo "\n\nansible has unhandled error, re-raising"
             exit -1
           else
             echo "##vso[task.setvariable variable=has_aws_role_timedout;]false"
           fi
-          cat /tmp/err.txt
 
         displayName: "cleanup older pr deploys"
         condition: or(eq( ${{ parameters.retry }}, '0'), eq(variables['has_aws_role_timedout'], 'true'))

scripts/terraform_force_unlock.py

@@ -3,6 +3,9 @@
 
 Warning this script should be used with care.
 
+This script has to be used because sometimes the ecs pr pipeline cleanup won't always properly release the lock when
+it fails.
+
 CLI arguments:
     --min-age-hr
     --key-prefix