From ec0645de41a85eaf3963e2e0b5a229e33fd5d94f Mon Sep 17 00:00:00 2001
From: Charlie McBride <Charlie.McBride@microsoft.com>
Date: Thu, 9 Nov 2023 06:43:30 -0800
Subject: [PATCH] rename + add in new commit status trigger

---
 ...updated-e2e-matrix.yaml => branch-e2e-matrix-trigger.yaml} | 4 ++--
 .github/workflows/e2e.yaml                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename .github/workflows/{trigger-updated-e2e-matrix.yaml => branch-e2e-matrix-trigger.yaml} (87%)

diff --git a/.github/workflows/trigger-updated-e2e-matrix.yaml b/.github/workflows/branch-e2e-matrix-trigger.yaml
similarity index 87%
rename from .github/workflows/trigger-updated-e2e-matrix.yaml
rename to .github/workflows/branch-e2e-matrix-trigger.yaml
index f8092b726..5170caf96 100644
--- a/.github/workflows/trigger-updated-e2e-matrix.yaml
+++ b/.github/workflows/branch-e2e-matrix-trigger.yaml
@@ -1,4 +1,4 @@
-name: TriggerBranchE2EMatrix
+name: BranchE2EMatrixTrigger
 on:
   pull_request_review:
     types: [submitted]
@@ -11,7 +11,7 @@ jobs:
     if: startsWith(github.event.review.body, '/branch-e2e')
     uses: ./.github/workflows/e2e-matrix.yaml
     with:
-      git_ref: ""
+      git_ref: ${{ github.event.review.commit_id }}
     secrets:
       E2E_CLIENT_ID: ${{ secrets.E2E_CLIENT_ID }}
       E2E_TENANT_ID: ${{ secrets.E2E_TENANT_ID }}
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 08bd3ef66..c244306a1 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -35,7 +35,7 @@ jobs:
       AZURE_SUBSCRIPTION_ID: ${{ secrets.E2E_SUBSCRIPTION_ID }}
     steps:
       - uses: actions/checkout@v3
-      - if: always() && github.event_name == 'workflow_run'
+      - if: always() && (github.event_name == 'workflow_run' || github.event_name == 'pull_request_review')
         uses: ./.github/actions/commit-status/start
         with:
           name: ${{ github.workflow }} / e2e (${{ inputs.suite }})
@@ -128,7 +128,7 @@ jobs:
           resource_group: ${{ env.RG_NAME }}
           cluster_name: ${{ env.CLUSTER_NAME }}
           acr_name: ${{ env.ACR_NAME }}
-      - if: always() && github.event_name == 'workflow_run'
+      - if: always() && (github.event_name == 'workflow_run' || github.event_name == 'pull_request_review')
         uses: ./.github/actions/commit-status/end
         with:
           name: ${{ github.workflow }} / e2e (${{ inputs.suite }})