Skip to content

Fix target specific download to not clean the unpack dir #35699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sdmaclea wants to merge 3 commits into from
Closed

Fix target specific download to not clean the unpack dir #35699

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07fde68
Fix target specific download to not clean the unpack dir
sdmaclea May 1, 2020
a3346c2
Unzip target specific tests to a separate folder
sdmaclea May 1, 2020
887e223
Set Overwrite: true
sdmaclea May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion eng/pipelines/common/templates/runtimes/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,29 @@ jobs:
# Download and unzip target specific tests
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: '$(managedTestArtifactRootFolderPath)'
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
Copy link
Member

@safern safern May 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to instead port into this PR building the target specific tests as part of the run job, or is that a very big change?

Copy link
Contributor Author

@sdmaclea sdmaclea May 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That PR already exists #35645. If it is right it should fix the issue.

It is a bigger change, so it may take longer to review/merge.

Copy link
Member

@safern safern May 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, since this is a temp workaround, if it fixes the issue I don't want to block on this, so fine with me and we can remove this workaround on #35645

- task: CopyFiles@2
displayName: Gather binaries for publish to artifacts
inputs:
SourceFolder: '$(Build.SourcesDirectory)/__unpack__/$(managedTestArtifactName)'
Contents: '**'
TargetFolder: '$(managedTestArtifactRootFolderPath)'
CleanTargetFolder: false
OverWrite: true


# Download product binaries directory
Expand Down