Merge pull request #111 from communitiesuk/FS-3075-split-aws-pre-deploy

FS-3075 split aws pre deploy

.github/workflows/deploy.yml

@@ -11,17 +11,22 @@ on:
         - test
         - uat
       copilot:
-        description: Whether to deploy
+        description: Whether to deploy to AWS?
         type: boolean
         required: false
         default: false
+      deploy_to_dev:
+        required: false
+        default: false
+        type: boolean
+        description: Deploy to CloudFoundry dev?
   push:
     paths-ignore:
       - '**/README.md'
 
 jobs:
   test_and_deploy:
-    if: ${{ github.actor != 'dependabot[bot]' }}
+    if: ${{ github.actor != 'dependabot[bot]' && !github.event.inputs.copilot }}
     uses: communitiesuk/funding-design-service-workflows/.github/workflows/deploy.yml@main
     with:
       app_name: ${{ github.event.repository.name }}
@@ -46,9 +51,17 @@ jobs:
       version_to_build: $(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
       owner: ${{ github.repository_owner }}
       application: funding-service-design-account-store
+  pre_deploy_tests:
+    if: ${{ github.event.inputs.copilot }}
+    secrets:
+      E2E_PAT: ${{secrets.E2E_PAT}}
+    uses: communitiesuk/funding-design-service-workflows/.github/workflows/pre-deploy.yml@main
+    with:
+      db_name: fsd_account_store_test
+      postgres_unit_testing: true
   copilot_build:
     if: ${{ github.event.inputs.copilot }}
-    needs: [test_and_deploy]
+    needs: [pre_deploy_tests, paketo_build]
     concurrency: deploy-${{ inputs.environment || 'test' }}
     permissions:
       id-token: write # This is required for requesting the JWT