Skip to content

Commit

Permalink
try split test template
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Bergmeister committed Apr 27, 2020
1 parent 93c9450 commit 226259d
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 7 deletions.
11 changes: 10 additions & 1 deletion .azure-pipelines-ci/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ stages:
vmImage: vs2017-win2016
Windows_Server2019_PowerShell_Core:
vmImage: windows-2019
pool:
vmImage: $[ variables['vmImage'] ]
steps:
- template: templates/test-pwsh.yaml
- job:
strategy:
matrix:
Windows_Server2019_PowerShell_Core:
vmImage: windows-2019
Windows_Server2016_PowerShell_5_1:
vmImage: vs2017-win2016
pwsh: false
Expand All @@ -43,4 +52,4 @@ stages:
pool:
vmImage: $[ variables['vmImage'] ]
steps:
- template: templates/test.yaml
- template: templates/test-powershell.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
parameters:
- name: pwsh
type: boolean
default: true

steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact: out Folder'
Expand All @@ -13,7 +8,7 @@ steps:
displayName: 'Test'
inputs:
targetType: inline
pwsh: $[ parameters.pwsh ]
pwsh: false
script: |
Import-Module .\tools\appveyor.psm1
Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY
Expand Down
19 changes: 19 additions & 0 deletions .azure-pipelines-ci/templates/test-pwsh.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
steps:
- task: DownloadPipelineArtifact@2
displayName: 'Download Pipeline Artifact: out Folder'
inputs:
artifactName: out
targetPath: '$(Build.SourcesDirectory)/out'
- task: PowerShell@2
displayName: 'Test'
inputs:
targetType: inline
pwsh: true
script: |
Import-Module .\tools\appveyor.psm1
Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY
- task: PublishTestResults@2
inputs:
testRunner: NUnit
testResultsFiles: 'TestResults.xml'
condition: succeededOrFailed()

0 comments on commit 226259d

Please sign in to comment.