From e8cce7c00bec19f1100d040a57df47e951178d52 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Thu, 14 Jan 2021 15:40:52 +1100 Subject: [PATCH] Enable 1ES pools for live tests. --- .../jobs/archetype-sdk-integration.yml | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-integration.yml b/eng/pipelines/templates/jobs/archetype-sdk-integration.yml index d34afb4d5f70..362f2d473fe6 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-integration.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-integration.yml @@ -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" @@ -103,7 +107,8 @@ 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" @@ -111,20 +116,23 @@ jobs: # 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)" @@ -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)" @@ -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 }}