Skip to content

Pipelines | Name the agent image parameter poolImage everywhere and require it #4626

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
paulmedynski merged 4 commits into from
Sep 10, 2026
Merged

Pipelines | Name the agent image parameter poolImage everywhere and require it #4626

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
19ca6aa
Name the agent image parameter poolImage everywhere and require it
paulmedynski Sep 2, 2026
d883d89
Fixed botched rebase conflict resolution.
paulmedynski Sep 8, 2026
c88fd44
Pipelines | Finish the vmImage -> poolImage rename in kerberos and MI…
paulmedynski Sep 8, 2026
3d441a2
Merge branch 'main' into dev/paul/pool-image
paulmedynski Sep 9, 2026
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
13 changes: 9 additions & 4 deletions eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ parameters:
- Linux
- Windows

# The pool VM image to use. The pool named by poolName must provide an image with this name.
#
# NOTE: This value is evaluated at template-expansion (compile) time to select the pool image, so
# it must be a literal and must not contain any runtime expressions (e.g. $(...) macros or
# $[...] runtime expressions).
- name: poolImage
type: string

- name: poolName
type: string

Expand All @@ -48,9 +56,6 @@ parameters:
type: boolean
default: false

- name: vmImage
type: string

jobs:
- job: kerberos_tests_job_${{ parameters.jobNameSuffix }}
displayName: ${{ parameters.displayName }}
Expand All @@ -62,7 +67,7 @@ jobs:
pool:
name: ${{ parameters.poolName }}
demands:
- ImageOverride -equals ${{ parameters.vmImage }}
- ImageOverride -equals ${{ parameters.poolImage }}

steps:

Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ stages:
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
operatingSystem: Windows
poolImage: ADO-Win25
poolName: ADO-Trusted-Domain-Win-WestUS2
runtime: ${{ runtime }}
useManagedSNI: false
vmImage: ADO-Win25

# .NET runs with both native and managed SNI.
- ${{ each runtime in parameters.netTestRuntimes }}:
Expand All @@ -67,10 +67,10 @@ stages:
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
operatingSystem: Windows
poolImage: ADO-Win25
poolName: ADO-Trusted-Domain-Win-WestUS2
runtime: ${{ runtime }}
useManagedSNI: false
vmImage: ADO-Win25

- template: /eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml@self
parameters:
Expand All @@ -80,10 +80,10 @@ stages:
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
operatingSystem: Windows
poolImage: ADO-Win25
poolName: ADO-Trusted-Domain-Win-WestUS2
runtime: ${{ runtime }}
useManagedSNI: true
vmImage: ADO-Win25

- stage: linux
displayName: Linux
Expand All @@ -102,6 +102,6 @@ stages:
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
operatingSystem: Linux
poolImage: ADO-UB24
poolName: ADO-Trusted-Linux-WestUS2
runtime: ${{ runtime }}
vmImage: ADO-UB24
4 changes: 2 additions & 2 deletions eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ parameters:
# NOTE: This value is evaluated at template-expansion (compile) time to select the pool image, so
# it must be a literal and must not contain any runtime expressions (e.g. $(...) macros or
# $[...] runtime expressions).
- name: vmImage
- name: poolImage
Comment thread
paulmedynski marked this conversation as resolved.
type: string

jobs:
Expand All @@ -93,7 +93,7 @@ jobs:
pool:
name: Managed-Instance-pool
demands:
- imageOverride -equals ${{ parameters.vmImage }}
- imageOverride -equals ${{ parameters.poolImage }}

steps:

Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ stages:
displayName: 'Win : Native SNI : ${{ runtime }}'
jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
operatingSystem: Windows
poolImage: ADO-Win25
runtime: ${{ runtime }}
useManagedSNI: false
vmImage: ADO-Win25

# .NET runs with both native and managed SNI.
- ${{ each runtime in parameters.netTestRuntimes }}:
Expand All @@ -65,9 +65,9 @@ stages:
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
operatingSystem: Windows
poolImage: ADO-Win25
runtime: ${{ runtime }}
useManagedSNI: false
vmImage: ADO-Win25

- template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
parameters:
Expand All @@ -77,9 +77,9 @@ stages:
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
operatingSystem: Windows
poolImage: ADO-Win25
runtime: ${{ runtime }}
useManagedSNI: true
vmImage: ADO-Win25

