github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ensure that cmake-generate.tests.yml properly handles various os differences

Browse Source
This commit is contained in:
Scott Beddall (from Dev Box) 2024-03-11 16:08:12 -07:00
parent 8d3d6e857d
commit 6ae194fbf3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eng/pipelines/templates/jobs/cmake-generate-jobs.yml
View File

@ -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 }}

7
eng/pipelines/templates/jobs/cmake-generate.tests.yml
View File

@ -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') }}: