diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index f868c3d953fb1..3cc56e8e6d3ec 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -54,3 +54,4 @@ variables: eq(variables['isRollingBuild'], true))) ] - template: /eng/pipelines/common/perf-variables.yml +- template: /eng/common/templates/variables/pool-providers.yml diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 743f6a42531bc..20cda06bf35e2 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -19,7 +19,6 @@ jobs: shouldContinueOnError: ${{ or(eq(parameters.shouldContinueOnError, true), and(ne(parameters.shouldContinueOnError, 'forceFalse'), endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest'))) }} variables: - - template: /eng/common/${{ coalesce(parameters.jobParameters.templatePath, 'templates') }}/variables/pool-providers.yml # Disable component governance in our CI builds. These builds are not shipping nor # are they a service. Also the component governance jobs issue lots of inconsequential # warnings and errors into our build timelines that make it hard to track down diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index ba09a957605eb..adbfaed6e206e 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -26,6 +26,8 @@ variables: - template: /eng/pipelines/common/internal-variables.yml parameters: teamName: dotnet-core-acquisition +# Override the pool provider template so we use the 1ES version internally +- template: /eng/common/templates-official/variables/pool-providers.yml extends: template: /eng/pipelines/common/templates/pipeline-with-resources.yml