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
12 changes: 6 additions & 6 deletions .vsts-ci/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ resources:
jobs:
- template: templates/ci-build.yml
parameters:
pool: Hosted Ubuntu 1604
pool: ubuntu-16.04
jobName: linux_build
displayName: linux Build

- template: templates/nix-test.yml
parameters:
name: Linux
pool: Hosted Ubuntu 1604
pool: ubuntu-16.04
purpose: UnelevatedPesterTests
tagSet: CI
parentJobs:
Expand All @@ -59,7 +59,7 @@ jobs:
- template: templates/nix-test.yml
parameters:
name: Linux
pool: Hosted Ubuntu 1604
pool: ubuntu-16.04
purpose: ElevatedPesterTests
tagSet: CI
parentJobs:
Expand All @@ -68,7 +68,7 @@ jobs:
- template: templates/nix-test.yml
parameters:
name: Linux
pool: Hosted Ubuntu 1604
pool: ubuntu-16.04
purpose: UnelevatedPesterTests
tagSet: Others
parentJobs:
Expand All @@ -77,15 +77,15 @@ jobs:
- template: templates/nix-test.yml
parameters:
name: Linux
pool: Hosted Ubuntu 1604
pool: ubuntu-16.04
purpose: ElevatedPesterTests
tagSet: Others
parentJobs:
- linux_build

- template: templates/verify-xunit.yml
parameters:
pool: Hosted Ubuntu 1604
pool: ubuntu-16.04
parentJobs:
- linux_build

Expand Down
4 changes: 2 additions & 2 deletions .vsts-ci/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ resources:
jobs:
- template: templates/ci-build.yml
parameters:
pool: Hosted macOS
pool: macOS-latest
jobName: mac_build
displayName: macOS Build

Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:

- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted macOS'
pool: macOS-latest
parentJobs:
- mac_build

Expand Down
4 changes: 2 additions & 2 deletions .vsts-ci/templates/ci-build.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
parameters:
pool: 'Hosted VS2017'
pool: 'vs2017-win2016'
jobName: 'win_build'
displayName: Windows Build

jobs:
- job: ${{ parameters.jobName }}
pool:
name: ${{ parameters.pool }}
vmImage: ${{ parameters.pool }}

displayName: ${{ parameters.displayName }}

Expand Down
2 changes: 1 addition & 1 deletion .vsts-ci/templates/nanoserver.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
vmImage: 'win1803'
vmImage: 'windows-2019'
jobName: 'Nanoserver_Tests'
continueOnError: false

Expand Down
4 changes: 2 additions & 2 deletions .vsts-ci/templates/nix-test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
pool: 'Hosted macOS'
pool: 'macOS-latest'
parentJobs: []
purpose: ''
tagSet: 'CI'
Expand All @@ -10,7 +10,7 @@ jobs:
dependsOn:
${{ parameters.parentJobs }}
pool:
name: ${{ parameters.pool }}
vmImage: ${{ parameters.pool }}

displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}

Expand Down
4 changes: 2 additions & 2 deletions .vsts-ci/templates/verify-xunit.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
parameters:
parentJobs: []
pool: 'Hosted VS2017'
pool: 'vs2017-win2016'
jobName: 'xunit_verify'

jobs:
- job: verify_xunit
displayName: Verify xUnit Results
pool:
name: ${{ parameters.pool }}
vmImage: ${{ parameters.pool }}
dependsOn:
${{ parameters.parentJobs }}
steps:
Expand Down
2 changes: 0 additions & 2 deletions .vsts-ci/windows-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ stages:
tagSet: Others

- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted VS2017'

- stage: PackagingWin
displayName: Packaging for Windows
Expand Down
4 changes: 0 additions & 4 deletions .vsts-ci/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ stages:
tagSet: Others

- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted VS2017'

- template: templates/nanoserver.yml

- stage: PackagingWin
displayName: Packaging for Windows
Expand Down