Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d2e2f4f

Browse files
authoredOct 5, 2022
testing pool change for PR (#6343)
1 parent 7d764bb commit d2e2f4f

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed
 

‎.vsts-dotnet-ci.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
_targetFramework: netcoreapp3.1
3737
innerLoop: true
3838
pool:
39-
vmImage: ubuntu-18.04
39+
name: NetCore-Public
40+
demands: ImageOverride -equals build.ubuntu.1804.amd64.open
4041
helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-20210531091521-97d8652
4142

4243
- template: /build/ci/job-template.yml
@@ -58,7 +59,8 @@ jobs:
5859
_targetFramework: netcoreapp3.1
5960
innerLoop: true
6061
pool:
61-
vmImage: ubuntu-18.04
62+
name: NetCore-Public
63+
demands: ImageOverride -equals build.ubuntu.1804.amd64.open
6264
helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652
6365

6466
- template: /build/ci/job-template.yml
@@ -68,7 +70,8 @@ jobs:
6870
container: CentosContainer
6971
innerLoop: true
7072
pool:
71-
vmImage: ubuntu-18.04
73+
name: NetCore-Public
74+
demands: ImageOverride -equals build.ubuntu.1804.amd64.open
7275
helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af
7376

7477
- template: /build/ci/job-template.yml
@@ -78,7 +81,8 @@ jobs:
7881
container: UbuntuContainer
7982
innerLoop: true
8083
pool:
81-
vmImage: ubuntu-18.04
84+
name: NetCore-Public
85+
demands: ImageOverride -equals build.ubuntu.1804.amd64.open
8286
helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af
8387

8488
- template: /build/ci/job-template.yml
@@ -118,7 +122,8 @@ jobs:
118122
innerLoop: true
119123
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
120124
pool:
121-
vmImage: windows-2019
125+
name: NetCore-Public
126+
demands: ImageOverride -equals 1es-windows-2019-open
122127
helixQueue: Windows.10.Amd64.Open
123128

124129
- template: /build/ci/job-template.yml
@@ -139,7 +144,8 @@ jobs:
139144
innerLoop: true
140145
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
141146
pool:
142-
vmImage: windows-2019
147+
name: NetCore-Public
148+
demands: ImageOverride -equals 1es-windows-2019-open
143149
helixQueue: Windows.10.Amd64.Open
144150

145151
- template: /build/ci/job-template.yml
@@ -150,5 +156,6 @@ jobs:
150156
innerLoop: true
151157
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
152158
pool:
153-
vmImage: windows-2019
159+
name: NetCore-Public
160+
demands: ImageOverride -equals 1es-windows-2019-open
154161
helixQueue: Windows.10.Amd64.Open

‎build/ci/job-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
spaceValue: ' '
3838
${{ if eq(parameters.buildScript, './build.sh') }}:
3939
spaceValue: '%20'
40-
${{ if and(eq(parameters.pool.vmImage, 'ubuntu-18.04'), contains(parameters.name, 'cross')) }}:
40+
${{ if and(contains(parameters.pool.demands, 'ubuntu'), contains(parameters.name, 'cross')) }}:
4141
ROOTFS_DIR: '/crossrootfs/${{ parameters.architecture }}'
4242
${{ if eq(parameters.codeCoverage, 'true') }}:
4343
hardLink: ''

0 commit comments

Comments
 (0)
Please sign in to comment.