Skip to content

Commit

Permalink
Move all build pools to -Svc equivalents (except eng/common; this nee…
Browse files Browse the repository at this point in the history
…ds to be updated in release branch of Arcade once generated) (#74521)
  • Loading branch information
MattGal authored Aug 25, 2022
1 parent f0dbf37 commit 7b1acce
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions eng/pipelines/common/xplat-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ jobs:
pool:
# Public Linux Build Pool
${{ if and(or(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Android', 'Tizen'), eq(parameters.jobParameters.hostedOs, 'Linux')), eq(variables['System.TeamProject'], 'public')) }}:
name: NetCore1ESPool-Public
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

# Official Build Linux Pool
${{ if and(or(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Browser', 'Android', 'Tizen'), eq(parameters.jobParameters.hostedOs, 'Linux')), ne(variables['System.TeamProject'], 'public')) }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

# OSX Build Pool (we don't have on-prem OSX BuildPool
Expand All @@ -149,12 +149,12 @@ jobs:

# Official Build Windows Pool
${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public')) }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2022.amd64

# Public Windows Build Pool
${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}:
name: NetCore1ESPool-Public
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals windows.vs2022.amd64.open


Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/enterprise/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- job: EnterpriseLinuxTests
timeoutInMinutes: 120
pool:
name: NetCore1ESPool-Public
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
steps:
- bash: |
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/stress/http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
variables:
DUMPS_SHARE_MOUNT_ROOT: "/dumps-share"
pool:
name: NetCore1ESPool-Public
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals 1es-ubuntu-1804-open

steps:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
variables:
DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
pool:
name: NetCore1ESPool-Public
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals 1es-windows-2022-open

steps:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/stress/ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
displayName: Docker Linux
timeoutInMinutes: 120
pool:
name: NetCore1ESPool-Public
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

steps:
Expand All @@ -54,7 +54,7 @@ jobs:
displayName: Docker NanoServer
timeoutInMinutes: 120
pool:
name: NetCore1ESPool-Public
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals 1es-windows-2022-open

steps:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/official/jobs/prepare-signed-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
displayName: Prepare Signed Artifacts
dependsOn: ${{ parameters.dependsOn }}
pool:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals 1es-windows-2022
# Double the default timeout.
timeoutInMinutes: 240
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/official/stages/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ stages:
publishUsingPipelines: true
dependsOn: PrepareSignedArtifacts
pool:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals 1es-windows-2022

# Stages-based publishing entry point
Expand Down

0 comments on commit 7b1acce

Please sign in to comment.