From c252d87573238ada4dfe7a234276003492288161 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Tue, 18 Jun 2024 13:33:01 -0500 Subject: [PATCH] build: make the agent pool selection more robust (#33429) We are no longer exclusively using one organization named "ms" and one organization not named "ms". This change flips the sense of the organization comparison so the `OSS` agents can be used for every collection except very specifically the Microsoft one. I also switched to using its ID. --- .pipelines/ci/templates/build-powertoys-ci.yml | 6 +++--- .pipelines/ci/templates/build-powertoys-precheck.yml | 6 +++--- .pipelines/ci/templates/run-ui-tests-ci.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pipelines/ci/templates/build-powertoys-ci.yml b/.pipelines/ci/templates/build-powertoys-ci.yml index 19f2ff864d..177313e117 100644 --- a/.pipelines/ci/templates/build-powertoys-ci.yml +++ b/.pipelines/ci/templates/build-powertoys-ci.yml @@ -24,10 +24,10 @@ jobs: NODE_OPTIONS: --max_old_space_size=16384 pool: demands: ImageOverride -equals SHINE-VS17-Latest - ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: - name: SHINE-OSS-L - ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: + ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}: name: SHINE-INT-L + ${{ else }}: + name: SHINE-OSS-L timeoutInMinutes: 120 strategy: maxParallel: 10 diff --git a/.pipelines/ci/templates/build-powertoys-precheck.yml b/.pipelines/ci/templates/build-powertoys-precheck.yml index 14f1b01b3b..7601289652 100644 --- a/.pipelines/ci/templates/build-powertoys-precheck.yml +++ b/.pipelines/ci/templates/build-powertoys-precheck.yml @@ -3,10 +3,10 @@ jobs: - job: Precheck pool: demands: ImageOverride -equals SHINE-VS17-Latest - ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: - name: SHINE-OSS-L - ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: + ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}: name: SHINE-INT-L + ${{ else }}: + name: SHINE-OSS-L steps: - checkout: none diff --git a/.pipelines/ci/templates/run-ui-tests-ci.yml b/.pipelines/ci/templates/run-ui-tests-ci.yml index 8d0b550299..e08c08ff7a 100644 --- a/.pipelines/ci/templates/run-ui-tests-ci.yml +++ b/.pipelines/ci/templates/run-ui-tests-ci.yml @@ -9,10 +9,10 @@ jobs: variables: SrcPath: $(Build.Repository.LocalPath) pool: - ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: - name: SHINE-OSS-Testing-x64 - ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: + ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}: name: SHINE-INT-Testing-x64 + ${{ else }}: + name: SHINE-OSS-Testing-x64 steps: - checkout: self fetchDepth: 1