From b0fe3c7e29d526fe886b04b9eb43526032158c4c Mon Sep 17 00:00:00 2001
From: Chase King <chase.king@safelite.com>
Date: Thu, 27 Feb 2025 11:29:06 -0500
Subject: [PATCH] Attempt #37

---
 azure-pipelines-automated-testing.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines-automated-testing.yml b/azure-pipelines-automated-testing.yml
index ee4e1a64..230355d7 100644
--- a/azure-pipelines-automated-testing.yml
+++ b/azure-pipelines-automated-testing.yml
@@ -156,13 +156,23 @@ stages:
               -e JIRA_SERVER=$(JIRA_SERVER) \
               -e JIRA_USERNAME=$(JIRA_USERNAME) \
               -e JIRA_API_KEY=$(JIRA_API_KEY) \
+              -e PLAYWRIGHT_JUNIT_OUTPUT_FILE=$(PLAYWRIGHT_JUNIT_OUTPUT_FILE) \
               $(dockerImageName):$(imageTag) \
               bash -c "echo \"Contents of /app/playwright-reports/:\" && ls /app/playwright-reports/ && echo \"Moving subfolders of playwright-reports...\" &&
-              find ./playwright-reports/ -mindepth 2 -type f -exec mv {} ./playwright-reports/ \;; echo \"Current directory:\" && pwd && echo \"Contents of current dir: \" && ls && echo \"Contents of playwright-reports:\" && ls ./playwright-reports/; echo \"Merging reports...\" && npx playwright merge-reports --reporter=ortoni-report,junit ./playwright-reports; echo \"Contents of current dir: \" && ls && echo \"Contents of playwright-reports:\" && ls && ./devops/scripts/jira_writeback.sh add_comment \"$(Build.SourceBranchName)\" \"AUTOMATED TEST RUN: $(date)\" \"./ortoni-report/index.html\"")
+              find ./playwright-reports/ -mindepth 2 -type f -exec mv {} ./playwright-reports/ \;; echo \"Current directory:\" && pwd && echo \"Contents of current dir: \" && ls && echo \"Contents of playwright-reports:\" && ls ./playwright-reports/; echo \"Merging reports...\" && npx playwright merge-reports --reporter=ortoni-report,junit ./playwright-reports; echo \"Contents of current dir: \" && ls && echo \"Contents of playwright-reports:\" && ls && ./devops/scripts/jira_writeback.sh add_comment \"$(Build.SourceBranchName)\" /app/ortoni-report/index.html \"AUTOMATED TEST RUN: $(date)\"")
               # Start container and stream logs
               echo "Starting merge"
               docker start -a $container_id
 
+              # Create directory for test results
+              echo "Creating test results directory..."
+              mkdir -p $(System.DefaultWorkingDirectory)/ortoni-report
+
+              # Copy test results from container
+              echo "Copying test results..."
+              docker cp $container_id:/app/ortoni-report/. $(System.DefaultWorkingDirectory)/ortoni-report
+              # TODO: Update to include junit results if necessary
+
               # Remove container
               echo "Cleaning up container..."
               docker rm $container_id