diff --git a/azure-pipelines-automated-testing.yml b/azure-pipelines-automated-testing.yml index b568320c..0cc673c1 100644 --- a/azure-pipelines-automated-testing.yml +++ b/azure-pipelines-automated-testing.yml @@ -132,15 +132,15 @@ stages: - task: DownloadPipelineArtifact@2 inputs: targetPath: '$(System.DefaultWorkingDirectory)/playwright-reports' - - script: | - for dir in $(System.DefaultWorkingDirectory)/playwright-reports/*/; do - if [ -d "$dir" ]; then - mv "$dir"* $(System.DefaultWorkingDirectory)/playwright-reports/ - rmdir "$dir" - fi - done - ls - displayName: move_reports + # - script: | + # for dir in $(System.DefaultWorkingDirectory)/playwright-reports/*/; do + # if [ -d "$dir" ]; then + # mv "$dir"* $(System.DefaultWorkingDirectory)/playwright-reports/ + # rmdir "$dir" + # fi + # done + # ls + # displayName: move_reports - task: Docker@2 displayName: 'Build Docker Image' inputs: @@ -157,7 +157,12 @@ stages: -e JIRA_USERNAME=$(JIRA_USERNAME) \ -e JIRA_API_KEY=$(JIRA_API_KEY) \ $(dockerImageName):$(imageTag) \ - bash -c "pwd && ls && ls ./playwright-reports/; npx playwright merge-reports --reporter=ortoni-report,junit $(System.DefaultWorkingDirectory)/playwright-reports && ls && $(System.DefaultWorkingDirectory)/devops/scripts/jira_writeback.sh add_comment \"$(Build.SourceBranchName)\" \"AUTOMATED TEST RUN: $(date)\" \"$(System.DefaultWorkingDirectory)/ortoni-report/index.html\"") + bash -c "for dir in $(System.DefaultWorkingDirectory)/playwright-reports/*/; do + if [ -d "$dir" ]; then + mv "$dir"* $(System.DefaultWorkingDirectory)/playwright-reports/ && + rmdir "$dir" + fi + done && pwd && ls && ls ./playwright-reports/; npx playwright merge-reports --reporter=ortoni-report,junit $(System.DefaultWorkingDirectory)/playwright-reports && ls && $(System.DefaultWorkingDirectory)/devops/scripts/jira_writeback.sh add_comment \"$(Build.SourceBranchName)\" \"AUTOMATED TEST RUN: $(date)\" \"$(System.DefaultWorkingDirectory)/ortoni-report/index.html\"") # Start container and stream logs echo "Starting merge" docker start -a $container_id