Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
8 changes: 4 additions & 4 deletions eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ parameters:
- diagnostic

variables:
# Provides 'general_purpose_pool_name', the 1ES pool that hosts most jobs in this project.
- group: sqlclient_pipeline_config

# Whether this is an internal (ADO.Net project) or public (Public project) build.
- name: isInternalBuild
value: ${{ eq(variables['System.TeamProject'], 'ADO.Net') }}
Expand All @@ -96,10 +99,7 @@ jobs:
displayName: Build NuGet Packages

pool:
${{ if eq(variables.isInternalBuild, true) }}:
name: ADO-1ES-Pool
${{ else }}:
name: ADO-CI-1ES-Pool
name: $(general_purpose_pool_name)
demands:
- ImageOverride -equals ${{ parameters.poolImage }}

Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ stages:
- template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
parameters:
debug: ${{ parameters.debug }}
poolName: $(ci_var_defaultPoolName)
poolName: $(general_purpose_pool_name)
poolImage: ADO-UB24

# Run the stress tests.
- template: /eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml@self
parameters:
poolName: $(ci_var_defaultPoolName)
poolName: $(general_purpose_pool_name)
buildConfiguration: ${{ parameters.buildConfiguration }}
debug: ${{ parameters.debug }}
warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
Expand Down
14 changes: 7 additions & 7 deletions eng/pipelines/dotnet-sqlclient-ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,21 @@ parameters:
- Debug
- Release

# The name of the 1ES pool that all CI jobs run in.
# The name of the general-purpose 1ES pool that all CI jobs run in.
#
# This is the single place in the CI pipelines where the pool name is read
# from a variable group; every stage and job below receives it as a
# parameter so that the value flows down from here.
#
# 'ci_var_defaultPoolName' is defined in the 'ADO Build properties' variable
# group (see /eng/pipelines/libraries/ci-build-variables.yml), for both the
# Public and ADO.Net projects. The PR pipelines are configured from a
# different variable group and use '$(PoolNameDefault)' instead; see
# /eng/pipelines/pr/sqlclient-pr-pipeline.yml.
# 'general_purpose_pool_name' is defined in the 'sqlclient_pipeline_config'
# variable group (see /eng/pipelines/libraries/ci-build-variables.yml), for
# both the Public and ADO.Net projects, and names each project's own pool.
# Special-purpose pools, such as the Always Encrypted and ARM64 pools used
# below, are still named directly.
#
- name: defaultPoolName
type: string
default: $(ci_var_defaultPoolName)
default: $(general_purpose_pool_name)

# The timeout, in minutes, for each test job.
- name: testJobTimeout
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/github-sync-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- job: SyncGitHub
displayName: Sync GitHub to ADO
pool:
name: $(ci_var_defaultPoolName)
name: $(general_purpose_pool_name)
demands:
- imageOverride -equals ADO-UB24

Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/libraries/ci-build-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# The buildSuffix itself is set by each pipeline via the core template parameter.

variables:
- group: sqlclient_pipeline_config
- group: ADO Build properties
- group: ADO Test Configuration Properties

Expand Down
13 changes: 6 additions & 7 deletions eng/pipelines/pr/sqlclient-pr-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,14 @@ variables:
- template: /eng/pipelines/pr/variables/pr-variables.yml@self

stages:
# NOTE: '$(PoolNameDefault)' comes from the 'sqlclient-testconfig-v1'
# NOTE: '$(general_purpose_pool_name)' comes from the 'sqlclient_pipeline_config'
# variable group, which is imported by
# /eng/pipelines/pr/variables/pr-variables.yml (included above). It is
# referenced here, at the pipeline root, and passed down to every stage as a
# parameter, so that no template reads the pool name from a variable group
# directly.
#
# The CI pipelines are configured from a different variable group and use
# '$(ci_var_defaultPoolName)' instead; see
# The same variable group and variable are used by the CI pipelines; see
# /eng/pipelines/dotnet-sqlclient-ci-core.yml.

# Stage 1a: Build and pack all projects in the repository
Expand All @@ -121,14 +120,14 @@ stages:
buildSuffix: pr
stageName: ${{ variables.stageNamePack }}
packArtifactBaseName: ${{ variables.packArtifactBaseName }}
poolName: $(PoolNameDefault)
poolName: $(general_purpose_pool_name)
poolImage: ADO-UB24

# Stage 1b: Generate secrets
- template: /eng/pipelines/pr/stages/generate-secrets-stage.yml@self
parameters:
stageName: ${{ variables.stageNameSecrets }}
poolName: $(PoolNameDefault)
poolName: $(general_purpose_pool_name)
poolImage: ADO-UB24

# Stage 2: Execute tests and collect code coverage
Expand All @@ -137,7 +136,7 @@ stages:
buildConfiguration: Debug
buildSuffix: pr
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
poolName: $(PoolNameDefault)
poolName: $(general_purpose_pool_name)
stageNamePack: ${{ variables.stageNamePack }}
stageNameSecrets: ${{ variables.stageNameSecrets }}
testResultsArtifactBaseName: ${{ variables.testResultsArtifactBaseName }}
Expand All @@ -159,7 +158,7 @@ stages:
- template: /eng/pipelines/pr/stages/collect-coverage-stage.yml@self
parameters:
coverageArtifactBaseName: ${{ variables.coverageArtifactBaseName }}
poolName: $(PoolNameDefault)
poolName: $(general_purpose_pool_name)
poolImage: ADO-UB24
dependsOn:
- ${{ each platform in parameters.platforms }}:
Expand Down
3 changes: 3 additions & 0 deletions eng/pipelines/pr/variables/pr-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ variables:
# UserManagedIdentityClientId
- group: sqlclient-testconfig-v1

# Provides 'general_purpose_pool_name', the 1ES pool that hosts most jobs in this project.
- group: sqlclient_pipeline_config

# General Variables ======================================================

# Name to use for the packaging stage. This is to ensure that the packaging stage and the test
Expand Down
Loading