Skip to content

Commit 2794bfc

Browse files
authored
Use 1es hosted pools for smoke tests (Azure#18272)
1 parent 4dc58cd commit 2794bfc

File tree

3 files changed

+27
-24
lines changed

3 files changed

+27
-24
lines changed

common/smoketest/smoke-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jobs:
2-
- template: /eng/pipelines/templates/jobs/smoke-test.yml
2+
- template: /eng/pipelines/templates/jobs/smoke.tests.yml
33
parameters:
44
Daily: true

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

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
- ${{ if eq(parameters.Daily, false) }}:
1313
- job: smoke_test_eligibility
1414
displayName: Check Smoke Test Eligibility
15+
pool:
16+
name: "azsdk-pool-mms-ubuntu-1804-general"
17+
vmImage: "MMSUbuntu18.04"
1518
steps:
1619
- ${{ each artifact in parameters.Artifacts }}:
1720
- ${{ if and(ne(variables['Skip.Release'], 'true'), ne(artifact.skipPublishPackage, 'true')) }}:
@@ -40,39 +43,39 @@ jobs:
4043
Python_27_Linux (AzureCloud):
4144
PythonVersion: '2.7'
4245
SkipAsyncInstall: true
43-
Pool: Azure Pipelines
44-
OSVmImage: ubuntu-18.04
46+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
47+
OSVmImage: "MMSUbuntu18.04"
4548
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
4649
ArmTemplateParameters: $(azureCloudArmParameters)
4750
Python_37_Linux (AzureCloud):
4851
PythonVersion: '3.7'
49-
Pool: Azure Pipelines
50-
OSVmImage: ubuntu-18.04
52+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
53+
OSVmImage: "MMSUbuntu18.04"
5154
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
5255
ArmTemplateParameters: $(azureCloudArmParameters)
5356
Python_38_Linux (AzureCloud):
5457
PythonVersion: '3.8'
55-
Pool: Azure Pipelines
56-
OSVmImage: ubuntu-18.04
58+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
59+
OSVmImage: "MMSUbuntu18.04"
5760
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
5861
ArmTemplateParameters: $(azureCloudArmParameters)
5962
Python_38_Linux (AzureCloud Canary):
6063
PythonVersion: '3.8'
61-
Pool: Azure Pipelines
62-
OSVmImage: ubuntu-18.04
64+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
65+
OSVmImage: "MMSUbuntu18.04"
6366
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
6467
ArmTemplateParameters: $(azureCloudArmParameters)
6568
Location: 'eastus2euap'
6669
Python_37_Windows (AzureCloud):
6770
PythonVersion: '3.7'
68-
Pool: Azure Pipelines
69-
OSVmImage: windows-2019
71+
Pool: "azsdk-pool-mms-win-2019-general"
72+
OSVmImage: "MMS2019"
7073
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
7174
ArmTemplateParameters: $(azureCloudArmParameters)
7275
Python_38_Windows (AzureCloud):
7376
PythonVersion: '3.8'
74-
Pool: Azure Pipelines
75-
OSVmImage: windows-2019
77+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
78+
OSVmImage: "MMSUbuntu18.04"
7679
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
7780
ArmTemplateParameters: $(azureCloudArmParameters)
7881
Python_37_Mac (AzureCloud):
@@ -89,27 +92,27 @@ jobs:
8992
ArmTemplateParameters: $(azureCloudArmParameters)
9093
Python_38_Linux (AzureUSGovernment):
9194
PythonVersion: '3.8'
92-
Pool: Azure Pipelines
93-
OSVmImage: ubuntu-18.04
95+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
96+
OSVmImage: "MMSUbuntu18.04"
9497
SubscriptionConfiguration: $(sub-config-gov-test-resources)
9598
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
9699
Python_37_Windows (AzureUSGovernment):
97100
PythonVersion: '3.7'
98-
Pool: Azure Pipelines
99-
OSVmImage: windows-2019
101+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
102+
OSVmImage: "MMSUbuntu18.04"
100103
SubscriptionConfiguration: $(sub-config-gov-test-resources)
101104
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
102105
Python_38_Linux (AzureChinaCloud):
103106
PythonVersion: '3.8'
104-
Pool: Azure Pipelines
105-
OSVmImage: ubuntu-18.04
107+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
108+
OSVmImage: "MMSUbuntu18.04"
106109
SubscriptionConfiguration: $(sub-config-cn-test-resources)
107110
Location: 'chinanorth'
108111
ArmTemplateParameters: $(azureChinaCloudArmParameters)
109112
Python_37_Windows (AzureChinaCloud):
110113
PythonVersion: '3.7'
111-
Pool: Azure Pipelines
112-
OSVmImage: windows-2019
114+
Pool: "azsdk-pool-mms-ubuntu-1804-general"
115+
OSVmImage: "MMSUbuntu18.04"
113116
SubscriptionConfiguration: $(sub-config-cn-test-resources)
114117
Location: 'chinanorth'
115118
ArmTemplateParameters: $(azureChinaCloudArmParameters)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ stages:
5656
ReleaseSha: $(Build.SourceVersion)
5757
RepoId: Azure/azure-sdk-for-python
5858
WorkingDirectory: $(System.DefaultWorkingDirectory)
59-
59+
6060
- ${{if ne(artifact.skipPublishPackage, 'true')}}:
6161
- deployment: PublishPackage
6262
displayName: "Publish to PyPI"
@@ -161,7 +161,7 @@ stages:
161161
deploy:
162162
steps:
163163
- checkout: self
164-
164+
165165
- pwsh: |
166166
Get-ChildItem -Recurse $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}
167167
workingDirectory: $(Pipeline.Workspace)
@@ -228,7 +228,7 @@ stages:
228228
- stage: SmokeTest_Release_Packages
229229
displayName: Smoke Test Release Packages
230230
jobs:
231-
- template: /eng/pipelines/templates/jobs/smoke-test.yml
231+
- template: /eng/pipelines/templates/jobs/smoke.tests.yml
232232
parameters:
233233
Daily: false
234234
ArtifactName: ${{ parameters.ArtifactName }}

0 commit comments

Comments
 (0)