Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use new Hosted build pools #58484

Merged
merged 1 commit into from
Sep 2, 2021
Merged

Use new Hosted build pools #58484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/pipelines/common/xplat-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,27 +111,27 @@ jobs:
pool:
# Public Linux Build Pool
${{ if and(or(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Android'), eq(parameters.hostedOs, 'Linux')), eq(variables['System.TeamProject'], 'public')) }}:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1804.Amd64.Open
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'), eq(parameters.hostedOs, 'Linux')), ne(variables['System.TeamProject'], 'public')) }}:
name: NetCoreInternal-Pool
queue: BuildPool.Ubuntu.1804.Amd64
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

# OSX Build Pool (we don't have on-prem OSX BuildPool
${{ if in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'iOSSimulator', 'tvOS', 'tvOSSimulator') }}:
vmImage: 'macOS-10.15'

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

# Public Windows Build Pool
${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open


${{ if eq(parameters.helixQueuesTemplate, '') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ jobs:
testDisplayName: ${{ parameters.runtimeFlavor }}_interpreter_${{ parameters.liveRuntimeBuildConfig }}

# To run the tests we just send to helix and wait, use ubuntu hosted pools for faster providing and to not back up our build pools
${{ if startsWith(parameters.pool.queue, 'BuildPool.Ubuntu') }}:
${{ if startsWith(parameters.pool.queue, 'Build.Ubuntu') }}:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I agree with this sentiment. I favor as many machines as can be of the 200 parallelism limit be macOS since ostensibly 1ES can handle these but not MacOS

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not correct anyway, as the new pool property is demands and it doesn't start with Build.Ubuntu.

pool.queue no longer exists after this change. So we can safely delete this as now are a no-op.

pool:
vmImage: 'ubuntu-latest'

${{ if not(startsWith(parameters.pool.queue, 'BuildPool.Ubuntu')) }}:
${{ if not(startsWith(parameters.pool.queue, 'Build.Ubuntu')) }}:
pool: ${{ parameters.pool }}

dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/libraries/stress/http.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
displayName: Docker Linux
timeoutInMinutes: 180
pool:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1804.Amd64.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

steps:
- checkout: self
Expand Down Expand Up @@ -75,8 +75,8 @@ jobs:
displayName: Docker NanoServer
timeoutInMinutes: 150
pool:
name: NetCorePublic-Pool
queue: BuildPool.Server.Amd64.VS2019.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open

steps:
- checkout: self
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/libraries/stress/ssl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
displayName: Docker Linux
timeoutInMinutes: 120
pool:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1804.Amd64.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

steps:
- checkout: self
Expand All @@ -53,8 +53,8 @@ jobs:
displayName: Docker NanoServer
timeoutInMinutes: 120
pool:
name: NetCorePublic-Pool
queue: BuildPool.Server.Amd64.VS2019.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open

steps:
- checkout: self
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/official/jobs/prepare-signed-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
displayName: Prepare Signed Artifacts
dependsOn: ${{ parameters.dependsOn }}
pool:
name: NetCoreInternal-Pool
queue: buildpool.windows.10.amd64.vs2019
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019
# Double the default timeout.
timeoutInMinutes: 180
workspace:
Expand Down