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

Automatic pool selection release/dev17.0 vs deps #65008

Closed
wants to merge 4 commits into from
Closed

Automatic pool selection release/dev17.0 vs deps #65008

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
b5c4340
First, an arcade update
MattGal Oct 25, 2022
803ab64
Use the new pool-providers.yml to automatically pick up pool to use
MattGal Oct 25, 2022
93689f7
Testing: Is system.pullRequest.targetBranch case sensitive
MattGal Oct 26, 2022
551d6b1
Merge branch 'release/dev17.0-vs-deps' into automatic-pool-selection-…
MattGal Oct 26, 2022
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
4 changes: 3 additions & 1 deletion azure-pipelines-integration-lsp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ pr:

jobs:
- job: VS_Integration_LSP
variables:
- template: /eng/common/templates/variables/pool-providers.yml
pool:
name: NetCore-Svc-Public
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
timeoutInMinutes: 135

Expand Down
4 changes: 3 additions & 1 deletion azure-pipelines-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ pr:

jobs:
- job: VS_Integration
variables:
- template: /eng/common/templates/variables/pool-providers.yml
pool:
name: NetCore-Svc-Public
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
strategy:
maxParallel: 4
Expand Down
7 changes: 4 additions & 3 deletions azure-pipelines-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,14 @@ variables:
value: '[Auto Insertion]'
- name: Insertion.TitleSuffix
value: ''
- template: /eng/common/templates/variables/pool-providers.yml

stages:

- stage: build
displayName: Build and Test
pool:
name: NetCore1ESPool-Svc-Internal
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64

jobs:
Expand Down Expand Up @@ -308,7 +309,7 @@ stages:
dependsOn:
- OfficialBuild
pool:
name: NetCore1ESPool-Svc-Internal
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64

- stage: insert
Expand All @@ -320,7 +321,7 @@ stages:
- job: insert
displayName: Insert to VS
pool:
name: NetCore1ESPool-Svc-Internal
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64
steps:
- download: current
Expand Down
7 changes: 4 additions & 3 deletions azure-pipelines-richnav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ pr: none

jobs:
- job: RichCodeNav_Indexing
pool:
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2022.amd64.open
variables:
EnableRichCodeNavigation: true
- template: /eng/common/templates/variables/pool-providers.yml
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
timeoutInMinutes: 200

steps:
Expand Down
14 changes: 11 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,25 @@ pr:
- features/*
- demos/*

variables:
- template: /eng/common/templates/variables/pool-providers.yml

# Windows Build and Test Jobs
jobs:
- template: eng/pipelines/build-windows-job.yml
parameters:
jobName: Build_Windows_Debug
testArtifactName: Transport_Artifacts_Windows_Debug
configuration: Debug
poolName: $(DncEngPublicBuildPool)
queueName: windows.vs2022.amd64.open

- template: eng/pipelines/build-windows-job.yml
parameters:
jobName: Build_Windows_Release
testArtifactName: Transport_Artifacts_Windows_Release
configuration: Release
poolName: $(DncEngPublicBuildPool)
queueName: windows.vs2022.amd64.open

- template: eng/pipelines/test-windows-job.yml
Expand Down Expand Up @@ -65,6 +70,7 @@ jobs:
testArtifactName: Transport_Artifacts_Windows_Debug
configuration: Debug
testArguments: -testCoreClr
poolName: $(DncEngPublicBuildPool)

- template: eng/pipelines/test-windows-job.yml
parameters:
Expand Down Expand Up @@ -117,6 +123,7 @@ jobs:
jobName: Build_Unix_Debug
testArtifactName: Transport_Artifacts_Unix_Debug
configuration: Debug
poolName: $(DncEngPublicBuildPool)
queueName: Build.Ubuntu.1804.Amd64.Open

- template: eng/pipelines/test-unix-job.yml
Expand All @@ -136,6 +143,7 @@ jobs:
testArtifactName: Transport_Artifacts_Unix_Debug
configuration: Debug
testArguments: --testCoreClr
poolName: $(DncEngPublicBuildPool)
queueName: Build.Ubuntu.1804.Amd64.Open

- template: eng/pipelines/test-unix-job.yml
Expand All @@ -153,7 +161,7 @@ jobs:

- job: Correctness_Determinism
pool:
name: NetCore-Svc-Public
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
timeoutInMinutes: 90
steps:
Expand All @@ -169,7 +177,7 @@ jobs:

- job: Correctness_Build
pool:
name: NetCore-Svc-Public
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
timeoutInMinutes: 90
steps:
Expand Down Expand Up @@ -201,7 +209,7 @@ jobs:

- job: Correctness_Rebuild
pool:
name: NetCore-Svc-Public
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
timeoutInMinutes: 90
steps:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ variables:
# Coalesce the target and source branches so we know when a PR targets a release branch
# If these variables are somehow missing, fall back to main (tends to have more capacity)
- name: BranchNameForPoolSelection
value: ${{ coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main') }}
value: ${{ coalesce(variables['system.pullRequest.targetBranch'], variables['Build.SourceBranch'], 'refs/heads/main') }}

# Any new -Svc alternative pools should have variables added here to allow for splitting work

Expand Down
5 changes: 4 additions & 1 deletion eng/pipelines/build-unix-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ parameters:
- name: configuration
type: string
default: 'Debug'
- name: poolName
type: string
default: 'NetCore-Svc-Public'
- name: queueName
type: string
default: ''
Expand All @@ -20,7 +23,7 @@ jobs:
- job: ${{ parameters.jobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCore-Svc-Public
name: ${{ parameters.poolName }}
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
Expand Down
5 changes: 4 additions & 1 deletion eng/pipelines/build-windows-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ parameters:
- name: configuration
type: string
default: 'Debug'
- name: poolName
type: string
default: 'NetCore-Svc-Public'
- name: queueName
type: string
default: ''
Expand All @@ -23,7 +26,7 @@ jobs:
- job: ${{ parameters.jobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCore-Svc-Public
name: ${{ parameters.poolName }}
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
Expand Down
5 changes: 4 additions & 1 deletion eng/pipelines/test-unix-job-single-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ parameters:
- name: testArguments
type: string
default: ''
- name: poolName
type: string
default: 'NetCore-Svc-Public'
- name: queueName
type: string
default: ''
Expand All @@ -30,7 +33,7 @@ jobs:
dependsOn: ${{ parameters.buildJobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCore-Svc-Public
name: ${{ parameters.poolName }}
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
Expand Down
5 changes: 4 additions & 1 deletion eng/pipelines/test-windows-job-single-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ parameters:
- name: testArguments
type: string
default: ''
- name: poolName
type: string
default: 'NetCore-Svc-Public'
- name: queueName
type: string
default: 'windows.vs2022.amd64.open'
Expand All @@ -26,7 +29,7 @@ jobs:
- job: ${{ parameters.jobName }}
dependsOn: ${{ parameters.buildJobName }}
pool:
name: NetCore-Svc-Public
name: ${{ parameters.poolName }}
demands: ImageOverride -equals ${{ parameters.queueName }}
timeoutInMinutes: 120
variables:
Expand Down