From 258f498b20a81918e19302ab08c8bc990ba7509c Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Tue, 14 Feb 2023 19:03:54 -0800 Subject: [PATCH 1/9] Update images MMS2019 and MMS2022 to their compliant equivalents Updating used images to their compliant versions. - https://github.com/Azure/azure-sdk-tools/issues/3407 --- eng/pipelines/templates/stages/platform-matrix-live.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json index e65f4e6bc3..b4cbe4cc6d 100644 --- a/eng/pipelines/templates/stages/platform-matrix-live.json +++ b/eng/pipelines/templates/stages/platform-matrix-live.json @@ -71,12 +71,12 @@ "StaticConfigs": { "Win2019": { "Pool": "azsdk-pool-mms-win-2019-general", - "OSVmImage": "MMS2019", + "OSVmImage": "MMS2019Compliant", "CMAKE_GENERATOR": "Visual Studio 16 2019" }, "Win2022": { "Pool": "azsdk-pool-mms-win-2022-general", - "OSVmImage": "MMS2022", + "OSVmImage": "MMS2022Compliant", "CMAKE_GENERATOR": "Visual Studio 17 2022" } }, From 4e7b458012a3420ff030ed3435c7924f3dfcd8d5 Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Tue, 14 Feb 2023 19:05:04 -0800 Subject: [PATCH 2/9] Update platform-matrix.json --- eng/pipelines/templates/stages/platform-matrix.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 59d9b06dfd..ee3ccdd833 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -31,7 +31,7 @@ { "StaticConfigs": { "Win2019_x64_Release": { - "OSVmImage": "MMS2019", + "OSVmImage": "MMS2019Compliant", "Pool": "azsdk-pool-mms-win-2019-general", "CMAKE_GENERATOR": "Visual Studio 16 2019", "CMAKE_GENERATOR_PLATFORM": "x64", @@ -49,7 +49,7 @@ { "StaticConfigs": { "Win2022": { - "OSVmImage": "MMS2022", + "OSVmImage": "MMS2022Compliant", "Pool": "azsdk-pool-mms-win-2022-general", "CMAKE_GENERATOR": "Visual Studio 17 2022" } From c4d9522a64c4edafe4ed9ee65ceaf2edaaef62c4 Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Tue, 14 Feb 2023 19:08:56 -0800 Subject: [PATCH 3/9] Update perf.yml --- eng/common/pipelines/templates/jobs/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index ff2d531625..3d9f803f5e 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -13,7 +13,7 @@ parameters: default: 'azsdk-pool-mms-win-2019-perf' - name: WindowsVmImage type: string - default: 'MMS2019' + default: 'MMS2019Compliant' - name: Language type: string default: '' From 0ad1c22d399aa8e1e1ae0e8ec1c8f1b84fd4e42f Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Tue, 14 Feb 2023 19:09:30 -0800 Subject: [PATCH 4/9] Update Get-BinarySizes.ps1 --- eng/scripts/Get-BinarySizes.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/scripts/Get-BinarySizes.ps1 b/eng/scripts/Get-BinarySizes.ps1 index af8a91da48..c75e5a86ec 100644 --- a/eng/scripts/Get-BinarySizes.ps1 +++ b/eng/scripts/Get-BinarySizes.ps1 @@ -48,11 +48,11 @@ function getTargetOs { return $OsVMImage } - if ($OsVMImage -match "^MMS2019$|^win-2019$") { + if ($OsVMImage -match "^MMS2019Compliant$|^win-2019$") { return "win-2019" } - if ($OsVMImage -match "^MMS2022$|^win-2022$|^windows-2022$") { + if ($OsVMImage -match "^MMS2022Compliant$|^win-2022$|^windows-2022$") { return "win-2022" } From 2b02cbd199a957dcdca1f40706425a9c54a4d648 Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Tue, 14 Feb 2023 19:13:49 -0800 Subject: [PATCH 5/9] update MMS2022 images to Compliant --- .../templates/stages/archetype-sdk-tool-pwsh.yml | 2 +- eng/pipelines/daily-verification.yml | 2 +- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 ++-- .../templates/stages/archetype-cpp-release.yml | 10 +++++----- .../stages/platform-matrix-cmakegenerate.json | 2 +- .../stages/platform-matrix-cmakesourcegenerate.json | 2 +- eng/pipelines/templates/stages/platform-matrix.json | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml index 0b46240cc7..4fc49dc232 100644 --- a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml +++ b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml @@ -22,7 +22,7 @@ stages: matrix: Windows: Pool: 'azsdk-pool-mms-win-2022-general' - Image: 'MMS2022' + Image: 'MMS2022Compliant' Linux: Pool: azsdk-pool-mms-ubuntu-2204-general Image: MMSUbuntu22.04 diff --git a/eng/pipelines/daily-verification.yml b/eng/pipelines/daily-verification.yml index c7a332a679..94393ba388 100644 --- a/eng/pipelines/daily-verification.yml +++ b/eng/pipelines/daily-verification.yml @@ -4,7 +4,7 @@ jobs: displayName: Daily vcpkg PR pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant variables: # The branch in the azure-sdk/vcpkg repo that is updated daily with the diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 470f20fcca..c8db1704c8 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -69,7 +69,7 @@ jobs: displayName: Create API Review for ${{ artifact.name }} pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant steps: - task: Powershell@2 inputs: @@ -111,7 +111,7 @@ jobs: - job: GenerateReleaseArtifacts pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant variables: VCPKG_DEFAULT_TRIPLET: 'x64-windows-static' Package.EnableSBOMSigning: true diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml index 5cf118da3e..a6f8cced07 100644 --- a/eng/pipelines/templates/stages/archetype-cpp-release.yml +++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml @@ -22,7 +22,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant strategy: runOnce: @@ -63,7 +63,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant strategy: runOnce: @@ -93,7 +93,7 @@ stages: dependsOn: TagRepository pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant variables: VcpkgPrRepoOwner: Microsoft @@ -220,7 +220,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant strategy: runOnce: @@ -248,7 +248,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022 + vmImage: MMS2022Compliant steps: - checkout: self diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json index 073dfd6db4..4fcd8fabfd 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json @@ -10,7 +10,7 @@ }, "Windows": { "Pool": "azsdk-pool-mms-win-2022-general", - "OSVmImage": "MMS2022", + "OSVmImage": "MMS2022Compliant", "VCPKG_DEFAULT_TRIPLET": "x64-windows" }, "Mac": { diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json index f7f1b581ef..e110327bc5 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json @@ -3,7 +3,7 @@ "OSConfig": { "Windows": { "Pool": "azsdk-pool-mms-win-2022-general", - "OSVmImage": "MMS2022", + "OSVmImage": "MMS2022Compliant", "CmakeEnvArg": "" }, "Linux": { diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index ee3ccdd833..3acac8ac07 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -106,7 +106,7 @@ "StaticConfigs": { "Win2022": { "VcpkgInstall": "openssl", - "OSVmImage": "MMS2022", + "OSVmImage": "MMS2022Compliant", "Pool": "azsdk-pool-mms-win-2022-general", "CMAKE_GENERATOR": "Visual Studio 17 2022", "PublishMapFiles": "true" From b80157eca0ebb5167c68113fd14a11a7c7bb11e1 Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Thu, 16 Feb 2023 18:12:20 -0800 Subject: [PATCH 6/9] update to win-20xx format --- eng/pipelines/daily-verification.yml | 2 +- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 ++-- .../templates/stages/archetype-cpp-release.yml | 10 +++++----- .../stages/platform-matrix-cmakegenerate.json | 2 +- .../stages/platform-matrix-cmakesourcegenerate.json | 2 +- .../templates/stages/platform-matrix-live.json | 4 ++-- eng/pipelines/templates/stages/platform-matrix.json | 6 +++--- eng/scripts/Get-BinarySizes.ps1 | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/pipelines/daily-verification.yml b/eng/pipelines/daily-verification.yml index 94393ba388..e33be26811 100644 --- a/eng/pipelines/daily-verification.yml +++ b/eng/pipelines/daily-verification.yml @@ -4,7 +4,7 @@ jobs: displayName: Daily vcpkg PR pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 variables: # The branch in the azure-sdk/vcpkg repo that is updated daily with the diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index c8db1704c8..5cec0b0f9d 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -69,7 +69,7 @@ jobs: displayName: Create API Review for ${{ artifact.name }} pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 steps: - task: Powershell@2 inputs: @@ -111,7 +111,7 @@ jobs: - job: GenerateReleaseArtifacts pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 variables: VCPKG_DEFAULT_TRIPLET: 'x64-windows-static' Package.EnableSBOMSigning: true diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml index a6f8cced07..d5efca20e0 100644 --- a/eng/pipelines/templates/stages/archetype-cpp-release.yml +++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml @@ -22,7 +22,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 strategy: runOnce: @@ -63,7 +63,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 strategy: runOnce: @@ -93,7 +93,7 @@ stages: dependsOn: TagRepository pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 variables: VcpkgPrRepoOwner: Microsoft @@ -220,7 +220,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 strategy: runOnce: @@ -248,7 +248,7 @@ stages: pool: name: azsdk-pool-mms-win-2022-general - vmImage: MMS2022Compliant + vmImage: windows-2022 steps: - checkout: self diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json index 4fcd8fabfd..18597e8314 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json @@ -10,7 +10,7 @@ }, "Windows": { "Pool": "azsdk-pool-mms-win-2022-general", - "OSVmImage": "MMS2022Compliant", + "OSVmImage": "windows-2022", "VCPKG_DEFAULT_TRIPLET": "x64-windows" }, "Mac": { diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json index e110327bc5..716b1b4595 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json @@ -3,7 +3,7 @@ "OSConfig": { "Windows": { "Pool": "azsdk-pool-mms-win-2022-general", - "OSVmImage": "MMS2022Compliant", + "OSVmImage": "windows-2022", "CmakeEnvArg": "" }, "Linux": { diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json index b4cbe4cc6d..21cd447161 100644 --- a/eng/pipelines/templates/stages/platform-matrix-live.json +++ b/eng/pipelines/templates/stages/platform-matrix-live.json @@ -71,12 +71,12 @@ "StaticConfigs": { "Win2019": { "Pool": "azsdk-pool-mms-win-2019-general", - "OSVmImage": "MMS2019Compliant", + "OSVmImage": "windows-2019", "CMAKE_GENERATOR": "Visual Studio 16 2019" }, "Win2022": { "Pool": "azsdk-pool-mms-win-2022-general", - "OSVmImage": "MMS2022Compliant", + "OSVmImage": "windows-2022", "CMAKE_GENERATOR": "Visual Studio 17 2022" } }, diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 3acac8ac07..aaa88e37f9 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -31,7 +31,7 @@ { "StaticConfigs": { "Win2019_x64_Release": { - "OSVmImage": "MMS2019Compliant", + "OSVmImage": "windows-2019", "Pool": "azsdk-pool-mms-win-2019-general", "CMAKE_GENERATOR": "Visual Studio 16 2019", "CMAKE_GENERATOR_PLATFORM": "x64", @@ -49,7 +49,7 @@ { "StaticConfigs": { "Win2022": { - "OSVmImage": "MMS2022Compliant", + "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general", "CMAKE_GENERATOR": "Visual Studio 17 2022" } @@ -106,7 +106,7 @@ "StaticConfigs": { "Win2022": { "VcpkgInstall": "openssl", - "OSVmImage": "MMS2022Compliant", + "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general", "CMAKE_GENERATOR": "Visual Studio 17 2022", "PublishMapFiles": "true" diff --git a/eng/scripts/Get-BinarySizes.ps1 b/eng/scripts/Get-BinarySizes.ps1 index c75e5a86ec..ab13242ad1 100644 --- a/eng/scripts/Get-BinarySizes.ps1 +++ b/eng/scripts/Get-BinarySizes.ps1 @@ -48,11 +48,11 @@ function getTargetOs { return $OsVMImage } - if ($OsVMImage -match "^MMS2019Compliant$|^win-2019$") { + if ($OsVMImage -match "^windows-2019$|^win-2019$") { return "win-2019" } - if ($OsVMImage -match "^MMS2022Compliant$|^win-2022$|^windows-2022$") { + if ($OsVMImage -match "^windows-2022$|^win-2022$") { return "win-2022" } From 0c7cf8867640078626e9048b6d48e5c4d7d2d638 Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Thu, 16 Feb 2023 18:21:58 -0800 Subject: [PATCH 7/9] Update eng/common/pipelines/templates/jobs/perf.yml --- eng/common/pipelines/templates/jobs/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index 3d9f803f5e..ff2d531625 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -13,7 +13,7 @@ parameters: default: 'azsdk-pool-mms-win-2019-perf' - name: WindowsVmImage type: string - default: 'MMS2019Compliant' + default: 'MMS2019' - name: Language type: string default: '' From f10cc481cda4541ae430068b85b39e924e1006a4 Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Thu, 16 Feb 2023 18:22:20 -0800 Subject: [PATCH 8/9] Update eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml --- .../pipelines/templates/stages/archetype-sdk-tool-pwsh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml index 4fc49dc232..0b46240cc7 100644 --- a/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml +++ b/eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml @@ -22,7 +22,7 @@ stages: matrix: Windows: Pool: 'azsdk-pool-mms-win-2022-general' - Image: 'MMS2022Compliant' + Image: 'MMS2022' Linux: Pool: azsdk-pool-mms-ubuntu-2204-general Image: MMSUbuntu22.04 From 543babbb2231a85db9ae446216c3788f0feb1a14 Mon Sep 17 00:00:00 2001 From: Konrad Jamrozik Date: Thu, 16 Feb 2023 18:24:34 -0800 Subject: [PATCH 9/9] simplify Get-BinarySizes.ps1 / getTargetOs for windows --- eng/scripts/Get-BinarySizes.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/scripts/Get-BinarySizes.ps1 b/eng/scripts/Get-BinarySizes.ps1 index ab13242ad1..e436519639 100644 --- a/eng/scripts/Get-BinarySizes.ps1 +++ b/eng/scripts/Get-BinarySizes.ps1 @@ -48,11 +48,11 @@ function getTargetOs { return $OsVMImage } - if ($OsVMImage -match "^windows-2019$|^win-2019$") { + if ($OsVMImage -eq "windows-2019") { return "win-2019" } - if ($OsVMImage -match "^windows-2022$|^win-2022$") { + if ($OsVMImage -eq "windows-2022") { return "win-2022" }