diff --git a/common/tools/eslint-plugin-azure-sdk/ci.yml b/common/tools/eslint-plugin-azure-sdk/ci.yml index 2fd0a75e8df7..2253227cb6fb 100644 --- a/common/tools/eslint-plugin-azure-sdk/ci.yml +++ b/common/tools/eslint-plugin-azure-sdk/ci.yml @@ -15,7 +15,7 @@ jobs: - template: /eng/pipelines/templates/variables/globals.yml pool: - vmImage: 'Ubuntu 18.04' + vmImage: 'Ubuntu 20.04' steps: - template: /eng/pipelines/templates/steps/common.yml diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml index 6d63957efd3a..959893344c25 100644 --- a/eng/pipelines/docindex.yml +++ b/eng/pipelines/docindex.yml @@ -5,7 +5,7 @@ jobs: - job: UpdateDocsMsBuildConfig pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 variables: DocRepoLocation: $(Pipeline.Workspace)/docs DocRepoOwner: MicrosoftDocs diff --git a/eng/pipelines/mgmt-ci.yml b/eng/pipelines/mgmt-ci.yml index c2178aaa4235..906ab013e9b7 100644 --- a/eng/pipelines/mgmt-ci.yml +++ b/eng/pipelines/mgmt-ci.yml @@ -207,7 +207,7 @@ jobs: - job: 'Build' pool: - vmImage: 'Ubuntu 16.04' + vmImage: 'Ubuntu 20.04' steps: - task: NodeTool@0 @@ -236,7 +236,7 @@ jobs: - job: 'Analyze' pool: - vmImage: 'Ubuntu 16.04' + vmImage: 'Ubuntu 20.04' steps: - task: NodeTool@0 diff --git a/eng/pipelines/mgmt-pr.yml b/eng/pipelines/mgmt-pr.yml index e9f9a9db5a66..32f30504a7aa 100644 --- a/eng/pipelines/mgmt-pr.yml +++ b/eng/pipelines/mgmt-pr.yml @@ -205,7 +205,7 @@ jobs: - job: Build displayName: Build auto-generated projects pool: - vmImage: Ubuntu 16.04 + vmImage: Ubuntu 20.04 steps: - task: NodeTool@0 inputs: diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml index 22ad61dda60e..f1a755558c9e 100644 --- a/eng/pipelines/templates/jobs/ci.yml +++ b/eng/pipelines/templates/jobs/ci.yml @@ -26,8 +26,8 @@ jobs: - template: ../variables/globals.yml pool: - name: azsdk-pool-mms-ubuntu-1804-general - vmImage: MMSUbuntu18.04 + name: azsdk-pool-mms-ubuntu-2004-general + vmImage: MMSUbuntu20.04 steps: - script: | @@ -48,8 +48,8 @@ jobs: - template: ../variables/globals.yml pool: - name: azsdk-pool-mms-ubuntu-1804-general - vmImage: MMSUbuntu18.04 + name: azsdk-pool-mms-ubuntu-2004-general + vmImage: MMSUbuntu20.04 steps: - template: ../steps/common.yml diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml index 5fddde1e1c7d..40f51388f05d 100644 --- a/eng/pipelines/templates/jobs/smoke.tests.yml +++ b/eng/pipelines/templates/jobs/smoke.tests.yml @@ -15,8 +15,8 @@ jobs: variables: - template: /eng/pipelines/templates/variables/globals.yml pool: - name: "azsdk-pool-mms-ubuntu-1804-general" - vmImage: "MMSUbuntu18.04" + name: "azsdk-pool-mms-ubuntu-2004-general" + vmImage: "MMSUbuntu20.04" displayName: Check Smoke Test Eligibility steps: - template: /eng/pipelines/templates/steps/use-node-version.yml @@ -65,14 +65,14 @@ jobs: ArmTemplateParameters: $(AzureCloudArmTemplateParameters) NodeTestVersion: "12.x" Linux Node14 (AzureCloud): - Pool: "azsdk-pool-mms-ubuntu-1804-general" - OSVmImage: "MMSUbuntu18.04" + Pool: "azsdk-pool-mms-ubuntu-2004-general" + OSVmImage: "MMSUbuntu20.04" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(AzureCloudArmTemplateParameters) NodeTestVersion: "14.x" Linux Node16 (AzureCloud): - Pool: "azsdk-pool-mms-ubuntu-1804-general" - OSVmImage: "MMSUbuntu18.04" + Pool: "azsdk-pool-mms-ubuntu-2004-general" + OSVmImage: "MMSUbuntu20.04" SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(AzureCloudArmTemplateParameters) NodeTestVersion: "16.x" diff --git a/eng/pipelines/templates/stages/archetype-js-release.yml b/eng/pipelines/templates/stages/archetype-js-release.yml index dbf7947053b2..187be7bc08fe 100644 --- a/eng/pipelines/templates/stages/archetype-js-release.yml +++ b/eng/pipelines/templates/stages/archetype-js-release.yml @@ -23,8 +23,8 @@ stages: environment: github pool: - name: azsdk-pool-mms-ubuntu-1804-general - vmImage: MMSUbuntu18.04 + name: azsdk-pool-mms-ubuntu-2004-general + vmImage: MMSUbuntu20.04 strategy: runOnce: @@ -62,8 +62,8 @@ stages: dependsOn: TagRepository pool: - name: azsdk-pool-mms-ubuntu-1804-general - vmImage: MMSUbuntu18.04 + name: azsdk-pool-mms-ubuntu-2004-general + vmImage: MMSUbuntu20.04 strategy: runOnce: @@ -181,8 +181,8 @@ stages: dependsOn: PublishPackage pool: - name: azsdk-pool-mms-ubuntu-1804-general - vmImage: MMSUbuntu18.04 + name: azsdk-pool-mms-ubuntu-2004-general + vmImage: MMSUbuntu20.04 strategy: runOnce: @@ -225,8 +225,8 @@ stages: condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['SetDevVersion'], ''), eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal'))) displayName: Publish package to daily feed pool: - name: azsdk-pool-mms-ubuntu-1804-general - vmImage: MMSUbuntu18.04 + name: azsdk-pool-mms-ubuntu-2004-general + vmImage: MMSUbuntu20.04 steps: - checkout: self - download: current diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index d9f954271007..f9e1997fb4d1 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -4,29 +4,58 @@ }, "matrix": { "Agent": { - "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }, - "ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }, - "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" } + "windows-2019": { + "OSVmImage": "MMS2019", + "Pool": "azsdk-pool-mms-win-2019-general" + }, + "ubuntu-20.04": { + "OSVmImage": "MMSUbuntu20.04", + "Pool": "azsdk-pool-mms-ubuntu-2004-general" + }, + "macOS-10.15": { + "OSVmImage": "macOS-10.15", + "Pool": "Azure Pipelines" + } }, - "NodeTestVersion": [ "10.x", "12.x", "14.x", "16.x" ], + "NodeTestVersion": ["10.x", "12.x", "14.x", "16.x"], "TestType": "node", "TestResultsFiles": "**/test-results.xml" }, "include": [ { - "Agent": { "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" } }, + "Agent": { + "windows-2019": { + "OSVmImage": "MMS2019", + "Pool": "azsdk-pool-mms-win-2019-general" + } + }, "Scenario": { - "coverage": { "TestType": "node", "TestResultsFiles": "**/test-results.xml", "PublishCodeCoverage": "true" }, - "sample": { "TestType": "sample", "TestResultsFiles": "**/test-results.xml" }, - "browser": { "TestType": "browser", "TestResultsFiles": "**/test-results.browser.xml" } + "coverage": { + "TestType": "node", + "TestResultsFiles": "**/test-results.xml", + "PublishCodeCoverage": "true" + }, + "sample": { + "TestType": "sample", + "TestResultsFiles": "**/test-results.xml" + }, + "browser": { + "TestType": "browser", + "TestResultsFiles": "**/test-results.browser.xml" + } }, "NodeTestVersion": "12.x" }, { - "Agent": { "ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" } }, + "Agent": { + "ubuntu-20.04": { + "OSVmImage": "MMSUbuntu20.04", + "Pool": "azsdk-pool-mms-ubuntu-2004-general" + } + }, "TestType": "node", "NodeTestVersion": "12.x", - "DependencyVersion": [ "max", "min" ], + "DependencyVersion": ["max", "min"], "TestResultsFiles": "**/test-results.xml" } ] diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml index 67a41fbe143a..c8e9b2fca31f 100644 --- a/eng/pipelines/templates/variables/globals.yml +++ b/eng/pipelines/templates/variables/globals.yml @@ -1,7 +1,7 @@ variables: DocWardenVersion: '0.5.0' NodeVersion: "14.x" - OSVmImage: "ubuntu-18.04" + OSVmImage: "ubuntu-20.04" skipComponentGovernanceDetection: true coalesceResultFilter: $[ coalesce(variables['packageGlobFilter'], '**') ] ServiceVersion: ""