Skip to content

Commit f1dba10

Browse files
authored
[Helix] Better logging (flaky tests, logged tests) (#18274)
1 parent 53a07c9 commit f1dba10

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.azure/pipelines/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ stages:
579579
steps:
580580
- script: .\restore.cmd -ci
581581
displayName: Restore
582-
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=false -bl
582+
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
583583
displayName: Run build.cmd helix target
584584
env:
585585
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
@@ -599,7 +599,7 @@ stages:
599599
steps:
600600
- script: .\restore.cmd -ci
601601
displayName: Restore
602-
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true -bl
602+
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
603603
displayName: Run build.cmd helix target
604604
env:
605605
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
@@ -620,7 +620,7 @@ stages:
620620
steps:
621621
- script: ./restore.sh -ci
622622
displayName: Restore
623-
- script: ./build.sh -ci --arch arm64 -test --no-build-nodejs -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true -bl
623+
- script: ./build.sh -ci --arch arm64 -test --no-build-nodejs -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
624624
displayName: Run build.sh helix arm64 target
625625
env:
626626
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops

eng/helix/content/runtests.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,8 @@ if [ $? != 0 ]; then
109109
# DO NOT EXIT
110110
fi
111111

112+
echo "Copying artifacts/logs to $HELIX_WORKITEM_UPLOAD_ROOT/../"
113+
shopt -s globstar
114+
cp artifacts/log/**/*.log $HELIX_WORKITEM_UPLOAD_ROOT/../
115+
cp artifacts/log/**/*.log $HELIX_WORKITEM_UPLOAD_ROOT/
112116
exit $nonflaky_exitcode

eng/helix/helix.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
</ItemGroup>
1717

1818
<PropertyGroup>
19-
<HelixSource>pr/dotnet/aspnetcore</HelixSource>
2019
<HelixBuild>private-$(USERNAME)</HelixBuild>
2120
<HelixBuild Condition=" '$(USERNAME)' == '' ">private-$(USER)</HelixBuild>
2221
<IsExternal>true</IsExternal>
@@ -30,7 +29,7 @@
3029
<HelixBuild>$(BUILD_BUILDNUMBER).$(TargetArchitecture).$(SYSTEM_JOBATTEMPT)</HelixBuild>
3130
<WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
3231
<EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
33-
<FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
32+
<EnableXUnitReporter>true</EnableXUnitReporter>
3433
</PropertyGroup>
3534

3635
<PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' != 'true' ">

eng/targets/Helix.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<IsWindowsHelixQueue Condition="$(HelixTargetQueue.Contains('Windows')) or $(HelixTargetQueue.Contains('windows'))">true</IsWindowsHelixQueue>
1717
<HelixTestName>$(MSBuildProjectName)-$(TargetFramework)</HelixTestName>
1818
<HelixUseArchive>false</HelixUseArchive>
19-
<LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">true</LoggingTestingDisableFileLogging>
19+
<LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging>
2020
<NodeVersion>10.15.3</NodeVersion>
2121
</PropertyGroup>
2222

0 commit comments

Comments
 (0)