Skip to content

Commit 9043478

Browse files
mitchdennymitchdenny
authored
Enable 1ES pools for live tests. (Azure#16160)
* Enable 1ES pools for live tests.
1 parent d5b8704 commit 9043478

File tree

6 files changed

+51
-22
lines changed

6 files changed

+51
-22
lines changed

‎eng/pipelines/templates/jobs/archetype-sdk-tests.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,28 @@ parameters:
1717
Location: ''
1818
Matrix:
1919
Linux_Python35:
20-
OSVmImage: 'ubuntu-18.04'
20+
Pool: azsdk-pool-mms-ubuntu-1804-general
21+
OSVmImage: MMSUbuntu18.04
2122
PythonVersion: '3.5'
2223
CoverageArg: '--disablecov'
2324
MacOs_Python37:
25+
Pool: Azure Pipelines
2426
OSVmImage: 'macOS-10.15'
2527
PythonVersion: '3.7'
2628
CoverageArg: '--disablecov'
2729
Windows_Python27:
28-
OSVmImage: 'windows-2019'
30+
Pool: azsdk-pool-mms-win-2019-general
31+
OSVmImage: MMS2019
2932
PythonVersion: '2.7'
3033
CoverageArg: '--disablecov'
3134
Linux_PyPy3:
32-
OSVmImage: 'ubuntu-18.04'
35+
Pool: azsdk-pool-mms-ubuntu-1804-general
36+
OSVmImage: MMSUbuntu18.04
3337
PythonVersion: 'pypy3'
3438
CoverageArg: '--disablecov'
3539
Linux_Python39:
36-
OSVmImage: 'ubuntu-18.04'
40+
Pool: azsdk-pool-mms-ubuntu-1804-general
41+
OSVmImage: MMSUbuntu18.04
3742
PythonVersion: '3.9'
3843
CoverageArg: ''
3944
CloudConfigurations:
@@ -53,6 +58,7 @@ jobs:
5358
continueOnError: false
5459

5560
pool:
61+
name: $(Pool)
5662
vmImage: $(OSVmImage)
5763

5864
steps:

‎sdk/eventhub/tests.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ jobs:
77
ServiceDirectory: eventhub
88
Matrix:
99
Linux_Python35:
10-
OSVmImage: 'ubuntu-18.04'
10+
Pool: azsdk-pool-mms-ubuntu-1804-general
11+
OSVmImage: MMSUbuntu18.04
1112
PythonVersion: '3.5'
1213
CoverageArg: '--disablecov'
1314
Linux_Python39:
14-
OSVmImage: 'ubuntu-18.04'
15+
Pool: azsdk-pool-mms-ubuntu-1804-general
16+
OSVmImage: MMSUbuntu18.04
1517
PythonVersion: '3.9'
1618
CoverageArg: ''
1719
Windows_Python27:
18-
OSVmImage: 'windows-2019'
20+
Pool: azsdk-pool-mms-win-2019-general
21+
OSVmImage: MMS2019
1922
PythonVersion: '2.7'
2023
CoverageArg: '--disablecov'
2124
MacOs_Python37:
25+
Pool: Azure Pipelines
2226
OSVmImage: 'macOS-10.15'
2327
PythonVersion: '3.7'
2428
CoverageArg: ''

‎sdk/formrecognizer/tests.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,45 @@ jobs:
1313
${{ if contains(variables['Build.DefinitionName'], 'prod') }}:
1414
Matrix:
1515
Linux_Python35:
16-
OSVmImage: 'ubuntu-18.04'
16+
Pool: azsdk-pool-mms-ubuntu-1804-general
17+
OSVmImage: MMSUbuntu18.04
1718
PythonVersion: '3.5'
1819
CoverageArg: '--disablecov'
1920
MacOs_Python37:
21+
Pool: Azure Pipelines
2022
OSVmImage: 'macOS-10.15'
2123
PythonVersion: '3.7'
2224
CoverageArg: '--disablecov'
2325
Windows_Python27:
24-
OSVmImage: 'windows-2019'
26+
Pool: azsdk-pool-mms-win-2019-general
27+
OSVmImage: MMS2019
2528
PythonVersion: '2.7'
2629
CoverageArg: '--disablecov'
2730
Linux_PyPy3:
28-
OSVmImage: 'ubuntu-18.04'
31+
Pool: azsdk-pool-mms-ubuntu-1804-general
32+
OSVmImage: MMSUbuntu18.04
2933
PythonVersion: 'pypy3'
3034
CoverageArg: '--disablecov'
3135
Linux_Python39:
32-
OSVmImage: 'ubuntu-18.04'
36+
Pool: azsdk-pool-mms-ubuntu-1804-general
37+
OSVmImage: MMSUbuntu18.04
3338
PythonVersion: '3.9'
3439
CoverageArg: ''
3540
${{ if not(contains(variables['Build.DefinitionName'], 'prod')) }}:
3641
Matrix:
3742
Linux_Python35:
38-
OSVmImage: 'ubuntu-18.04'
43+
Pool: azsdk-pool-mms-ubuntu-1804-general
44+
OSVmImage: MMSUbuntu18.04
3945
PythonVersion: '3.5'
4046
CoverageArg: '--disablecov'
4147
Windows_Python27:
42-
OSVmImage: 'windows-2019'
48+
Pool: azsdk-pool-mms-win-2019-general
49+
OSVmImage: MMS2019
4350
PythonVersion: '2.7'
4451
CoverageArg: '--disablecov'
4552
Linux_Python39:
46-
OSVmImage: 'ubuntu-18.04'
53+
Pool: azsdk-pool-mms-ubuntu-1804-general
54+
OSVmImage: MMSUbuntu18.04
4755
PythonVersion: '3.9'
4856
CoverageArg: ''
4957
EnvVars:

‎sdk/monitor/tests.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@ jobs:
1414
AZURE_TEST_RUN_LIVE: 'true'
1515
Matrix:
1616
Linux_Python35:
17-
OSVmImage: 'ubuntu-18.04'
17+
Pool: azsdk-pool-mms-ubuntu-1804-general
18+
OSVmImage: MMSUbuntu18.04
1819
PythonVersion: '3.5'
1920
CoverageArg: '--disablecov'
2021
MacOs_Python37:
22+
Pool: Azure Pipelines
2123
OSVmImage: 'macOS-10.15'
2224
PythonVersion: '3.7'
2325
CoverageArg: '--disablecov'
2426
Linux_Python39:
25-
OSVmImage: 'ubuntu-18.04'
27+
Pool: azsdk-pool-mms-ubuntu-1804-general
28+
OSVmImage: MMSUbuntu18.04
2629
PythonVersion: '3.9'
2730
CoverageArg: ''

‎sdk/schemaregistry/tests.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,22 @@ jobs:
1818
AZURE_TEST_RUN_LIVE: 'true'
1919
Matrix:
2020
Linux_Python35:
21-
OSVmImage: 'ubuntu-18.04'
21+
Pool: azsdk-pool-mms-ubuntu-1804-general
22+
OSVmImage: MMSUbuntu18.04
2223
PythonVersion: '3.5'
2324
CoverageArg: '--disablecov'
2425
MacOs_Python37:
26+
Pool: Azure Pipelines
2527
OSVmImage: 'macOS-10.15'
2628
PythonVersion: '3.7'
2729
CoverageArg: '--disablecov'
2830
Windows_Python27:
29-
OSVmImage: 'windows-2019'
31+
Pool: azsdk-pool-mms-win-2019-general
32+
OSVmImage: MMS2019
3033
PythonVersion: '2.7'
3134
CoverageArg: '--disablecov'
3235
Linux_Python38:
33-
OSVmImage: 'ubuntu-18.04'
36+
Pool: azsdk-pool-mms-ubuntu-1804-general
37+
OSVmImage: MMSUbuntu18.04
3438
PythonVersion: '3.8'
3539
CoverageArg: ''

‎sdk/servicebus/tests.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,22 @@ jobs:
1414
AZURE_TEST_RUN_LIVE: 'true'
1515
Matrix:
1616
Linux_Python35:
17-
OSVmImage: 'ubuntu-18.04'
17+
Pool: azsdk-pool-mms-ubuntu-1804-general
18+
OSVmImage: MMSUbuntu18.04
1819
PythonVersion: '3.5'
1920
CoverageArg: '--disablecov'
2021
MacOs_Python37:
22+
Pool: Azure Pipelines
2123
OSVmImage: 'macOS-10.15'
2224
PythonVersion: '3.7'
2325
CoverageArg: '--disablecov'
2426
Windows_Python27:
25-
OSVmImage: 'windows-2019'
27+
Pool: azsdk-pool-mms-win-2019-general
28+
OSVmImage: MMS2019
2629
PythonVersion: '2.7'
2730
CoverageArg: '--disablecov'
2831
Linux_Python39:
29-
OSVmImage: 'ubuntu-18.04'
32+
Pool: azsdk-pool-mms-ubuntu-1804-general
33+
OSVmImage: MMSUbuntu18.04
3034
PythonVersion: '3.9'
3135
CoverageArg: ''

0 commit comments

Comments
 (0)