From e2556b07bb55f91858695b3f20bba9e6363e3536 Mon Sep 17 00:00:00 2001
From: maguire-arman <maguire.arman@safelite.com>
Date: Mon, 14 Jul 2025 14:32:10 -0400
Subject: [PATCH] Wrapped up testing and now ready for merge

Configures the pipelines to utilize regression testing, increases the total shards for automated testing, and corrects the logic for retrieving the branch name to extract the JIRA card number.
---
 azure-pipelines-automated-testing.yml | 5 +++--
 azure-pipelines.yml                   | 2 +-
 temp/playwright-test.yml              | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines-automated-testing.yml b/azure-pipelines-automated-testing.yml
index f11f68159..08371bd9b 100644
--- a/azure-pipelines-automated-testing.yml
+++ b/azure-pipelines-automated-testing.yml
@@ -16,9 +16,9 @@ variables:
   - name: imageTag
     value: '$(Build.BuildId)'
   - name: totalShards
-    value: '2'
+    value: '4'
   - name: IS_REGRESSION
-    value: 'false'
+    value: 'true'
   - name: JIRA_BOARD_ID
     value: '845'
   - name: JIRA_EPIC_KEY
@@ -30,6 +30,7 @@ stages:
   - stage: TestPr
     displayName: Run Playwright Test
     jobs:
+    # TODO: Change to ADO Playwright template
     - template: temp/playwright-test.yml
       parameters:
         totalShards: ${{ variables.totalShards }}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6acbc0e6a..9774bd48a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -64,7 +64,7 @@ stages:
             jobs:
                 - template: temp/playwright-test.yml
                   parameters:
-                      totalShards: 4
+                      totalShards: 2
                       targetUrl: $(BASE_URL)
                       dockerFileName: 'Dockerfile.playwright'
                       isRegression: false
diff --git a/temp/playwright-test.yml b/temp/playwright-test.yml
index ab275f7d4..272959e7c 100644
--- a/temp/playwright-test.yml
+++ b/temp/playwright-test.yml
@@ -119,7 +119,7 @@ jobs:
       IS_REGRESSION="${{ parameters.isRegression }}"
       echo "isRegression: $IS_REGRESSION";
       if [[ "${{ parameters.isRegression }}" == "False" ]]; then
-        branch_name=$(Build.SourceBranch)   # TODO: Change back to PullRequest.SourceBranch
+        branch_name=$(PullRequest.SourceBranch)
         echo "Retrieved branch name: '$branch_name'"
         JIRA_CARD_NUMBER="${branch_name##*/}"
         echo "Extracted JIRA Card number: '$JIRA_CARD_NUMBER'"
@@ -240,7 +240,7 @@ jobs:
       arguments: '--no-cache --pull'
   - bash: |
       printenv > "${{ parameters.envFileName }}"
-      branch_name=$(Build.SourceBranch)   # TODO: Change back to PullRequest.SourceBranch
+      branch_name=$(PullRequest.SourceBranch)
       echo "Retrieved branch name: '$branch_name'"
       JIRA_CARD_NUMBER="${branch_name##*/}"
       echo "Extracted JIRA Card number: '$JIRA_CARD_NUMBER'"
@@ -255,8 +255,8 @@ jobs:
               bash -c "
                 echo 'Moving Playwright reports out of subfolders...'
                 find ./playwright-reports/ -mindepth 2 -type f -exec mv {} ./playwright-reports/ \;
-                echo 'Merging reports...'
                 echo 'Value of JIRA_CARD_NUMBER in bash -c command: $JIRA_CARD_NUMBER'
+                echo 'Merging reports...'
                 JIRA_CARD_NUMBER='$JIRA_CARD_NUMBER' PLAYWRIGHT_JUNIT_OUTPUT_DIR='/app/test-results' PLAYWRIGHT_JUNIT_OUTPUT_NAME='junit_results.xml' npx --prefix $PLAYWRIGHT_PATH playwright merge-reports --config=$PLAYWRIGHT_PATH/playwright.config.ts ./playwright-reports
               "
       )