From aac06e1c3e03471dd30f75a06142c6e8e4acd3e3 Mon Sep 17 00:00:00 2001 From: Francisco Videira Date: Tue, 5 May 2026 15:28:59 +0000 Subject: [PATCH 1/3] test pr proxy e2e tests --- .github/workflows/deploy-dynamic-env-proxy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-dynamic-env-proxy.yaml b/.github/workflows/deploy-dynamic-env-proxy.yaml index 5c4607ae0..7a4313ad1 100644 --- a/.github/workflows/deploy-dynamic-env-proxy.yaml +++ b/.github/workflows/deploy-dynamic-env-proxy.yaml @@ -1,3 +1,4 @@ +# Test name: Deploy dynamic PR environment proxy run-name: Deploy proxy for PR environment on internal-dev by @${{ github.actor }} From 9882e8dac612a55d747f9e48021416f1b9d8944b Mon Sep 17 00:00:00 2001 From: Francisco Videira Date: Wed, 6 May 2026 17:05:35 +0000 Subject: [PATCH 2/3] point to internal branch workflow --- .github/workflows/stage-4-acceptance.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stage-4-acceptance.yaml b/.github/workflows/stage-4-acceptance.yaml index bc49ebbf0..cef7bbfac 100644 --- a/.github/workflows/stage-4-acceptance.yaml +++ b/.github/workflows/stage-4-acceptance.yaml @@ -81,4 +81,5 @@ jobs: --targetEnvironment "$ENVIRONMENT" \ --targetAccountGroup "nhs-notify-supplier-api-dev" \ --targetComponent "api" \ - --extraSecretNames '["/dev/e2e/keys/apim/main","/dev/e2e/keys/apim/pr","/dev/e2e/keys/apim/status","/dev/e2e/keys/private"]' + --extraSecretNames '["/dev/e2e/keys/apim/main","/dev/e2e/keys/apim/pr","/dev/e2e/keys/apim/status","/dev/e2e/keys/private"]' \ + --internalRef "feature/CCM-17012" # TO BE REMOVED - used to trigger workflow until internal branch merges From b26685522ba5eee2e492eed9b0186ba1fb1d97fa Mon Sep 17 00:00:00 2001 From: Francisco Videira Date: Wed, 6 May 2026 17:52:54 +0000 Subject: [PATCH 3/3] actually point to internal branch workflow for build proxies and run e2e on pr too --- .github/actions/acceptance-tests/action.yml | 4 ++-- .github/actions/build-proxies/action.yml | 3 ++- .github/workflows/stage-4-acceptance.yaml | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/acceptance-tests/action.yml b/.github/actions/acceptance-tests/action.yml index dcf3ddb29..0ac177dab 100644 --- a/.github/actions/acceptance-tests/action.yml +++ b/.github/actions/acceptance-tests/action.yml @@ -25,7 +25,7 @@ runs: steps: - name: Run component tests - if: ${{ inputs.testType != 'e2e' }} + if: ${{ inputs.testType == 'component' }} uses: ./.github/actions/acceptance-tests-component with: testType: ${{ inputs.testType }} @@ -33,7 +33,7 @@ runs: targetComponent: ${{ inputs.targetComponent }} - name: Run e2e tests - if: ${{ inputs.testType == 'e2e' && inputs.targetEnvironment == 'main' }} + if: ${{ inputs.testType == 'e2e' }} uses: ./.github/actions/acceptance-tests-e2e with: targetEnvironment: ${{ inputs.targetEnvironment }} diff --git a/.github/actions/build-proxies/action.yml b/.github/actions/build-proxies/action.yml index 728edf4bc..23c5005c3 100644 --- a/.github/actions/build-proxies/action.yml +++ b/.github/actions/build-proxies/action.yml @@ -118,4 +118,5 @@ runs: --apimEnvironment "${{ env.APIM_ENV }}" \ --boundedContext "notify-supplier" \ --targetDomain "$TARGET_DOMAIN" \ - --version "${{ inputs.version }}" + --version "${{ inputs.version }}" \ + --internalRef "feature/CCM-17012" # TO BE REMOVED - used to trigger workflow until internal branch merges diff --git a/.github/workflows/stage-4-acceptance.yaml b/.github/workflows/stage-4-acceptance.yaml index cef7bbfac..bc49ebbf0 100644 --- a/.github/workflows/stage-4-acceptance.yaml +++ b/.github/workflows/stage-4-acceptance.yaml @@ -81,5 +81,4 @@ jobs: --targetEnvironment "$ENVIRONMENT" \ --targetAccountGroup "nhs-notify-supplier-api-dev" \ --targetComponent "api" \ - --extraSecretNames '["/dev/e2e/keys/apim/main","/dev/e2e/keys/apim/pr","/dev/e2e/keys/apim/status","/dev/e2e/keys/private"]' \ - --internalRef "feature/CCM-17012" # TO BE REMOVED - used to trigger workflow until internal branch merges + --extraSecretNames '["/dev/e2e/keys/apim/main","/dev/e2e/keys/apim/pr","/dev/e2e/keys/apim/status","/dev/e2e/keys/private"]'