Skip to content

Commit 8be3978

Browse files
authored
Use 1es hosted pools for smoke tests (Azure#20631)
1 parent bbf093f commit 8be3978

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

common/SmokeTests/smoke-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variables:
22
- template: /eng/pipelines/templates/variables/globals.yml
33

44
jobs:
5-
- template: /eng/pipelines/templates/jobs/smoke-tests.yml
5+
- template: /eng/pipelines/templates/jobs/smoke.tests.yml
66
parameters:
77
Daily: true
88
TimeoutInMinutes: 90

eng/pipelines/templates/jobs/smoke-tests.yml renamed to eng/pipelines/templates/jobs/smoke.tests.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
- ${{ if eq(parameters.Daily, false) }}:
1717
- job: smoke_test_eligibility
1818
pool:
19-
vmImage: ubuntu-18.04
19+
name: "azsdk-pool-mms-ubuntu-1804-general"
20+
vmImage: "MMSUbuntu18.04"
2021
displayName: Check Smoke Test Eligibility
2122
steps:
2223
# pipelines only supports template each when it generates the entire script block.
@@ -47,29 +48,29 @@ jobs:
4748
strategy:
4849
matrix:
4950
Linux (AzureCloud):
50-
Pool: Azure Pipelines
51-
OSVmImage: "ubuntu-18.04"
51+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
52+
OSVmImage: "MMSUbuntu18.04"
5253
TestTargetFramework: netcoreapp2.1
5354
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
5455
ArmTemplateParameters: $(azureCloudArmParameters)
5556
Location: "westus"
5657
Linux (AzureCloud Canary):
57-
Pool: Azure Pipelines
58-
OSVmImage: "ubuntu-18.04"
58+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
59+
OSVmImage: "MMSUbuntu18.04"
5960
TestTargetFramework: netcoreapp2.1
6061
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
6162
ArmTemplateParameters: $(azureCloudArmParameters)
6263
Location: "eastus2euap"
6364
Windows_NetCoreApp (AzureCloud):
64-
Pool: Azure Pipelines
65-
OSVmImage: "windows-2019"
65+
Pool: "azsdk-pool-mms-win-2019-general"
66+
OSVmImage: "MMS2019"
6667
TestTargetFramework: netcoreapp2.1
6768
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
6869
ArmTemplateParameters: $(azureCloudArmParameters)
6970
Location: "westus"
7071
Windows_NetFramework (AzureCloud):
71-
Pool: Azure Pipelines
72-
OSVmImage: "windows-2019"
72+
Pool: "azsdk-pool-mms-win-2019-general"
73+
OSVmImage: "MMS2019"
7374
TestTargetFramework: net461
7475
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
7576
ArmTemplateParameters: $(azureCloudArmParameters)
@@ -82,36 +83,36 @@ jobs:
8283
ArmTemplateParameters: $(azureCloudArmParameters)
8384
Location: "westus"
8485
Windows_Net50 (AzureCloud):
85-
Pool: Azure Pipelines
86-
OSVmImage: "windows-2019"
86+
Pool: "azsdk-pool-mms-win-2019-general"
87+
OSVmImage: "MMS2019"
8788
TestTargetFramework: net5.0
8889
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
8990
ArmTemplateParameters: $(azureCloudArmParameters)
9091
Location: "westus"
9192
Windows_NetCoreApp (AzureUSGovernment):
92-
Pool: Azure Pipelines
93-
OSVmImage: "windows-2019"
93+
Pool: "azsdk-pool-mms-win-2019-general"
94+
OSVmImage: "MMS2019"
9495
TestTargetFramework: netcoreapp2.1
9596
SubscriptionConfiguration: $(sub-config-gov-test-resources)
9697
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
9798
Location: "usgovarizona"
9899
Windows_NetFramework (AzureUSGovernment):
99-
Pool: Azure Pipelines
100-
OSVmImage: "windows-2019"
100+
Pool: "azsdk-pool-mms-win-2019-general"
101+
OSVmImage: "MMS2019"
101102
TestTargetFramework: net461
102103
SubscriptionConfiguration: $(sub-config-gov-test-resources)
103104
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
104105
Location: "usgovarizona"
105106
Windows_NetCoreApp (AzureChinaCloud):
106-
Pool: Azure Pipelines
107-
OSVmImage: "windows-2019"
107+
Pool: "azsdk-pool-mms-win-2019-general"
108+
OSVmImage: "MMS2019"
108109
TestTargetFramework: netcoreapp2.1
109110
SubscriptionConfiguration: $(sub-config-cn-test-resources)
110111
ArmTemplateParameters: $(azureChinaCloudArmParameters)
111112
Location: "chinaeast2"
112113
Windows_NetFramework (AzureChinaCloud):
113-
Pool: Azure Pipelines
114-
OSVmImage: "windows-2019"
114+
Pool: "azsdk-pool-mms-win-2019-general"
115+
OSVmImage: "MMS2019"
115116
TestTargetFramework: net461
116117
SubscriptionConfiguration: $(sub-config-cn-test-resources)
117118
ArmTemplateParameters: $(azureChinaCloudArmParameters)

eng/pipelines/templates/stages/archetype-net-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ stages:
231231
- stage: SmokeTest_Release_Packages
232232
displayName: Smoke Test Release Packages
233233
jobs:
234-
- template: /eng/pipelines/templates/jobs/smoke-tests.yml
234+
- template: /eng/pipelines/templates/jobs/smoke.tests.yml
235235
parameters:
236236
Daily: false
237237
Artifacts: ${{ parameters.Artifacts }}

0 commit comments

Comments
 (0)