From 7ae66a0560be793be291042a07d0d408dafa14e2 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Mon, 11 Mar 2024 16:08:12 -0700 Subject: [PATCH 1/6] ensure that cmake-generate.tests.yml properly handles various os differences --- eng/pipelines/templates/jobs/cmake-generate-jobs.yml | 8 ++++---- eng/pipelines/templates/jobs/cmake-generate.tests.yml | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) 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') }}: From b60a3253d2eccda0ab36cd0ef119b12e9ddbe09b Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Mon, 11 Mar 2024 16:20:14 -0700 Subject: [PATCH 2/6] ensure we actually use the variables --- eng/pipelines/templates/jobs/cmake-generate-jobs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/cmake-generate-jobs.yml b/eng/pipelines/templates/jobs/cmake-generate-jobs.yml index bd81036d8..07001d6f8 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: azsdk-pool-mms-ubuntu-2004-1espt - Pool: azsdk-pool-mms-ubuntu-2004-general + OsVmImage: $(LINUXVMIMAGE) + Pool: $(LINUXPOOL) 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: azsdk-pool-mms-ubuntu-2004-1espt - Pool: azsdk-pool-mms-ubuntu-2004-general + OsVmImage: $(LINUXVMIMAGE) + Pool: $(LINUXPOOL) GenerateJobName: generate_matrix_cmake_source AdditionalParameters: Artifacts: ${{ parameters.ArtifactsSource }} From 38cc766e8d512be1596d351570fa118bb2ae7ddc Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Mon, 11 Mar 2024 16:41:12 -0700 Subject: [PATCH 3/6] see if we can add a job name so that it can multiplex properly --- eng/pipelines/templates/jobs/ci.tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml index 0633814c4..c805ae572 100644 --- a/eng/pipelines/templates/jobs/ci.tests.yml +++ b/eng/pipelines/templates/jobs/ci.tests.yml @@ -60,7 +60,7 @@ parameters: default: '' jobs: - - job: + - job: ${{ parameters.DisplayName }}_${{ parameters.os }} displayName: ${{ parameters.DisplayName }} dependsOn: ${{ parameters.DependsOn }} condition: and(succeededOrFailed(), ne(variables['Skip.Test'], 'true'), ne(${{ parameters.Matrix }}, '{}')) From 02ae6a49563d520198f7622f11baaf604ca90233 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Mon, 11 Mar 2024 16:43:15 -0700 Subject: [PATCH 4/6] parameters.OS -> parameters.OSNam --- eng/pipelines/templates/jobs/ci.tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml index c805ae572..c190cfc2e 100644 --- a/eng/pipelines/templates/jobs/ci.tests.yml +++ b/eng/pipelines/templates/jobs/ci.tests.yml @@ -60,7 +60,7 @@ parameters: default: '' jobs: - - job: ${{ parameters.DisplayName }}_${{ parameters.os }} + - job: ${{ parameters.DisplayName }}_${{ parameters.OSName }} displayName: ${{ parameters.DisplayName }} dependsOn: ${{ parameters.DependsOn }} condition: and(succeededOrFailed(), ne(variables['Skip.Test'], 'true'), ne(${{ parameters.Matrix }}, '{}')) From 297dbb1da40b0e8e072259360fe55e2e9886f2e6 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Mon, 11 Mar 2024 16:57:54 -0700 Subject: [PATCH 5/6] passing the same workaround on job name --- eng/pipelines/templates/jobs/live.tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml index d80d874e4..30e1a76e4 100644 --- a/eng/pipelines/templates/jobs/live.tests.yml +++ b/eng/pipelines/templates/jobs/live.tests.yml @@ -44,7 +44,8 @@ parameters: default: '' jobs: -- job: ValidateLive +- job: ${{ parameters.DisplayName }}_${{ parameters.OSName }} + displayName: ValidateLive dependsOn: ${{ parameters.DependsOn }} condition: and(ne(variables['Skip.LiveTest'], 'true'), ne(${{ parameters.Matrix }}, '{}')) timeoutInMinutes: ${{ parameters.TimeoutInMinutes }} From 15a4a33ff232bcbc5ad7262e02870c821b2668a8 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Mon, 11 Mar 2024 16:58:23 -0700 Subject: [PATCH 6/6] undo ci.tests.yml update that I don't want to risk --- eng/pipelines/templates/jobs/ci.tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml index c190cfc2e..0633814c4 100644 --- a/eng/pipelines/templates/jobs/ci.tests.yml +++ b/eng/pipelines/templates/jobs/ci.tests.yml @@ -60,7 +60,7 @@ parameters: default: '' jobs: - - job: ${{ parameters.DisplayName }}_${{ parameters.OSName }} + - job: displayName: ${{ parameters.DisplayName }} dependsOn: ${{ parameters.DependsOn }} condition: and(succeededOrFailed(), ne(variables['Skip.Test'], 'true'), ne(${{ parameters.Matrix }}, '{}'))