Merge pull request #12236 from jonfortescue/1esPoolsMain

Switch to 1ES R&D pools on main
This commit is contained in:
Jon Fortescue 2021-10-13 14:26:32 -07:00 committed by GitHub
commit a10dba8712
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions

View file

@ -53,10 +53,10 @@ stages:
agentOs: Windows_NT
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
name: NetCore1ESPool-Public
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
name: NetCore1ESPool-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2019
timeoutInMinutes: 180
strategy:
@ -104,10 +104,10 @@ stages:
agentOs: Windows_NT
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
name: NetCore1ESPool-Public
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
name: NetCore1ESPool-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2019
timeoutInMinutes: 180
strategy:
@ -133,10 +133,10 @@ stages:
agentOs: Linux
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
timeoutInMinutes: 180
strategy:
@ -298,10 +298,10 @@ stages:
agentOs: Linux
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
timeoutInMinutes: 180
strategy:

View file

@ -6,11 +6,11 @@ jobs:
displayName: Source-Build Create Tarball
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1604.Amd64.Open
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Ubuntu.1604.Amd64
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
variables:
_BuildConfig: Release
workspace:

View file

@ -17,11 +17,11 @@ jobs:
dependsOn: ${{ parameters.dependsOn }}
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1604.Amd64.Open
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Ubuntu.1604.Amd64
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
strategy:
matrix:
Fedora33-Online: