From 4e21c2887ac2041ade8ca1022000746de326142e Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Thu, 15 Dec 2022 21:49:10 +0000 Subject: [PATCH] Migrate to new pool --- .../smoke-tests/smoke-test-dependencies.yml | 24 +++++++++---------- common/smoke-tests/smoke-test-samples.yml | 4 ++-- eng/pipelines/aggregate-reports.yml | 8 +++---- eng/pipelines/bompreparation.yml | 2 +- eng/pipelines/partner-release.yml | 8 +++---- eng/pipelines/templates/jobs/ci.yml | 4 ++-- .../stages/archetype-java-release-batch.yml | 20 ++++++++-------- .../stages/archetype-java-release-patch.yml | 16 ++++++------- .../archetype-java-release-pom-only.yml | 8 +++---- .../stages/archetype-java-release.yml | 20 ++++++++-------- .../stages/cosmos-emulator-matrix.json | 2 +- .../templates/stages/platform-matrix.json | 6 ++--- sdk/storage/platform-matrix-all-versions.json | 2 +- sdk/storage/platform-matrix-ci.json | 2 +- sdk/storage/platform-matrix.json | 2 +- sdk/tables/platform-matrix.json | 4 ++-- 16 files changed, 66 insertions(+), 66 deletions(-) diff --git a/common/smoke-tests/smoke-test-dependencies.yml b/common/smoke-tests/smoke-test-dependencies.yml index 1c61fb9d61119..0cc225fb4d2c8 100644 --- a/common/smoke-tests/smoke-test-dependencies.yml +++ b/common/smoke-tests/smoke-test-dependencies.yml @@ -18,15 +18,15 @@ jobs: Matrix: Java 8 Windows (AzureCloud): JavaTestVersion: '1.8' - Pool: "azsdk-pool-mms-win-2019-general" - OSVmImage: "MMS2019" + Pool: "azsdk-pool-mms-win-2022-general" + OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) PomFile: common/smoke-tests/pom.xml ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' Java LTS Windows (AzureCloud): - Pool: "azsdk-pool-mms-win-2019-general" - OSVmImage: "MMS2019" + Pool: "azsdk-pool-mms-win-2022-general" + OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) PomFile: common/smoke-tests/pom.xml @@ -70,29 +70,29 @@ jobs: PomFile: common/smoke-tests/pom.xml ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' Java 8 Windows (AzureUSGovernment): - Pool: "azsdk-pool-mms-win-2019-general" - OSVmImage: "MMS2019" + Pool: "azsdk-pool-mms-win-2022-general" + OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-gov-test-resources) ArmTemplateParameters: $(azureUSGovernmentArmParameters) PomFile: common/smoke-tests/pom.xml ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' Java LTS Windows (AzureUSGovernment): - Pool: "azsdk-pool-mms-win-2019-general" - OSVmImage: "MMS2019" + Pool: "azsdk-pool-mms-win-2022-general" + OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-gov-test-resources) ArmTemplateParameters: $(azureUSGovernmentArmParameters) PomFile: common/smoke-tests/pom.xml ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' Java 8 Windows (AzureChinaCloud): - Pool: "azsdk-pool-mms-win-2019-general" - OSVmImage: "MMS2019" + Pool: "azsdk-pool-mms-win-2022-general" + OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-cn-test-resources) ArmTemplateParameters: $(azureChinaCloudArmParameters) PomFile: common/smoke-tests/pom.xml ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' Java LTS Windows (AzureChinaCloud): - Pool: "azsdk-pool-mms-win-2019-general" - OSVmImage: "MMS2019" + Pool: "azsdk-pool-mms-win-2022-general" + OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-cn-test-resources) ArmTemplateParameters: $(azureChinaCloudArmParameters) PomFile: common/smoke-tests/pom.xml diff --git a/common/smoke-tests/smoke-test-samples.yml b/common/smoke-tests/smoke-test-samples.yml index bf947fdea9dcc..50a7abcf35a52 100644 --- a/common/smoke-tests/smoke-test-samples.yml +++ b/common/smoke-tests/smoke-test-samples.yml @@ -21,8 +21,8 @@ jobs: Matrix: Service Bus: JavaTestVersion: '1.8' - Pool: "azsdk-pool-mms-win-2019-general" - OSVmImage: "MMS2019" + Pool: "azsdk-pool-mms-win-2022-general" + OSVmImage: "MMS2022" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) PomFile: sdk/servicebus/azure-messaging-servicebus/pom.xml diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml index 36a8c08f625cb..d40ad7475902c 100644 --- a/eng/pipelines/aggregate-reports.yml +++ b/eng/pipelines/aggregate-reports.yml @@ -121,8 +121,8 @@ stages: pool: # CredScan build task is Windows only (https://aka.ms/credscan). - name: 'azsdk-pool-mms-win-2019-general' - vmImage: 'MMS2019' + name: 'azsdk-pool-mms-win-2022-general' + vmImage: 'MMS2022' steps: - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR @@ -153,8 +153,8 @@ stages: timeoutInMinutes: 120 pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 steps: - template: /eng/common/pipelines/templates/steps/policheck.yml diff --git a/eng/pipelines/bompreparation.yml b/eng/pipelines/bompreparation.yml index 641484d140ad7..a5a2f6dfecf8a 100644 --- a/eng/pipelines/bompreparation.yml +++ b/eng/pipelines/bompreparation.yml @@ -10,7 +10,7 @@ stages: timeoutInMinutes: 180 pool: - vmImage: 'windows-2019' + vmImage: 'windows-2022' steps: - pwsh: | diff --git a/eng/pipelines/partner-release.yml b/eng/pipelines/partner-release.yml index 6924ae542f789..244b43f9a7ece 100644 --- a/eng/pipelines/partner-release.yml +++ b/eng/pipelines/partner-release.yml @@ -30,8 +30,8 @@ variables: jobs: - job: Signing pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 steps: - checkout: azure-sdk-build-tools path: azure-sdk-build-tools @@ -52,8 +52,8 @@ jobs: - job: Release dependsOn: Signing pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 steps: - checkout: self path: azure-sdk-for-java diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml index 3eb0564c347d4..8779510590b01 100644 --- a/eng/pipelines/templates/jobs/ci.yml +++ b/eng/pipelines/templates/jobs/ci.yml @@ -401,8 +401,8 @@ jobs: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 steps: - template: /eng/common/pipelines/templates/steps/credscan.yml parameters: diff --git a/eng/pipelines/templates/stages/archetype-java-release-batch.yml b/eng/pipelines/templates/stages/archetype-java-release-batch.yml index 570088f5629e9..865e42d1ca068 100644 --- a/eng/pipelines/templates/stages/archetype-java-release-batch.yml +++ b/eng/pipelines/templates/stages/archetype-java-release-batch.yml @@ -152,8 +152,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: @@ -182,8 +182,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: @@ -255,8 +255,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 strategy: runOnce: deploy: @@ -364,8 +364,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 strategy: runOnce: deploy: @@ -403,8 +403,8 @@ stages: value: https://pkgs.dev.azure.com/azure-sdk/internal/_packaging/azure-sdk-for-java-pr/maven/v1 pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 steps: - checkout: azure-sdk-build-tools path: azure-sdk-build-tools diff --git a/eng/pipelines/templates/stages/archetype-java-release-patch.yml b/eng/pipelines/templates/stages/archetype-java-release-patch.yml index 2a23198baa4df..8ff6b01674099 100644 --- a/eng/pipelines/templates/stages/archetype-java-release-patch.yml +++ b/eng/pipelines/templates/stages/archetype-java-release-patch.yml @@ -76,8 +76,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: @@ -107,8 +107,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: @@ -180,8 +180,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 strategy: runOnce: deploy: @@ -292,8 +292,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 strategy: runOnce: deploy: diff --git a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml index db6c009135d11..138c802aecd6f 100644 --- a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml +++ b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml @@ -59,8 +59,8 @@ stages: variables: - template: ../variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: @@ -86,8 +86,8 @@ stages: variables: - template: ../variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 93173ef8396b9..194840a9c3e0a 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -136,8 +136,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: @@ -163,8 +163,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 strategy: runOnce: deploy: @@ -289,8 +289,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 strategy: runOnce: deploy: @@ -323,8 +323,8 @@ stages: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general - vmImage: MMS2019 + name: azsdk-pool-mms-win-2022-general + vmImage: MMS2022 strategy: runOnce: deploy: @@ -375,8 +375,8 @@ stages: value: https://pkgs.dev.azure.com/azure-sdk/internal/_packaging/azure-sdk-for-java-pr/maven/v1 pool: - name: azsdk-pool-mms-win-2019-general - vmImage: windows-2019 + name: azsdk-pool-mms-win-2022-general + vmImage: windows-2022 steps: - checkout: azure-sdk-build-tools path: azure-sdk-build-tools diff --git a/eng/pipelines/templates/stages/cosmos-emulator-matrix.json b/eng/pipelines/templates/stages/cosmos-emulator-matrix.json index 8ea6957dc947b..022ab5029e0c4 100644 --- a/eng/pipelines/templates/stages/cosmos-emulator-matrix.json +++ b/eng/pipelines/templates/stages/cosmos-emulator-matrix.json @@ -1,7 +1,7 @@ { "matrix": { "Agent": { - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } + "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } }, "EmulatorConfig": { "Emulator Only Integration Tests Tcp - Java 8": { diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 4583de075438e..760828fe46d33 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -5,7 +5,7 @@ "matrix": { "Agent": { "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }, + "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" }, "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } }, "JavaTestVersion": [ "1.8", "1.17" ], @@ -16,7 +16,7 @@ }, "exclude": [ { - "Pool": "azsdk-pool-mms-win-2019-general", + "Pool": "azsdk-pool-mms-win-2022-general", "JavaTestVersion": "1.17" } ], @@ -33,7 +33,7 @@ }, { "Agent": { - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } + "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } }, "JavaTestVersion": "1.17", "AZURE_TEST_HTTP_CLIENTS": "netty", diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json index 4b342bea17340..b39442c91f046 100644 --- a/sdk/storage/platform-matrix-all-versions.json +++ b/sdk/storage/platform-matrix-all-versions.json @@ -2,7 +2,7 @@ "matrix": { "Agent": { "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } + "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } }, "JavaTestVersion": [ "1.8", "1.11" ], "AZURE_TEST_HTTP_CLIENTS": [ "okhttp", "netty" ], diff --git a/sdk/storage/platform-matrix-ci.json b/sdk/storage/platform-matrix-ci.json index fbd91446aacef..94906efea2ab5 100644 --- a/sdk/storage/platform-matrix-ci.json +++ b/sdk/storage/platform-matrix-ci.json @@ -4,7 +4,7 @@ }, "include": [ { - "Agent": { "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } }, + "Agent": { "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } }, "JavaTestVersion": "1.17", "AZURE_TEST_HTTP_CLIENTS": "netty", "TestGoals": "surefire:test", diff --git a/sdk/storage/platform-matrix.json b/sdk/storage/platform-matrix.json index 294c6c9df94b5..d830ec66ce569 100644 --- a/sdk/storage/platform-matrix.json +++ b/sdk/storage/platform-matrix.json @@ -19,7 +19,7 @@ "TestFromSource": false }, { - "Agent": { "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } }, + "Agent": { "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } }, "JavaTestVersion": "1.17", "AZURE_TEST_HTTP_CLIENTS": "netty", "TestFromSource": false diff --git a/sdk/tables/platform-matrix.json b/sdk/tables/platform-matrix.json index 62617961133e6..88dc5ed1b099f 100644 --- a/sdk/tables/platform-matrix.json +++ b/sdk/tables/platform-matrix.json @@ -6,7 +6,7 @@ }, "matrix": { "Agent": { - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }, + "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" }, "ubuntu-2004": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } }, @@ -19,7 +19,7 @@ "AZURE_TEST_HTTP_CLIENTS": "okhttp", "JavaTestVersion": "1.8", "Agent": { - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } + "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } }, "ArmTemplateParameters": "@{endpointType='storage'}" },