- stage: linux
displayName: Linux
Expand All @@ -96,5 +96,5 @@ stages:
jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
operatingSystem: Linux
poolImage: ADO-UB24
runtime: ${{ runtime }}
vmImage: ADO-UB24
9 changes: 6 additions & 3 deletions eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ parameters:

# The agent image to use for the build. This must exist in both the ADO-1ES-Pool and
# ADO-CI-1ES-Pool agent pools.
- name: agentImage
displayName: Agent Image
#
# This keeps a default so that manual runs can pick a Windows agent when that is what we
# want to validate.
- name: poolImage
Comment thread
paulmedynski marked this conversation as resolved.
Comment thread
paulmedynski marked this conversation as resolved.
displayName: Pool Image
type: string
default: ADO-UB24
values:
Expand Down Expand Up @@ -98,7 +101,7 @@ jobs:
${{ else }}:
name: ADO-CI-1ES-Pool
demands:
- ImageOverride -equals ${{ parameters.agentImage }}
- ImageOverride -equals ${{ parameters.poolImage }}

steps:

Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ parameters:
type: string

# The pool VM image to use, which must exist in the specified pool.
- name: vmImage
- name: poolImage
type: string

jobs:
Expand Down Expand Up @@ -167,11 +167,11 @@ jobs:

# Images provided by Azure Pipelines must be selected using 'vmImage'.
${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
vmImage: ${{ parameters.vmImage }}
vmImage: ${{ parameters.poolImage }}
# Images provided by 1ES must be selected using a demand.
${{ else }}:
demands:
- imageOverride -equals ${{ parameters.vmImage }}
- imageOverride -equals ${{ parameters.poolImage }}

steps:

Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ stages:
parameters:
debug: ${{ parameters.debug }}
poolName: $(ci_var_defaultPoolName)
vmImage: ADO-UB24
poolImage: ADO-UB24

# Run the stress tests.
- template: /eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml@self
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ stages:
parameters:
saPassword: $(saPassword)
poolName: ${{ parameters.poolName }}
vmImage: ADO-UB24-SQL25
poolImage: ADO-UB24-SQL25

# ----------------------------------------------------------------------------------------------
# Build and test on Windows
Expand All @@ -120,7 +120,7 @@ stages:
# The Windows images include a suitable .NET Framework runtime, so we don't have to install
# one explicitly.
poolName: ${{ parameters.poolName }}
vmImage: ADO-MMS25-SQL25
poolImage: ADO-MMS25-SQL25

# ----------------------------------------------------------------------------------------------
# Build and test on macOS.
Expand All @@ -144,4 +144,4 @@ stages:
# Our 1ES pools do not offer macOS images, so this job runs on the Microsoft-hosted
# 'Azure Pipelines' pool.
poolName: Azure Pipelines
vmImage: macos-latest
poolImage: macos-latest
7 changes: 3 additions & 4 deletions eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ parameters:
- name: poolName
type: string

# The imageOverride capability required from the 1ES pool.
- name: imageOverride
# The name of the VM image to run on, within the pool.
- name: poolImage
type: string
default: ADO-Win25

# The name of the Abstractions pipeline artifact to download when referenceType is 'Package'.
- name: abstractionsArtifactsName
Expand Down Expand Up @@ -86,7 +85,7 @@ jobs:
pool:
name: ${{parameters.poolName }}
demands:
- imageOverride -equals ${{ parameters.imageOverride }}
- imageOverride -equals ${{ parameters.poolImage }}

variables:
- template: /eng/pipelines/libraries/ci-build-variables.yml@self
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ parameters:
type: string

# The name of the VM image to run on, within the pool.
- name: vmImage
- name: poolImage
type: string
default: ADO-UB24

jobs:
- job: publish_code_coverage
Expand All @@ -40,7 +39,7 @@ jobs:
name: ${{ parameters.poolName }}

demands:
- imageOverride -equals ${{ parameters.vmImage }}
- imageOverride -equals ${{ parameters.poolImage }}

variables:
# Use a temp directory that is cleaned up after each job runs. This helps
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ parameters:
default: false

# The VM image to use, which must exist in the specified pool.
- name: image
- name: poolImage
type: string

# The display name for this job.
Expand Down Expand Up @@ -147,7 +147,7 @@ parameters:
type: string

jobs:
- job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
- job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.poolImage, 'unknown_image')) }}

