From e6cd68581a4d00f2e80af2d6c4de64950ff3e80d Mon Sep 17 00:00:00 2001
From: Chidozie Ononiwu <chononiw@microsoft.com>
Date: Tue, 6 Jul 2021 17:45:57 -0700
Subject: [PATCH] Update Ubuntu VM version from 18 to 20

---
 eng/pipelines/templates/jobs/ci.mgmt.yml                 | 2 +-
 eng/pipelines/templates/stages/archetype-net-release.yml | 4 ++--
 sdk/identity/platform-matrix.json                        | 2 +-
 sdk/keyvault/platform-matrix.json                        | 6 +++---
 sdk/storage/platform-matrix-all-versions.json            | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eng/pipelines/templates/jobs/ci.mgmt.yml b/eng/pipelines/templates/jobs/ci.mgmt.yml
index 4b2727a6943f..9355ae7864e9 100644
--- a/eng/pipelines/templates/jobs/ci.mgmt.yml
+++ b/eng/pipelines/templates/jobs/ci.mgmt.yml
@@ -45,7 +45,7 @@ jobs:
       matrix:
         Linux:
           Pool: Azure Pipelines
-          OSVmImage: "ubuntu-18.04"
+          OSVmImage: "ubuntu-20.04"
         Windows:
           Pool: Azure Pipelines
           OSVmImage: "windows-2019"
diff --git a/eng/pipelines/templates/stages/archetype-net-release.yml b/eng/pipelines/templates/stages/archetype-net-release.yml
index a81e2b611b60..63a1a0cc7cc1 100644
--- a/eng/pipelines/templates/stages/archetype-net-release.yml
+++ b/eng/pipelines/templates/stages/archetype-net-release.yml
@@ -83,8 +83,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:
diff --git a/sdk/identity/platform-matrix.json b/sdk/identity/platform-matrix.json
index 4d780fe0f7c9..5ba99d675241 100644
--- a/sdk/identity/platform-matrix.json
+++ b/sdk/identity/platform-matrix.json
@@ -3,7 +3,7 @@
     {
       "Agent": {
         "ubuntu_keyring_container": {
-          "OSVmImage": "ubuntu-18.04",
+          "OSVmImage": "ubuntu-20.04",
           "Pool": "Azure Pipelines",
           "Container": "ubuntu_netcore_keyring"
         }
diff --git a/sdk/keyvault/platform-matrix.json b/sdk/keyvault/platform-matrix.json
index 845021482bab..7374c39b6ea0 100644
--- a/sdk/keyvault/platform-matrix.json
+++ b/sdk/keyvault/platform-matrix.json
@@ -5,9 +5,9 @@
   "include": [
     {
       "Agent": {
-        "ubuntu-18.04": {
-          "OSVmImage": "MMSUbuntu18.04",
-          "Pool": "azsdk-pool-mms-ubuntu-1804-general"
+        "ubuntu-20.04": {
+          "OSVmImage": "MMSUbuntu20.04",
+          "Pool": "azsdk-pool-mms-ubuntu-2004-general"
         }
       },
       "ArmTemplateParameters": "@{ enableHsm = $true }",
diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json
index 9fff96828c0e..170e8275263b 100644
--- a/sdk/storage/platform-matrix-all-versions.json
+++ b/sdk/storage/platform-matrix-all-versions.json
@@ -1,9 +1,9 @@
 {
   "matrix": {
     "Agent": {
-      "ubuntu-18.04": {
-          "OSVmImage": "MMSUbuntu18.04",
-          "Pool": "azsdk-pool-mms-ubuntu-1804-storage"
+      "ubuntu-20.04": {
+          "OSVmImage": "MMSUbuntu20.04",
+          "Pool": "azsdk-pool-mms-ubuntu-2004-storage"
       },
       "windows-2019": {
           "OSVmImage": "MMS2019",