diff --git a/eng/pipelines/templates/jobs/cmake-generate-jobs.yml b/eng/pipelines/templates/jobs/cmake-generate-jobs.yml index 07001d6f8..bd81036d8 100644 --- a/eng/pipelines/templates/jobs/cmake-generate-jobs.yml +++ b/eng/pipelines/templates/jobs/cmake-generate-jobs.yml @@ -27,8 +27,8 @@ jobs: Selection: all GenerateVMJobs: true JobTemplatePath: /eng/pipelines/templates/jobs/cmake-generate.tests.yml - OsVmImage: $(LINUXVMIMAGE) - Pool: $(LINUXPOOL) + OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt + Pool: azsdk-pool-mms-ubuntu-2004-general GenerateJobName: generate_matrix_cmake AdditionalParameters: Artifacts: ${{ parameters.Artifacts }} @@ -43,8 +43,8 @@ jobs: Selection: all GenerateVMJobs: true JobTemplatePath: /eng/pipelines/templates/jobs/cmake-generate.tests.yml - OsVmImage: $(LINUXVMIMAGE) - Pool: $(LINUXPOOL) + OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt + Pool: azsdk-pool-mms-ubuntu-2004-general GenerateJobName: generate_matrix_cmake_source AdditionalParameters: Artifacts: ${{ parameters.ArtifactsSource }} diff --git a/eng/pipelines/templates/jobs/cmake-generate.tests.yml b/eng/pipelines/templates/jobs/cmake-generate.tests.yml index 76cf41eeb..74c820af4 100644 --- a/eng/pipelines/templates/jobs/cmake-generate.tests.yml +++ b/eng/pipelines/templates/jobs/cmake-generate.tests.yml @@ -52,7 +52,12 @@ jobs: pool: name: $(Pool) - vmImage: $(OSVmImage) + # 1es pipeline templates converts `image` to demands: ImageOverride under the hood + # which is incompatible with image selection in the default non-1es hosted pools + ${{ if eq(parameters.OSName, 'macOS') }}: + vmImage: $(OSVmImage) + ${{ else }}: + image: $(OSVmImage) os: ${{ parameters.OSName }} ${{ if eq(parameters.UsePlatformContainer, 'true') }}: