Skip to content

Switch to 1ES R&D pools on main #59767

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

Merged
merged 4 commits into from
Oct 7, 2021
Merged

Switch to 1ES R&D pools on main #59767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba8c534
Switch to 1ES R&D pools on main
jonfortescue Sep 29, 2021
da63994
Pretty sure this is right
jonfortescue Sep 29, 2021
bf977ef
Merge branch 'main' into 1esPoolsMain
jonfortescue Oct 4, 2021
2db9c33
oops
jonfortescue Oct 4, 2021
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-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-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-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-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open


${{ if eq(parameters.helixQueuesTemplate, '') }}:
Expand Down
7 changes: 1 addition & 6 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 @@ -52,12 +52,7 @@ 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') }}:
pool:
vmImage: 'ubuntu-latest'

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

dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
dependsOn:
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 @@ -30,8 +30,8 @@ jobs:
variables:
DUMPS_SHARE_MOUNT_ROOT: "/dumps-share"
pool:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1804.Amd64.Open
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

steps:
- checkout: self
Expand Down Expand Up @@ -90,8 +90,8 @@ jobs:
variables:
DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
pool:
name: NetCorePublic-Pool
queue: BuildPool.Server.Amd64.VS2019.Open
name: NetCore1ESPool-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 @@ -29,8 +29,8 @@ jobs:
displayName: Docker Linux
timeoutInMinutes: 120
pool:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1804.Amd64.Open
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

steps:
- checkout: self
Expand All @@ -54,8 +54,8 @@ jobs:
displayName: Docker NanoServer
timeoutInMinutes: 120
pool:
name: NetCorePublic-Pool
queue: BuildPool.Server.Amd64.VS2019.Open
name: NetCore1ESPool-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-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2019
# Double the default timeout.
timeoutInMinutes: 180
workspace:
Expand Down