diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml index edf452ba91dc..9eba2532e89d 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml @@ -60,6 +60,7 @@ jobs: timeoutInMinutes: ${{ parameters.TimeoutInMinutes }} pool: + name: $(Pool) vmImage: $(OSVmImage) ${{ if eq(parameters.UsePlatformContainer, 'true') }}: @@ -68,7 +69,7 @@ jobs: steps: - ${{ parameters.PreSteps }} - - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml +# - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml - ${{ each step in parameters.TestSetupSteps }}: - ${{ each pair in step }}: diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml index 9b9c97a0dffc..dc90bd187dde 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml @@ -56,32 +56,40 @@ parameters: type: object default: Linux: - OSVmImage: "ubuntu-18.04" + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 TestTargetFramework: netcoreapp2.1 Windows_NetCoreApp: - OSVmImage: "windows-2019" + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 TestTargetFramework: netcoreapp2.1 SupportsRecording: true Windows_NetCoreApp_ProjectReferences: - OSVmImage: "windows-2019" + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 TestTargetFramework: netcoreapp2.1 AdditionalTestArguments: "/p:UseProjectReferenceToAzureClients=true" Windows_NetFramework: - OSVmImage: "windows-2019" + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 TestTargetFramework: net461 Windows_NetFramework_ProjectReferences: - OSVmImage: "windows-2019" + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 TestTargetFramework: net461 AdditionalTestArguments: "/p:UseProjectReferenceToAzureClients=true" MacOS: + Pool: Azure Pipelines OSVmImage: "macOS-10.15" TestTargetFramework: netcoreapp2.1 SupportedClouds: 'Public' Windows_Net50: - OSVmImage: "windows-2019" + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 TestTargetFramework: net5.0 Windows_Net50_ProjectReferences: - OSVmImage: "windows-2019" + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 TestTargetFramework: net5.0 AdditionalTestArguments: "/p:UseProjectReferenceToAzureClients=true" - name: PlatformPreSteps diff --git a/sdk/identity/tests.yml b/sdk/identity/tests.yml index 90d07d473489..9d2fd144e22a 100644 --- a/sdk/identity/tests.yml +++ b/sdk/identity/tests.yml @@ -12,7 +12,8 @@ extends: parameters: AdditionalPlatforms: Linux_NetCore_Keyring: - OSVmImage: "ubuntu-18.04" + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 TestTargetFramework: 'netcoreapp2.1' Container: 'ubuntu_netcore_keyring' SupportedClouds: 'Public,Canary,Preview'