Skip to content

Commit

Permalink
Disambiguate the test job artifact based on attempt number (#15877)
Browse files Browse the repository at this point in the history
Closes #15876

(cherry picked from commit b024efb)
Service-Card-Id: 90368682
Service-Version: 1.18
  • Loading branch information
DHowett committed Aug 30, 2023
1 parent 44faad0 commit 52ceac7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 2 additions & 0 deletions build/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ stages:
- template: ./templates-v2/job-test-project.yml
parameters:
platform: ${{ platform }}
# The tests might be run more than once; log one artifact per attempt.
outputArtifactStem: -$(System.JobAttempt)

- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
- stage: CodeIndexer
Expand Down
8 changes: 5 additions & 3 deletions build/pipelines/templates-v2/job-test-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ parameters:
configuration: 'Release'
platform: ''
testLogPath: '$(Build.BinariesDirectory)\$(BuildPlatform)\$(BuildConfiguration)\testsOnBuildMachine.wtl'
artifactStem: ''
inputArtifactStem: ''
outputArtifactStem: ''

jobs:
- job: Test${{ parameters.platform }}${{ parameters.configuration }}
Expand Down Expand Up @@ -37,7 +38,7 @@ jobs:
- task: DownloadPipelineArtifact@2
displayName: Download artifacts
inputs:
artifactName: build-${{ parameters.platform }}-$(BuildConfiguration)${{ parameters.artifactStem }}
artifactName: build-${{ parameters.platform }}-$(BuildConfiguration)${{ parameters.inputArtifactStem }}
downloadPath: $(Terminal.BinDir)

- task: PowerShell@2
Expand Down Expand Up @@ -87,4 +88,5 @@ jobs:
flattenFolders: true

- publish: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/$(BuildPlatform)/test-logs'
artifact: test-logs-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
artifact: test-logs-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.outputArtifactStem }}
condition: always()

0 comments on commit 52ceac7

Please sign in to comment.