Skip to content

[Helix] Install aspnet runtime as part of test runner #20693

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.

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

Merged
merged 27 commits into from
Apr 11, 2020
Merged

Conversation

HaoK
Copy link
Member

@HaoK HaoK commented Apr 9, 2020

Fixes #20624

Nuke more scripts and add more functionality into test runner

@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Apr 9, 2020
@HaoK
Copy link
Member Author

HaoK commented Apr 11, 2020

Marking as ready for review since it looks like the remaining issues are just due to disk space timeouts/unrelated failures

@HaoK HaoK marked this pull request as ready for review April 11, 2020 00:27
@HaoK HaoK requested review from BrennanConroy and a team April 11, 2020 00:27
File.Copy(file, Path.Combine(appRuntimePath, Path.GetFileName(file)), overwrite: true);
foreach (var entry in archive.Entries)
{
// These are the only extensions that end up in the shared fx directory
Copy link
Member

Choose a reason for hiding this comment

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

Is it important to filter based on extension?

Copy link
Member Author

Choose a reason for hiding this comment

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

We could just flatten and dump all the files I guess, I mostly was just trying to mimic what the final contents of the shared framework directory has. There's a bunch of other metadata in other folders that aren't really relevant. This was a little cleaner than filtering for relative paths since we'd have to build those based on target framework and other things

<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion)</Command>
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion)</Command>
<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg</Command>
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg</Command>
Copy link
Member

Choose a reason for hiding this comment

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

Why are we passing a windows nupkg to Unix?

Copy link
Member Author

Choose a reason for hiding this comment

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

Long term we still need to do the work to build all the appropriate shared frameworks and match them to the appropriate helix queues, but today the tests only use managed code so it doesn't seem to matter (yet?)

Copy link
Member Author

Choose a reason for hiding this comment

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

This issue basically: #11128

@HaoK HaoK merged commit c16d336 into master Apr 11, 2020
@HaoK HaoK deleted the helix/morCode branch April 11, 2020 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Helix] convert app runtime and ref pack to testrunner methods
2 participants