testing pool change for PR (dotnet#6343)

.vsts-dotnet-ci.yml

@@ -36,7 +36,8 @@ jobs:
         _targetFramework: netcoreapp3.1
     innerLoop: true
     pool:
-      vmImage: ubuntu-18.04
+      name: NetCore-Public
+      demands: ImageOverride -equals build.ubuntu.1804.amd64.open
     helixQueue: [email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-20210531091521-97d8652
 
 - template: /build/ci/job-template.yml
@@ -58,7 +59,8 @@ jobs:
         _targetFramework: netcoreapp3.1
     innerLoop: true
     pool:
-      vmImage: ubuntu-18.04
+      name: NetCore-Public
+      demands: ImageOverride -equals build.ubuntu.1804.amd64.open
     helixQueue: [email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652
 
 - template: /build/ci/job-template.yml
@@ -68,7 +70,8 @@ jobs:
     container: CentosContainer
     innerLoop: true
     pool:
-      vmImage: ubuntu-18.04
+      name: NetCore-Public
+      demands: ImageOverride -equals build.ubuntu.1804.amd64.open
     helixQueue: [email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af
 
 - template: /build/ci/job-template.yml
@@ -78,7 +81,8 @@ jobs:
     container: UbuntuContainer
     innerLoop: true
     pool:
-      vmImage: ubuntu-18.04
+      name: NetCore-Public
+      demands: ImageOverride -equals build.ubuntu.1804.amd64.open
     helixQueue: [email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af
 
 - template: /build/ci/job-template.yml
@@ -118,7 +122,8 @@ jobs:
     innerLoop: true
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
     pool:
-      vmImage: windows-2019
+      name: NetCore-Public
+      demands: ImageOverride -equals 1es-windows-2019-open
     helixQueue: Windows.10.Amd64.Open
 
 - template: /build/ci/job-template.yml
@@ -139,7 +144,8 @@ jobs:
     innerLoop: true
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
     pool:
-      vmImage: windows-2019
+      name: NetCore-Public
+      demands: ImageOverride -equals 1es-windows-2019-open
     helixQueue: Windows.10.Amd64.Open
 
 - template: /build/ci/job-template.yml
@@ -150,5 +156,6 @@ jobs:
     innerLoop: true
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
     pool:
-      vmImage: windows-2019
+      name: NetCore-Public
+      demands: ImageOverride -equals 1es-windows-2019-open
     helixQueue: Windows.10.Amd64.Open

build/ci/job-template.yml

@@ -37,7 +37,7 @@ jobs:
         spaceValue: ' '
       ${{ if eq(parameters.buildScript, './build.sh') }}:
         spaceValue: '%20'
-      ${{ if and(eq(parameters.pool.vmImage, 'ubuntu-18.04'), contains(parameters.name, 'cross')) }}:
+      ${{ if and(contains(parameters.pool.demands, 'ubuntu'), contains(parameters.name, 'cross')) }}:
         ROOTFS_DIR: '/crossrootfs/${{ parameters.architecture }}'
       ${{ if eq(parameters.codeCoverage, 'true') }}:
         hardLink: ''