From 372060c064540db808d60071992b2a97401fd850 Mon Sep 17 00:00:00 2001
From: Daniel Yip <daniel.yip4@nhs.net>
Date: Thu, 29 Jan 2026 17:26:42 +0000
Subject: [PATCH 1/3] Initial pipeline adjustments

---
 .../workflows/run-e2e-automation-tests.yml    | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run-e2e-automation-tests.yml b/.github/workflows/run-e2e-automation-tests.yml
index befbee27c..b1c2b583c 100644
--- a/.github/workflows/run-e2e-automation-tests.yml
+++ b/.github/workflows/run-e2e-automation-tests.yml
@@ -238,8 +238,29 @@ jobs:
           TEST_FILTER: ${{ inputs.suite_to_run == 'proxy_smoke' && 'Status_feature' || inputs.suite_to_run }}
         run: poetry run pytest "$TEST_PATH" -m "$TEST_FILTER" --junitxml=output/test-results.xml --alluredir=output/allure-results
 
+      - name: Upload e2e automation test artifact
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        with:
+          name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-e2e-test-output
+          path: tests/e2e_automation/output
+
+  upload-report:
+    permissions:
+      id-token: write
+      checks: write
+      contents: write
+    runs-on: ubuntu-latest
+    needs: [e2e-automation-tests]
+    environment: ${{ inputs.apigee_environment }}
+
+    steps:
+      - name: Download e2e automation test artifact
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+        with:
+          name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-e2e-test-output
+          path: tests/e2e_automation/output
+
       - uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637
-        if: always()
         with:
           name: BDD Test Summary
           path: "**/output/test-results.xml"
@@ -248,14 +269,14 @@ jobs:
 
       - name: Load test report history
         uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
-        if: always()
+        if: github.event_name == 'workflow_dispatch'
         continue-on-error: true
         with:
           ref: gh-pages
           path: gh-pages
 
       - name: Build Allure report
-        if: always()
+        if: github.event_name == 'workflow_dispatch'
         uses: simple-elf/allure-report-action@53ebb757a2097edc77c53ecef4d454fc2f2f774c
         with:
           allure_results: tests/e2e_automation/output/allure-results
@@ -264,7 +285,7 @@ jobs:
           allure_history: allure-history
 
       - name: Publish Allure report to GitHub Pages
-        if: always()
+        if: github.event_name == 'workflow_dispatch'
         uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -272,7 +293,7 @@ jobs:
           publish_dir: allure-history
 
       - name: Add link to Allure report
-        if: always()
+        if: github.event_name == 'workflow_dispatch'
         uses: actions/github-script@v8
         with:
           script: |

From 2139a2045d3699ee8eba9accd0840652d286184b Mon Sep 17 00:00:00 2001
From: Daniel Yip <daniel.yip4@nhs.net>
Date: Thu, 29 Jan 2026 18:02:29 +0000
Subject: [PATCH 2/3] Further pipeline adjustments

---
 .github/workflows/run-e2e-automation-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-e2e-automation-tests.yml b/.github/workflows/run-e2e-automation-tests.yml
index b1c2b583c..5b31a21f3 100644
--- a/.github/workflows/run-e2e-automation-tests.yml
+++ b/.github/workflows/run-e2e-automation-tests.yml
@@ -241,7 +241,7 @@ jobs:
       - name: Upload e2e automation test artifact
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
         with:
-          name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-e2e-test-output
+          name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-${{ env.APIGEE_ENVIRONMENT }}-e2e-test-output
           path: tests/e2e_automation/output
 
   upload-report:
@@ -254,10 +254,12 @@ jobs:
     environment: ${{ inputs.apigee_environment }}
 
     steps:
+      - uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
+
       - name: Download e2e automation test artifact
         uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
         with:
-          name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-e2e-test-output
+          name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-${{ env.APIGEE_ENVIRONMENT }}-e2e-test-output
           path: tests/e2e_automation/output
 
       - uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637

From 97614701db4b4adf71d8a177b13b2f23cfacadc0 Mon Sep 17 00:00:00 2001
From: Daniel Yip <daniel.yip4@nhs.net>
Date: Fri, 30 Jan 2026 12:20:43 +0000
Subject: [PATCH 3/3] Refinement of pipeline

---
 .github/workflows/run-e2e-automation-tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run-e2e-automation-tests.yml b/.github/workflows/run-e2e-automation-tests.yml
index 5b31a21f3..76475d60a 100644
--- a/.github/workflows/run-e2e-automation-tests.yml
+++ b/.github/workflows/run-e2e-automation-tests.yml
@@ -240,17 +240,19 @@ jobs:
 
       - name: Upload e2e automation test artifact
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        if: always()
         with:
           name: ${{ env.ENVIRONMENT }}-${{ env.SUB_ENVIRONMENT }}-${{ env.APIGEE_ENVIRONMENT }}-e2e-test-output
           path: tests/e2e_automation/output
 
-  upload-report:
+  publish-test-report:
     permissions:
       id-token: write
       checks: write
       contents: write
     runs-on: ubuntu-latest
     needs: [e2e-automation-tests]
+    if: always()
     environment: ${{ inputs.apigee_environment }}
 
     steps: