diff --git a/eng/pipelines/common/device-tests.yml b/eng/pipelines/common/device-tests.yml index f6e10671122c..8b426a7e7dc4 100644 --- a/eng/pipelines/common/device-tests.yml +++ b/eng/pipelines/common/device-tests.yml @@ -1,6 +1,5 @@ parameters: androidPool: { } - androidPoolX64: { } iosPool: { } catalystPool: { } windowsPool: { } diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml index 015bacfa2b83..1070fc578b83 100644 --- a/eng/pipelines/device-tests.yml +++ b/eng/pipelines/device-tests.yml @@ -64,19 +64,10 @@ parameters: - name: androidPool type: object default: - name: $(androidTestsVmPool) + name: $(1ESPTPool) vmImage: $(androidTestsVmImage) demands: - - macOS.Name -equals Sequoia - - - name: androidPoolX64 - type: object - default: - name: $(androidTestsVmPool) - vmImage: $(androidTestsVmImage) - demands: - - macOS.Name -equals Sequoia - - macOS.Architecture -equals x64 + - ImageOverride -equals 1ESPT-Ubuntu22.04 - name: iosPool type: object @@ -118,7 +109,6 @@ stages: - template: common/device-tests.yml parameters: androidPool: ${{ parameters.androidPool }} - androidPoolX64: ${{ parameters.androidPoolX64 }} iosPool: ${{ parameters.iosPool }} catalystPool: ${{ parameters.catalystPool }} windowsPool: ${{ parameters.windowsPool }}