Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable 1ES pools for live tests. #17973

Merged
merged 6 commits into from
Jan 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}

pool:
name: $(Pool)
vmImage: $(OSVmImage)

${{ if eq(parameters.UsePlatformContainer, 'true') }}:
Expand All @@ -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 }}:
Expand Down
22 changes: 15 additions & 7 deletions eng/pipelines/templates/stages/archetype-sdk-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion sdk/identity/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down