Attempt to integrate e2e with deploying the backend

Author: dlzhry2nhs

.github/workflows/continuous-deployment.yml

@@ -9,7 +9,8 @@ jobs:
   deploy_all:
     strategy:
       matrix:
-        sub_environment_name: [internal-dev, ref, int]
+        sub_environment_name:
+          [internal-dev, internal-dev-sandbox, sandbox, ref, int]
     uses: ./.github/workflows/deploy-backend.yml
     with:
       apigee_environment: ${{ matrix.sub_environment_name }}

.github/workflows/deploy-backend.yml

@@ -23,6 +23,8 @@ on:
         description: Select the Apigee proxy environment
         options:
           - internal-dev
+          - internal-dev-sandbox
+          - sandbox
           - int
           - ref
           - prod
@@ -44,6 +46,7 @@ on:
 
 env: # Sonarcloud - do not allow direct usage of untrusted data
   APIGEE_ENVIRONMENT: ${{ inputs.apigee_environment }}
+  BACKEND_REQUIRED: ${{ !(inputs.apigee_environment == 'internal-dev-sandbox' || inputs.apigee_environment == 'sandbox') }}
   ENVIRONMENT: ${{ inputs.environment }}
   SUB_ENVIRONMENT: ${{ inputs.sub_environment }}
 
@@ -53,6 +56,7 @@ permissions:
 
 jobs:
   terraform-plan:
+    if: ${{ env.BACKEND_REQUIRED == 'true' }}
     runs-on: ubuntu-latest
     environment:
       name: ${{ inputs.environment }}
@@ -86,6 +90,7 @@ jobs:
           path: terraform/tfplan
 
   terraform-apply:
+    if: ${{ env.BACKEND_REQUIRED == 'true' }}
     needs: terraform-plan
     runs-on: ubuntu-latest
     environment:
@@ -143,7 +148,9 @@ jobs:
           echo "Subscribing SQS to MNS for notifications..."
           make subscribe
 
-      # Need steps for e2e tests: VED-812
-      # Will need to wait for API and ensure proxy is deployed with same commit ID as proxy pipelines
-      # will be running and deploying at the same time in Azure
-      # may need a variable for different commands as we only run certain tests in different environments
+  run-e2e-tests:
+    uses: ./.github/workflows/run-e2e-tests.yml
+    with:
+      apigee_environment: ${{ inputs.apigee_environment }}
+      environment: ${{ inputs.environment }}
+      sub_environment: ${{ inputs.sub_environment }}

.github/workflows/pr-deploy-and-test.yml

@@ -5,10 +5,13 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
-  deploy-pr-env:
+  deploy-pr-envs:
+    strategy:
+      matrix:
+        apigee_environment_name: [internal-dev, internal-dev-sandbox]
     uses: ./.github/workflows/deploy-backend.yml
     with:
-      apigee_environment: internal-dev
+      apigee_environment: ${{ matrix.apigee_environment_name }}
       create_mns_subscription: true
       environment: dev
       sub_environment: pr-${{github.event.pull_request.number}}

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

@@ -19,6 +19,8 @@ on:
         description: Select the Apigee proxy environment
         options:
           - internal-dev
+          - internal-dev-sandbox
+          - sandbox
           - int
           - ref
           - prod
@@ -173,6 +175,7 @@ jobs:
           echo "::add-mask::$token"
           echo "APIGEE_ACCESS_TOKEN=$token" >> $GITHUB_ENV
 
+      # Consider removing - todo
       - name: Run proxy deployment e2e test suite
         working-directory: e2e
         run: poetry run python -m unittest test_deployment