From c3ef3db49f9fab83e5b83e909bb58d82102dc61d Mon Sep 17 00:00:00 2001
From: Bryce Soghigian <49734722+Bryce-Soghigian@users.noreply.github.com>
Date: Wed, 19 Feb 2025 07:52:05 +0000
Subject: [PATCH] refactor: using env block instead

---
 .github/workflows/e2e.yaml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 1c7fdec96..eaf97bc64 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -156,9 +156,17 @@ jobs:
           location: ${{ inputs.location }}
       - name: run the ${{ inputs.suite }} test suite
         if: inputs.suite != 'Nonbehavioral'
+        env:
+          AZURE_CLUSTER_NAME: ${{ env.CLUSTER_NAME }}
+          AZURE_RESOURCE_GROUP: ${{ env.RG_NAME }}
+          AZURE_LOCATION: ${{ inputs.location }}
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.E2E_SUBSCRIPTION_ID }}
+          AZURE_ACR_NAME: ${{ env.ACR_NAME }}
+          TEST_SUITE: ${{ inputs.suite }}
+          GIT_REF: ${{ github.sha }}
         run: |
-          AZURE_CLUSTER_NAME=${{ env.CLUSTER_NAME }} AZURE_RESOURCE_GROUP=${{ env.RG_NAME }} make az-creds
-          AZURE_LOCATION=${{ inputs.location }} AZURE_SUBSCRIPTION_ID=${{ secrets.E2E_SUBSCRIPTION_ID }} AZURE_RESOURCE_GROUP=${{ env.RG_NAME }} AZURE_CLUSTER_NAME=${{ env.CLUSTER_NAME }} AZURE_ACR_NAME=${{ env.ACR_NAME}} TEST_SUITE="${{ inputs.suite }}" GIT_REF="$(git rev-parse HEAD)" make e2etests
+          make az-creds
+          make e2etests
       - name: dump logs on failure
         uses: ./.github/actions/e2e/dump-logs
         if: failure() || cancelled()