Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 18 additions & 10 deletions azure-pipelines-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,15 @@ stages:
NativeToolsOnMachine: true
displayName: Build

- template: /eng/templates/publish-test-results.yml
parameters:
- task: PublishTestResults@2
displayName: Publish Test Results
inputs:
testResultsFormat: 'XUnit'
testRunTitle: WindowsNoRealsig_testCoreclr
mergeTestResults: true
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/Release'
condition: succeededOrFailed()

- task: PublishBuildArtifacts@1
displayName: Publish Build BinLog
Expand Down Expand Up @@ -368,10 +374,16 @@ stages:
NativeToolsOnMachine: true
displayName: Build and Test $(_testKind) $(transparentCompiler)

- template: /eng/templates/publish-test-results.yml
parameters:
configuration: $(_configuration)
- task: PublishTestResults@2
displayName: Publish Test Results
inputs:
testResultsFormat: 'XUnit'
testRunTitle: WindowsCompressedMetadata $(_testKind) $(transparentCompiler)
mergeTestResults: true
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_configuration)'
continueOnError: true
condition: succeededOrFailed()
- task: PublishBuildArtifacts@1
displayName: Publish Tests BinLog
condition: always()
Expand Down Expand Up @@ -454,14 +466,10 @@ stages:
steps:
- checkout: self
clean: true
- powershell: |
$result = Invoke-Pester eng/tests/*.Tests.ps1 -PassThru
if ($result.FailedCount -gt 0) { exit 1 }
displayName: Pipeline regression tests
- pwsh: .\eng\MockBuild.ps1
displayName: Build with OfficialBuildId

# Linux (split into 2 batches to limit test-process memory; batch 3 is desktop-only FSharpSuite)
# Linux (split into 2 batches; batch 3 is desktop-only FSharpSuite)
- job: Linux
strategy:
matrix:
Expand Down
14 changes: 9 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,14 @@ extends:
NativeToolsOnMachine: true
FSHARP_CACHE_OVERRIDE: 256
FSharp_CacheEvictionImmediate: true
- template: /eng/templates/publish-test-results.yml
parameters:
configuration: $(_BuildConfig)
testRunTitle: Official $(_BuildConfig)
condition: ne(variables['SkipTests'], 'true')
- task: PublishTestResults@2
displayName: Publish Test Results
inputs:
testResultsFormat: 'XUnit'
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
continueOnError: true
condition: ne(variables['SkipTests'], 'true')
- task: 1ES.PublishPipelineArtifact@1
displayName: Publish Test Logs
inputs:
Expand Down Expand Up @@ -229,3 +232,4 @@ extends:
insertTeamEmail: fsharpteam@microsoft.com
insertTeamName: 'F#'
completeInsertion: 'auto'

78 changes: 0 additions & 78 deletions eng/PublishTestResults.ps1

This file was deleted.

12 changes: 9 additions & 3 deletions eng/templates/batched-test-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,16 @@ steps:
env: ${{ parameters.buildEnv }}
displayName: Build / Test

- template: /eng/templates/publish-test-results.yml
parameters:
configuration: ${{ parameters.configuration }}
- task: PublishTestResults@2
displayName: Publish Test Results
inputs:
testResultsFormat: 'XUnit'
testRunTitle: ${{ parameters.testRunTitlePrefix }} Batch$(batchNumber)
mergeTestResults: true
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/${{ parameters.configuration }}'
continueOnError: true
condition: succeededOrFailed()

- ${{ if parameters.publishBinLog }}:
- task: PublishBuildArtifacts@1
Expand Down
17 changes: 0 additions & 17 deletions eng/templates/publish-test-results.yml

This file was deleted.

164 changes: 0 additions & 164 deletions eng/tests/PublishTestResults.Tests.ps1

This file was deleted.

Loading
Loading