huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Helix log upload (#20258)

This commit is contained in:
Brennan 2020-03-27 23:15:56 -07:00 committed by GitHub
parent e79ba297fd
commit 2766f202a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eng/helix/content/runtests.sh
View File

@ -156,8 +156,7 @@ fi
echo "Copying TestResults/TestResults to ." echo "Copying TestResults/TestResults to ."
cp TestResults/TestResults.xml testResults.xml cp TestResults/TestResults.xml testResults.xml
echo "Copying artifacts/logs to $HELIX_WORKITEM_UPLOAD_ROOT/../" echo "Copying artifacts/logs to $HELIX_WORKITEM_UPLOAD_ROOT/"
shopt -s globstar cp `find . -name \*.log` $HELIX_WORKITEM_UPLOAD_ROOT/../
cp artifacts/log/**/*.log $HELIX_WORKITEM_UPLOAD_ROOT/../ cp `find . -name \*.log` $HELIX_WORKITEM_UPLOAD_ROOT/
cp artifacts/log/**/*.log $HELIX_WORKITEM_UPLOAD_ROOT/
exit $exit_code exit $exit_code

4
eng/scripts/RunHelix.ps1
View File

@ -25,7 +25,7 @@ param(
[Parameter(Mandatory=$true)] [Parameter(Mandatory=$true)]
[string]$Project, [string]$Project,
[string]$HelixQueues = "Windows.10.Amd64.Open", [string]$HelixQueues = "Windows.10.Amd64.Open",
[string]$TargetArchitecture = "", [string]$TargetArchitecture = "x64",
[bool]$RunQuarantinedTests = $false [bool]$RunQuarantinedTests = $false
) )
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
@ -39,4 +39,4 @@ $env:BUILD_REPOSITORY_NAME="aspnetcore"
$env:SYSTEM_TEAMPROJECT="aspnetcore" $env:SYSTEM_TEAMPROJECT="aspnetcore"
$HelixQueues = $HelixQueues -replace ";", "%3B" $HelixQueues = $HelixQueues -replace ";", "%3B"
dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log