mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #12236 from jonfortescue/1esPoolsMain

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

16
.vsts-ci.yml
View file

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

8
src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
View file

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

8
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
View file

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