diff --git a/eng/pipelines/ci-device-tests.yml b/eng/pipelines/ci-device-tests.yml index ff062fd51557..b014a25e4f4c 100644 --- a/eng/pipelines/ci-device-tests.yml +++ b/eng/pipelines/ci-device-tests.yml @@ -53,8 +53,11 @@ parameters: - name: windowsPool type: object default: - name: Azure Pipelines - vmImage: windows-2022 + name: NetCore-Public + demands: + - ImageOverride -equals 1es-windows-2022-open + image: 1es-windows-2022-open + os: Windows - name: macOSTestPool type: object diff --git a/eng/pipelines/ci-uitests.yml b/eng/pipelines/ci-uitests.yml index cb180db4d720..47eca529d4fd 100644 --- a/eng/pipelines/ci-uitests.yml +++ b/eng/pipelines/ci-uitests.yml @@ -82,14 +82,16 @@ parameters: - name: windowsBuildPool type: object default: - name: $(windowsVmPool) - vmImage: $(windowsVmImage) - + name: NetCore-Public + demands: + - ImageOverride -equals 1es-windows-2022-open + - name: windowsPool type: object default: - name: $(windowsTestsVmPool) - vmImage: $(windowsTestsVmImage) + name: NetCore-Public + demands: + - ImageOverride -equals 1es-windows-2022-open - name: macosPool type: object diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 7ce4d959124c..6ecbe1fbfc88 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -54,7 +54,8 @@ parameters: type: object default: - name: NetCore1ESPool-Internal - image: 1es-windows-2022 + demands: + - ImageOverride -equals 1es-windows-2022 os: Windows buildScript: $(_buildScript) sln: '$(Build.SourcesDirectory)/Microsoft.Maui.sln' @@ -68,7 +69,8 @@ parameters: type: object default: - name: NetCore-Public - image: 1es-windows-2022 + demands: + - ImageOverride -equals 1es-windows-2022-open os: Windows buildScript: $(_buildScript) sln: '$(Build.SourcesDirectory)/Microsoft.Maui.sln' @@ -83,11 +85,13 @@ parameters: default: internal: name: NetCore1ESPool-Internal - image: 1es-windows-2022 + demands: + - ImageOverride -equals 1es-windows-2022 os: windows public: name: NetCore-Public - image: 1es-windows-2022 + demands: + - ImageOverride -equals 1es-windows-2022-open os: windows - name: MacOSPool