VED-812: Only restore relevant caches. Always run batch e2e tests.

Author: mfjarvis

.github/workflows/deploy-backend.yml

@@ -137,6 +137,9 @@ jobs:
         with:
           python-version: 3.11
           cache: "poetry"
+          cache-dependency-path: |
+            lambdas/mns_subscription/poetry.lock
+            lambdas/shared/poetry.lock
 
       - name: Create MNS Subscription
         if: ${{ inputs.environment == 'dev' && inputs.create_mns_subscription }}

.github/workflows/pr-teardown.yml

@@ -56,6 +56,9 @@ jobs:
         with:
           python-version: 3.11
           cache: "poetry"
+          cache-dependency-path: |
+            lambdas/mns_subscription/poetry.lock
+            lambdas/shared/poetry.lock
 
       - name: Unsubscribe MNS
         working-directory: "./lambdas/mns_subscription"

.github/workflows/run-e2e-tests.yml

@@ -38,16 +38,17 @@ env:
   ENVIRONMENT: ${{ inputs.environment }}
   SUB_ENVIRONMENT: ${{ inputs.sub_environment }}
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   e2e-tests:
     runs-on: ubuntu-latest
     environment:
       name: ${{ inputs.environment }}
     env: # Sonarcloud - do not allow direct usage of untrusted data
       APIGEE_USERNAME: ${{ vars.APIGEE_USERNAME }}
-    permissions:
-      id-token: write
-      contents: read
     steps:
       - name: Connect to AWS
         uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838
@@ -86,6 +87,7 @@ jobs:
         with:
           python-version: 3.11
           cache: "poetry"
+          cache-dependency-path: "e2e/poetry.lock"
 
       - name: Install e2e test dependencies
         working-directory: e2e
@@ -126,12 +128,10 @@ jobs:
 
   batch-e2e-tests:
     needs: [e2e-tests]
+    if: ${{ always() }}
     runs-on: ubuntu-latest
     environment:
       name: ${{ inputs.environment }}
-    permissions:
-      id-token: write
-      contents: read
     steps:
       - name: Connect to AWS
         uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838
@@ -149,6 +149,7 @@ jobs:
         with:
           python-version: 3.11
           cache: "poetry"
+          cache-dependency-path: "e2e_batch/poetry.lock"
 
       - name: Install e2e test dependencies
         working-directory: e2e_batch