From 904347814d46ed93b35106cd2c9edd11a2e012ae Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Fri, 22 Jan 2021 08:08:38 +1100 Subject: [PATCH] Enable 1ES pools for live tests. (#16160) * Enable 1ES pools for live tests. --- .../templates/jobs/archetype-sdk-tests.yml | 14 ++++++++---- sdk/eventhub/tests.yml | 10 ++++++--- sdk/formrecognizer/tests.yml | 22 +++++++++++++------ sdk/monitor/tests.yml | 7 ++++-- sdk/schemaregistry/tests.yml | 10 ++++++--- sdk/servicebus/tests.yml | 10 ++++++--- 6 files changed, 51 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index 8bc0c0ae6e4b..54c1003a4b6f 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -17,23 +17,28 @@ parameters: Location: '' Matrix: Linux_Python35: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' MacOs_Python37: + Pool: Azure Pipelines OSVmImage: 'macOS-10.15' PythonVersion: '3.7' CoverageArg: '--disablecov' Windows_Python27: - OSVmImage: 'windows-2019' + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 PythonVersion: '2.7' CoverageArg: '--disablecov' Linux_PyPy3: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: 'pypy3' CoverageArg: '--disablecov' Linux_Python39: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.9' CoverageArg: '' CloudConfigurations: @@ -53,6 +58,7 @@ jobs: continueOnError: false pool: + name: $(Pool) vmImage: $(OSVmImage) steps: diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml index 33d4d306ec75..442de969c3ab 100644 --- a/sdk/eventhub/tests.yml +++ b/sdk/eventhub/tests.yml @@ -7,18 +7,22 @@ jobs: ServiceDirectory: eventhub Matrix: Linux_Python35: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' Linux_Python39: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.9' CoverageArg: '' Windows_Python27: - OSVmImage: 'windows-2019' + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 PythonVersion: '2.7' CoverageArg: '--disablecov' MacOs_Python37: + Pool: Azure Pipelines OSVmImage: 'macOS-10.15' PythonVersion: '3.7' CoverageArg: '' diff --git a/sdk/formrecognizer/tests.yml b/sdk/formrecognizer/tests.yml index 40f5f263f9f3..13b111649c4c 100644 --- a/sdk/formrecognizer/tests.yml +++ b/sdk/formrecognizer/tests.yml @@ -13,37 +13,45 @@ jobs: ${{ if contains(variables['Build.DefinitionName'], 'prod') }}: Matrix: Linux_Python35: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' MacOs_Python37: + Pool: Azure Pipelines OSVmImage: 'macOS-10.15' PythonVersion: '3.7' CoverageArg: '--disablecov' Windows_Python27: - OSVmImage: 'windows-2019' + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 PythonVersion: '2.7' CoverageArg: '--disablecov' Linux_PyPy3: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: 'pypy3' CoverageArg: '--disablecov' Linux_Python39: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.9' CoverageArg: '' ${{ if not(contains(variables['Build.DefinitionName'], 'prod')) }}: Matrix: Linux_Python35: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' Windows_Python27: - OSVmImage: 'windows-2019' + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 PythonVersion: '2.7' CoverageArg: '--disablecov' Linux_Python39: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.9' CoverageArg: '' EnvVars: diff --git a/sdk/monitor/tests.yml b/sdk/monitor/tests.yml index 541b9501268d..fd0c57f4e093 100644 --- a/sdk/monitor/tests.yml +++ b/sdk/monitor/tests.yml @@ -14,14 +14,17 @@ jobs: AZURE_TEST_RUN_LIVE: 'true' Matrix: Linux_Python35: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' MacOs_Python37: + Pool: Azure Pipelines OSVmImage: 'macOS-10.15' PythonVersion: '3.7' CoverageArg: '--disablecov' Linux_Python39: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.9' CoverageArg: '' diff --git a/sdk/schemaregistry/tests.yml b/sdk/schemaregistry/tests.yml index 683752b44788..7b2df8b2ef75 100644 --- a/sdk/schemaregistry/tests.yml +++ b/sdk/schemaregistry/tests.yml @@ -18,18 +18,22 @@ jobs: AZURE_TEST_RUN_LIVE: 'true' Matrix: Linux_Python35: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' MacOs_Python37: + Pool: Azure Pipelines OSVmImage: 'macOS-10.15' PythonVersion: '3.7' CoverageArg: '--disablecov' Windows_Python27: - OSVmImage: 'windows-2019' + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 PythonVersion: '2.7' CoverageArg: '--disablecov' Linux_Python38: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.8' CoverageArg: '' diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml index 99b0f7e52dca..71ed728bf9c3 100644 --- a/sdk/servicebus/tests.yml +++ b/sdk/servicebus/tests.yml @@ -14,18 +14,22 @@ jobs: AZURE_TEST_RUN_LIVE: 'true' Matrix: Linux_Python35: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' MacOs_Python37: + Pool: Azure Pipelines OSVmImage: 'macOS-10.15' PythonVersion: '3.7' CoverageArg: '--disablecov' Windows_Python27: - OSVmImage: 'windows-2019' + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 PythonVersion: '2.7' CoverageArg: '--disablecov' Linux_Python39: - OSVmImage: 'ubuntu-18.04' + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.9' CoverageArg: '' \ No newline at end of file