Skip to content

Commit 62127ba

Browse files
authored
Use 1es hosted pools for smoke tests (Azure#20935)
1 parent b8fae7a commit 62127ba

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

common/smoke-tests/smoke-test-dependencies.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,78 +18,81 @@ jobs:
1818
Matrix:
1919
Java 8 Windows (AzureCloud):
2020
JavaTestVersion: '1.8'
21-
OSVmImage: windows-2019
21+
Pool: "azsdk-pool-mms-win-2019-general"
22+
OSVmImage: "MMS2019"
2223
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
2324
ArmTemplateParameters: $(azureCloudArmParameters)
2425
PomFile: common/smoke-tests/pom.xml
2526
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
2627
Java LTS Windows (AzureCloud):
27-
JavaTestVersion: '1.11'
28-
OSVmImage: windows-2019
28+
Pool: "azsdk-pool-mms-win-2019-general"
29+
OSVmImage: "MMS2019"
2930
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
3031
ArmTemplateParameters: $(azureCloudArmParameters)
3132
PomFile: common/smoke-tests/pom.xml
3233
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
3334
Java 8 Linux (AzureCloud):
34-
JavaTestVersion: '1.8'
35-
OSVmImage: ubuntu-18.04
35+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
36+
OSVmImage: "MMSUbuntu18.04"
3637
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
3738
ArmTemplateParameters: $(azureCloudArmParameters)
3839
PomFile: common/smoke-tests/pom.xml
3940
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
4041
Java LTS Linux (AzureCloud):
41-
JavaTestVersion: '1.11'
42-
OSVmImage: ubuntu-18.04
42+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
43+
OSVmImage: "MMSUbuntu18.04"
4344
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
4445
ArmTemplateParameters: $(azureCloudArmParameters)
4546
PomFile: common/smoke-tests/pom.xml
4647
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
4748
Java LTS Linux (AzureCloud Canary):
48-
JavaTestVersion: '1.11'
49-
OSVmImage: ubuntu-18.04
49+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
50+
OSVmImage: "MMSUbuntu18.04"
5051
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
5152
ArmTemplateParameters: $(azureCloudArmParameters)
5253
Location: 'eastus2euap'
5354
PomFile: common/smoke-tests/pom.xml
5455
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
5556
Java 8 MacOS (AzureCloud):
5657
JavaTestVersion: '1.8'
58+
Pool: Azure Pipelines
5759
OSVmImage: macOS-10.15
5860
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
5961
ArmTemplateParameters: $(azureCloudArmParameters)
6062
PomFile: common/smoke-tests/pom.xml
6163
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
6264
Java LTS MacOS (AzureCloud):
6365
JavaTestVersion: '1.11'
66+
Pool: Azure Pipelines
6467
OSVmImage: macOS-10.15
6568
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
6669
ArmTemplateParameters: $(azureCloudArmParameters)
6770
PomFile: common/smoke-tests/pom.xml
6871
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
6972
Java 8 Windows (AzureUSGovernment):
70-
JavaTestVersion: '1.8'
71-
OSVmImage: windows-2019
73+
Pool: "azsdk-pool-mms-win-2019-general"
74+
OSVmImage: "MMS2019"
7275
SubscriptionConfiguration: $(sub-config-gov-test-resources)
7376
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
7477
PomFile: common/smoke-tests/pom.xml
7578
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
7679
Java LTS Windows (AzureUSGovernment):
77-
JavaTestVersion: '1.11'
78-
OSVmImage: windows-2019
80+
Pool: "azsdk-pool-mms-win-2019-general"
81+
OSVmImage: "MMS2019"
7982
SubscriptionConfiguration: $(sub-config-gov-test-resources)
8083
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
8184
PomFile: common/smoke-tests/pom.xml
8285
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
8386
Java 8 Windows (AzureChinaCloud):
84-
JavaTestVersion: '1.8'
85-
OSVmImage: windows-2019
87+
Pool: "azsdk-pool-mms-win-2019-general"
88+
OSVmImage: "MMS2019"
8689
SubscriptionConfiguration: $(sub-config-cn-test-resources)
8790
ArmTemplateParameters: $(azureChinaCloudArmParameters)
8891
PomFile: common/smoke-tests/pom.xml
8992
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
9093
Java LTS Windows (AzureChinaCloud):
91-
JavaTestVersion: '1.11'
92-
OSVmImage: windows-2019
94+
Pool: "azsdk-pool-mms-win-2019-general"
95+
OSVmImage: "MMS2019"
9396
SubscriptionConfiguration: $(sub-config-cn-test-resources)
9497
ArmTemplateParameters: $(azureChinaCloudArmParameters)
9598
PomFile: common/smoke-tests/pom.xml

common/smoke-tests/smoke-test-job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
matrix: ${{ parameters.Matrix }}
2121

2222
pool:
23+
name: $(Pool)
2324
vmImage: $(OSVmImage)
2425

2526
variables:

common/smoke-tests/smoke-test-samples.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
Matrix:
2222
Service Bus:
2323
JavaTestVersion: '1.8'
24-
OSVmImage: windows-2019
24+
Pool: "azsdk-pool-mms-win-2019-general"
25+
OSVmImage: "MMS2019"
2526
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
2627
ArmTemplateParameters: $(azureCloudArmParameters)
2728
PomFile: sdk/servicebus/azure-messaging-servicebus/pom.xml

0 commit comments

Comments
 (0)