From b23cc69da1065de71d4f50922222038736534bc3 Mon Sep 17 00:00:00 2001
From: Chase King <chase.king@safelite.com>
Date: Tue, 25 Feb 2025 09:32:07 -0500
Subject: [PATCH] Changed position of commands

---
 azure-pipelines-automated-testing.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines-automated-testing.yml b/azure-pipelines-automated-testing.yml
index 31de05c6..64168191 100644
--- a/azure-pipelines-automated-testing.yml
+++ b/azure-pipelines-automated-testing.yml
@@ -147,11 +147,8 @@ stages:
                   rmdir "$dir"
                 fi
               done
-              npx playwright merge-reports --reporter=ortoni-report,junit $(System.DefaultWorkingDirectory)/playwright-reports
               ls
-          displayName: merge_reports
-          env:
-            PLAYWRIGHT_JUNIT_OUTPUT_FILE: "test-results/results.xml"
+          displayName: move_reports
         - bash: |
               # Create container for jira writeback
               container_id=$(docker create \
@@ -160,11 +157,13 @@ stages:
               -e JIRA_USERNAME=$(JIRA_USERNAME) \
               -e JIRA_API_KEY=$(JIRA_API_KEY) \
               $(dockerImageName):$(imageTag) \
+              npx playwright merge-reports --reporter=ortoni-report,junit $(System.DefaultWorkingDirectory)/playwright-reports &&
               chmod +x $(System.DefaultWorkingDirectory)/devops/scripts/jira_writeback.sh &&
               $(System.DefaultWorkingDirectory)/devops/scripts/jira_writeback.sh add_comment "$(Build.SourceBranchName)" "AUTOMATED TEST RUN: $(date)" "$(System.DefaultWorkingDirectory)/ortoni-report/index.html")
           env:
             JIRA_API_KEY: $(JIRA_API_KEY)
-          displayName: publish_results_to_jira
+            PLAYWRIGHT_JUNIT_OUTPUT_FILE: "test-results/results.xml"
+          displayName: merge_and_publish_results_to_jira
 
           # TODO: Enable later when working on PR gate
           # - task: PublishTestResults@2