Skip to content

Commit

Permalink
Unzip target specific tests to a separate folder
Browse files Browse the repository at this point in the history
Unzip target specific coreclr tests to a separate folder

Copy to final destination w/o cleaning

This fixes is intended to fix issues with unzip failing to overwrite
duplicate files when unzipping the target specific tests
  • Loading branch information
sdmaclea committed May 1, 2020
1 parent 07fde68 commit a3346c2
Showing 1 changed file with 19 additions and 3 deletions.
22 changes: 19 additions & 3 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,28 @@ jobs:
# Download and unzip target specific tests
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: '$(managedTestArtifactRootFolderPath)'
# We want the specific tests to overlay the generic tests
cleanUnpackFolder: false
artifactFileName: '$(managedTestArtifactName)$(archiveExtension)'
artifactName: '$(managedTestArtifactName)'
displayName: 'managed test artifacts (built on ${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }})'
${{ if ne(parameters.testBuildPhased, true) }}:
# These are the only tests unpack directly
unpackFolder: '$(managedTestArtifactRootFolderPath)'
${{ if eq(parameters.testBuildPhased, true) }}:
# We want the specific tests to overlay the generic tests
# Unpacking directly casues issues due to not handling overwriting existing files
# Unpack to a temp folder and copy below
unpackFolder: '$(Build.SourcesDirectory)/__unpack__/$(managedTestArtifactName)'

- ${{ if eq(parameters.testBuildPhased, true) }}:
# Copy target specific tests on top of the generic test
# Expected to overwrite duplicates
- task: CopyFiles@2
displayName: Gather binaries for publish to artifacts
inputs:
SourceFolder: '$(Build.SourcesDirectory)/__unpack__/$(managedTestArtifactName)'
Contents: '**'
TargetFolder: '$(managedTestArtifactRootFolderPath)'
CleanTargetFolder: false


# Download product binaries directory
Expand Down

0 comments on commit a3346c2

Please sign in to comment.