diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7a521784..5f3b959d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -144,27 +144,23 @@ stages: - bash: | branch_name=$(System.PullRequest.SourceBranch) echo "Retrieved branch name: '$branch_name'" - jira_card_number="${branch_name##*/}" # Grab everything after last '/' + jira_card_number="${branch_name##*/}" + echo "Extracted JIRA Card number: '$jira_card_number'" # Create container for jira writeback container_id=$(docker create \ --ipc=host \ -e JIRA_SERVER=$(JIRA_SERVER) \ -e JIRA_USERNAME=$(JIRA_USERNAME) \ -e JIRA_API_KEY=$(JIRA_API_KEY) \ - -e JIRA_CARD_NUMBER=$jira_card_number \ + -e jira_card_number="$jira_card_number" \ $(dockerImageName):$(imageTag) \ bash -c "echo \"Moving Playwright reports out of subfolders...\" && find ./playwright-reports/ -mindepth 2 -type f -exec mv {} ./playwright-reports/ \; && echo \"Merging reports...\" && npx playwright merge-reports --reporter=ortoni-report ./playwright-reports - # npx playwright merge-reports --config=playwright-tests/playwright.config.ts ./playwright-reports - # num_failures=$(sed -n 's/.*failures="\([^"]*\)".*/\1/p' /app/test-results/junit_results.xml | head -n 1) - # echo \"Number of test failures: '$num_failures'\" - # (($num_failures -eq 0)) && jira_message='Playwright tests passed!' || jira_message=\"$num_failures Playwright tests failed.\" - # TODO: Update to include test status message later echo \"Contents of ortoni-report:\" && ls ./ortoni-report && - echo \"Writing report to Jira card '$JIRA_CARD_NUMBER'...\" && - ./devops/scripts/jira_writeback.sh add_comment \"$JIRA_CARD_NUMBER\" /app/ortoni-report/ortoni-report.html \"AUTOMATED TEST RUN: $(date)\" ") + echo \"Writing report to Jira card '$jira_card_number'...\" && + ./devops/scripts/jira_writeback.sh add_comment \"$jira_card_number\" /app/ortoni-report/ortoni-report.html \"AUTOMATED TEST RUN: $(date)\" ") # Start container and stream logs echo "Starting merge"