Skip to content

Commit

Permalink
Migrate to new pool
Browse files Browse the repository at this point in the history
  • Loading branch information
azure-sdk committed Dec 15, 2022
1 parent 3ebbd3b commit 4e21c28
Show file tree
Hide file tree
Showing 16 changed files with 66 additions and 66 deletions.
24 changes: 12 additions & 12 deletions common/smoke-tests/smoke-test-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/smoke-tests/smoke-test-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/aggregate-reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/bompreparation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stages:
timeoutInMinutes: 180

pool:
vmImage: 'windows-2019'
vmImage: 'windows-2022'

steps:
- pwsh: |
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/partner-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions eng/pipelines/templates/stages/archetype-java-release-batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions eng/pipelines/templates/stages/archetype-java-release-patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions eng/pipelines/templates/stages/archetype-java-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/cosmos-emulator-matrix.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/stages/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand All @@ -16,7 +16,7 @@
},
"exclude": [
{
"Pool": "azsdk-pool-mms-win-2019-general",
"Pool": "azsdk-pool-mms-win-2022-general",
"JavaTestVersion": "1.17"
}
],
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/platform-matrix-all-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/platform-matrix-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sdk/tables/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
},
Expand All @@ -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'}"
},
Expand Down

0 comments on commit 4e21c28

Please sign in to comment.