# Some of our tests take longer than the default 60 minutes to run on some
# OSes and configurations.
Expand All @@ -158,11 +158,11 @@ jobs:

# Images provided by Azure Pipelines must be selected using 'vmImage'.
${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
vmImage: ${{ parameters.image }}
vmImage: ${{ parameters.poolImage }}
# Images provided by 1ES must be selected using a demand.
${{ else }}:
demands:
- imageOverride -equals ${{ parameters.image }}
- imageOverride -equals ${{ parameters.poolImage }}

variables:
- name: dotnetx86RootPath
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ stages:
referenceType: ${{ parameters.referenceType }}
timeout: ${{ parameters.testJobTimeout }}
poolName: ${{ config.value.pool }}
image: ${{ image.value }}
poolImage: ${{ image.value }}
jobDisplayName: ${{ format('{0}_{1}_{2}', replace(targetFramework, '.', '_'), platform, testSet) }}
configProperties: ${{ config.value.configProperties }}
abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
Expand Down Expand Up @@ -136,7 +136,7 @@ stages:
referenceType: ${{ parameters.referenceType }}
timeout: ${{ parameters.testJobTimeout }}
poolName: ${{ config.value.pool }}
image: ${{ image.value }}
poolImage: ${{ image.value }}
${{if eq(usemanagedSNI, 'true') }}:
jobDisplayName: ${{ format('{0}_{1}_{2}_{3}', replace(targetFramework, '.', '_'), platform, 'ManagedSNI', testSet) }}
${{ else }}:
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/dotnet-sqlclient-ci-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,14 @@ stages:
- template: /eng/pipelines/stages/compute-versions-ci-stage.yml@self
parameters:
poolName: ${{ parameters.defaultPoolName }}
poolImage: ADO-UB24
buildSuffix: ${{ parameters.buildSuffix }}

# Generate secrets used throughout the pipeline.
- template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
parameters:
poolName: ${{ parameters.defaultPoolName }}
poolImage: ADO-UB24
debug: ${{ parameters.debug }}

# Build the SqlServer package, and publish it to the pipeline artifacts
Expand Down Expand Up @@ -276,6 +278,7 @@ stages:
- template: /eng/pipelines/stages/verify-nuget-packages-ci-stage.yml@self
parameters:
poolName: ${{ parameters.defaultPoolName }}
poolImage: ADO-Win25
abstractionsArtifactsName: $(abstractionsArtifactsName)
azureArtifactsName: $(azureArtifactsName)
loggingArtifactsName: $(loggingArtifactsName)
Expand Down Expand Up @@ -324,6 +327,7 @@ stages:
parameters:
debug: ${{ parameters.debug }}
poolName: ${{ parameters.defaultPoolName }}
poolImage: ADO-UB24
# We only want to upload coverage results to CodeCov from certain
# pipelines. We use the pipeline name (Build.DefinitionName) to
# choose. This is a predefined variable that is available at
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ parameters:
type: string

# The name of the VM image to run on, within the pool.
- name: vmImage
- name: poolImage
type: string
default: ADO-UB24

jobs:

Expand All @@ -91,7 +90,7 @@ jobs:
name: ${{ parameters.poolName }}

demands:
- imageOverride -equals ${{ parameters.vmImage }}
- imageOverride -equals ${{ parameters.poolImage }}

variables:

Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/jobs/pack-azure-package-ci-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ parameters:
type: string

# The name of the VM image to run on, within the pool.
- name: vmImage
- name: poolImage
type: string
default: ADO-UB24

jobs:

Expand All @@ -97,7 +96,7 @@ jobs:
name: ${{ parameters.poolName }}

demands:
- imageOverride -equals ${{ parameters.vmImage }}
- imageOverride -equals ${{ parameters.poolImage }}

variables:

Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/jobs/pack-logging-package-ci-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ parameters:
type: string

# The name of the VM image to run on, within the pool.
- name: vmImage
- name: poolImage
type: string
default: ADO-UB24

jobs:

Expand All @@ -74,7 +73,7 @@ jobs:
name: ${{ parameters.poolName }}

demands:
- imageOverride -equals ${{ parameters.vmImage }}
- imageOverride -equals ${{ parameters.poolImage }}

variables:

Expand Down
Loading
Loading