From bd13a5309dccf36951f764b07ff8b0c830a7f935 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Wed, 23 Sep 2026 12:22:02 -0700 Subject: [PATCH] Use engineering Windows pool for PR integration jobs Route CLI option coverage and the scaffold integration matrix to the same public Windows image as the PR build jobs. Keep the official integration matrix on its internal image and leave hosted macOS unchanged. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2ff0cd05-fdd3-47bb-8b0c-983417c3829c --- azure-pipelines-pr.yml | 4 ++-- eng/pipelines/scaffold-integration-matrix.yml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml index 407d0044ed..ead412376f 100644 --- a/azure-pipelines-pr.yml +++ b/azure-pipelines-pr.yml @@ -197,5 +197,5 @@ stages: - template: /eng/pipelines/scaffold-integration-matrix.yml parameters: buildConfig: Release - poolVmImage: windows-latest - + poolName: $(DncEngPublicBuildPool) + poolDemands: ImageOverride -equals 1es-windows-2022-open diff --git a/eng/pipelines/scaffold-integration-matrix.yml b/eng/pipelines/scaffold-integration-matrix.yml index 35c4fa0048..ce4e8cc274 100644 --- a/eng/pipelines/scaffold-integration-matrix.yml +++ b/eng/pipelines/scaffold-integration-matrix.yml @@ -12,6 +12,9 @@ parameters: - name: poolImage type: string default: '' +- name: poolDemands + type: string + default: '' - name: poolVmImage type: string default: '' @@ -26,6 +29,8 @@ jobs: name: ${{ parameters.poolName }} ${{ if ne(parameters.poolImage, '') }}: image: ${{ parameters.poolImage }} + ${{ if ne(parameters.poolDemands, '') }}: + demands: ${{ parameters.poolDemands }} ${{ if ne(parameters.poolVmImage, '') }}: vmImage: ${{ parameters.poolVmImage }} steps: @@ -87,6 +92,8 @@ jobs: name: ${{ parameters.poolName }} ${{ if ne(parameters.poolImage, '') }}: image: ${{ parameters.poolImage }} + ${{ if ne(parameters.poolDemands, '') }}: + demands: ${{ parameters.poolDemands }} ${{ if ne(parameters.poolVmImage, '') }}: vmImage: ${{ parameters.poolVmImage }} strategy: