From 660ae6830654586c48f637951937ff6dfe8fe093 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 8 Apr 2024 13:25:06 -0400 Subject: [PATCH 1/3] Move pool provider import to the global variable section --- eng/pipelines/common/xplat-setup.yml | 1 - eng/pipelines/runtime-official.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 743f6a42531bcc..20cda06bf35e2a 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 ba09a957605eb9..7f3d41f5f9163d 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -26,6 +26,7 @@ variables: - template: /eng/pipelines/common/internal-variables.yml parameters: teamName: dotnet-core-acquisition +- template: /eng/common/templates-official/templates/variables/pool-providers.yml extends: template: /eng/pipelines/common/templates/pipeline-with-resources.yml From 74817cd6936e68f98813d0dc192ac27d40d92391 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 8 Apr 2024 22:09:50 -0400 Subject: [PATCH 2/3] Add to the public template --- eng/pipelines/runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 98dc5285250f45..c97416025b2a70 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -53,6 +53,7 @@ pr: variables: - template: /eng/pipelines/common/variables.yml + - template: /eng/common/templates/variables/pool-providers.yml extends: template: /eng/pipelines/common/templates/pipeline-with-resources.yml From 22948abe52794e7d22534feb8fa9b110bf947169 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 9 Apr 2024 09:39:08 -0400 Subject: [PATCH 3/3] PR feedback --- eng/pipelines/common/variables.yml | 1 + eng/pipelines/runtime-official.yml | 3 ++- eng/pipelines/runtime.yml | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index f868c3d953fb1e..3cc56e8e6d3ece 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/runtime-official.yml b/eng/pipelines/runtime-official.yml index 7f3d41f5f9163d..adbfaed6e206e3 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -26,7 +26,8 @@ variables: - template: /eng/pipelines/common/internal-variables.yml parameters: teamName: dotnet-core-acquisition -- template: /eng/common/templates-official/templates/variables/pool-providers.yml +# 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 diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index c97416025b2a70..98dc5285250f45 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -53,7 +53,6 @@ pr: variables: - template: /eng/pipelines/common/variables.yml - - template: /eng/common/templates/variables/pool-providers.yml extends: template: /eng/pipelines/common/templates/pipeline-with-resources.yml