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. #13216

Merged
merged 1 commit into from
Jan 20, 2021
Merged
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
32 changes: 22 additions & 10 deletions eng/pipelines/templates/jobs/archetype-sdk-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,23 @@ parameters:
type: object
default:
Windows Node 8:
OSVmImage: "windows-2019"
Pool: azsdk-pool-mms-win-2019-general
OSVmImage: MMS2019
TestType: "node"
NodeTestVersion: "8.x"
PublishCodeCoverage: true
Linux Node 10:
OSVmImage: "ubuntu-18.04"
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
TestType: "node"
NodeTestVersion: "10.x"
Linux Node 12:
OSVmImage: "ubuntu-18.04"
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
TestType: "node"
NodeTestVersion: "12.x"
MacOS Node 14:
Pool: Azure Pipelines
OSVmImage: "macOS-10.15"
TestType: "node"
NodeTestVersion: "14.x"
Expand Down Expand Up @@ -103,28 +107,32 @@ jobs:
# Add matrix entry for browser testing
${{ if eq(parameters.TestBrowser, 'true') }}:
Windows Browser:
OSVmImage: "windows-2019"
Pool: azsdk-pool-mms-win-2019-general
OSVmImage: MMS2019
TestType: "browser"
NodeTestVersion: "$(NodeVersion)"
TestResultsFiles: "**/test-results.browser.xml"

# Add matrix entry for sample testing
${{ if eq(parameters.TestSamples, 'true') }}:
Samples Linux Node 10:
OSVmImage: "ubuntu-18.04"
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
TestType: "sample"
NodeTestVersion: "10.x"

# Add matrix entry for min-max testing
${{ if eq(parameters.TestMinMax, 'true') }}:
MaxVersion_Node:
OSVmImage: "ubuntu-18.04"
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
TestType: "node"
DependencyVersion: max
NodeTestVersion: "$(NodeVersion)"
TestResultsFiles: "**/test-results.xml"
MinVersion_Node:
OSVmImage: "ubuntu-18.04"
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
TestType: "node"
DependencyVersion: min
NodeTestVersion: "$(NodeVersion)"
Expand All @@ -133,7 +141,8 @@ jobs:
# Add matrix entry for same dep testing
${{ if eq(parameters.TestSame, 'true') }}:
SameVersion_Node:
OSVmImage: "ubuntu-18.04"
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
TestType: "node"
DependencyVersion: same
NodeTestVersion: "$(NodeVersion)"
Expand All @@ -142,14 +151,17 @@ jobs:
# Add matrix entry for canary testing
${{ if eq(parameters.TestCanary, 'true') }}:
CanaryTest_Node:
OSVmImage: "ubuntu-18.04"
Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04
TestType: "node"
NodeTestVersion: "$(NodeVersion)"
TestResultsFiles: "**/test-results.xml"
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ResourceGroupLocation: ${{ parameters.ResourceGroupLocationCanary }}

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

timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}

Expand Down