Remove tests-to-run

Author: stevebux

.github/actions/acceptance-tests/action.yml

@@ -44,7 +44,30 @@ runs:
       run: |
           echo "PR_NUMBER=${{ inputs.targetEnvironment }}" >> $GITHUB_ENV
 
+    - name: "Determine if proxy has been deployed"
+      if: ${{ inputs.testType == 'e2e' }}
+      id: check_proxy_deployed
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PR_NUMBER: ${{ steps.pr_exists.outputs.pr_number }}
+      run: |
+        if [[ -z "$PR_NUMBER" ]]; then
+          echo "No pull request detected; proxy deployment was deployed."
+          echo "proxy_deployed=true" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+
+        labels=$(gh pr view "$PR_NUMBER" --json labels --jq '.labels[].name')
+        echo "Labels on PR #$PR_NUMBER: $labels"
+
+        if echo "$labels" | grep -Fxq 'deploy-proxy'; then
+          echo "proxy_deployed=true" >> $GITHUB_OUTPUT
+        else
+          echo "proxy_deployed=false" >> $GITHUB_OUTPUT
+        fi
+
     - name: Run test - ${{ inputs.testType }}
+      if: ${{ inputs.testType != 'e2e' || steps.check_proxy_deployed.outputs.proxy_deployed == 'true'}}
       shell: bash
       run: |
         make test-${{ inputs.testType }}

.github/scripts/dispatch_internal_repo_workflow.sh

@@ -117,10 +117,6 @@ while [[ $# -gt 0 ]]; do
       extraSecretNames="$2"
       shift 2
       ;;
-    --testsToRun) # JSON array of test types to run, overriding test-types.json (optional)
-      testsToRun="$2"
-      shift 2
-      ;;
     *)
     echo "[ERROR] Unknown argument: $1"
       exit 1
@@ -223,10 +219,6 @@ if [[ -z "$extraSecretNames" ]]; then
   extraSecretNames=""
 fi
 
-if [[ -z "$testsToRun" ]]; then
-  testsToRun=""
-fi
-
 echo "==================== Workflow Dispatch Parameters ===================="
 echo "  infraRepoName:      $infraRepoName"
 echo "  releaseVersion:     $releaseVersion"
@@ -266,7 +258,6 @@ DISPATCH_EVENT=$(jq -ncM \
   --arg targetDomain "$targetDomain" \
   --arg version "$version" \
   --argjson extraSecretNames "${extraSecretNames:-null}" \
-  --argjson testsToRun "${testsToRun:-null}" \
   '{
     "ref": "'"$internalRef"'",
     "inputs": (
@@ -283,7 +274,6 @@ DISPATCH_EVENT=$(jq -ncM \
       (if $targetDomain != "" then { "targetDomain": $targetDomain } else {} end) +
       (if $version != "" then { "version": $version } else {} end) +
       (if $extraSecretNames != null then { "extraSecretNames": ($extraSecretNames | tojson) } else {} end) +
-      (if $testsToRun != null then { "testsToRun": ($testsToRun | tojson) } else {} end) +
       (if $targetAccountGroup != "" then { "targetAccountGroup": $targetAccountGroup } else {} end) +
       {
         "releaseVersion": $releaseVersion,

.github/workflows/stage-4-acceptance.yaml

@@ -90,5 +90,4 @@ jobs:
             --targetEnvironment "$ENVIRONMENT" \
             --targetAccountGroup "nhs-notify-supplier-api-dev" \
             --targetComponent "api" \
-            --extraSecretNames '["INTERNAL_DEV_TEST_PEM","NON_PROD_API_KEY","STATUS_ENDPOINT_API_KEY"]' \
-            --testsToRun "$TESTS_TO_RUN"
+            --extraSecretNames '["INTERNAL_DEV_TEST_PEM","NON_PROD_API_KEY","STATUS_ENDPOINT_API_KEY"]'