Update Ubuntu 18 to 20

Azure · Jul 6, 2021 · 25cb983 · 25cb983
1 parent 066ba01
commit 25cb983
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
@@ -27,10 +27,10 @@ parameters:
   default: []
 - name: Pool
   type: string
-  default: azsdk-pool-mms-ubuntu-1804-general
+  default: azsdk-pool-mms-ubuntu-2004-general
 - name: OsVmImage
   type: string
-  default: MMSUbuntu18.04
+  default: MMSUbuntu20.04
 # This parameter is only necessary if there are multiple invocations of this template within the SAME STAGE.
 # When that occurs, provide a name other than the default value.
 - name: GenerateJobName

diff --git a/sdk/cosmos/integration-matrix.json b/sdk/cosmos/integration-matrix.json
@@ -4,8 +4,8 @@
       "Session_Integration": {
         "ArmTemplateParameters": "@{ enableMultipleWriteLocations = $false; defaultConsistencyLevel = 'Session' }",
         "ProfileFlag": "-P integration-test-azure",
-        "Pool": "azsdk-pool-mms-ubuntu-1804-general",
-        "OSVmImage": "MMSUbuntu1804"
+        "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+        "OSVmImage": "MMSUbuntu2004"
         }
     }
   }

diff --git a/sdk/cosmos/platform-matrix.json b/sdk/cosmos/platform-matrix.json
@@ -34,7 +34,7 @@
       ],
       "ProfileFlag": "-Pe2e",
       "Agent": {
-        "ubuntu": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       }
     },
     {
@@ -44,7 +44,7 @@
       "ProfileFlag": [ "-Pnon-emulator", "-Pfast", "-Pdirect", "-e -Plong" ],
       "ArmTemplateParameters": "@{ enableMultipleWriteLocations = $false; defaultConsistencyLevel = 'Session' }",
       "Agent": {
-        "ubuntu": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       }
     },
     {
@@ -54,7 +54,7 @@
       "PROTOCOLS": "[\"Tcp\"]",
       "ProfileFlag": "-Pfast",
       "Agent": {
-        "ubuntu": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       }
     },
     {
@@ -64,7 +64,7 @@
       "ProfileFlag": "-Pe2e",
       "ArmTemplateParameters": "@{ enableMultipleWriteLocations = $false; defaultConsistencyLevel = 'Strong' }",
       "Agent": {
-        "ubuntu": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       }
     },
     {
@@ -74,7 +74,7 @@
       "ProfileFlag": [ "-Pdirect", "-Pnon-emulator" ],
       "ArmTemplateParameters": "@{ enableMultipleWriteLocations = $false; defaultConsistencyLevel = 'Strong' }",
       "Agent": {
-        "ubuntu": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       }
     },
     {
@@ -93,7 +93,7 @@
       "PROTOCOLS": "[\"Tcp\"]",
       "ProfileFlag": [ "-Pmulti-master", "-Pfast", "-Pdirect", "-Pnon-emulator" ],
       "Agent": {
-        "ubuntu": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       }
     },
     {
@@ -108,7 +108,7 @@
       "PROTOCOLS": "[\"Tcp\"]",
       "PREFERRED_LOCATIONS": null,
       "Agent": {
-        "ubuntu": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       }
     }
   ]

diff --git 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"
         },
         "JavaTestVersion": "1.11",
         "AZURE_TEST_HTTP_CLIENTS": "netty",

diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json
@@ -1,7 +1,7 @@
 {
   "matrix": {
     "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" },
       "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
     },
     "JavaTestVersion": [ "1.8", "1.11" ],

diff --git a/sdk/tables/platform-matrix.json b/sdk/tables/platform-matrix.json
@@ -7,7 +7,7 @@
   "matrix": {
     "Agent": {
       "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
-      "ubuntu-1804": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" },
+      "ubuntu-2004": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
       "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
     },
     "ArmTemplateParameters": [ "@{endpointType='storage'}", "@{endpointType='cosmos'}" ],
@@ -35,7 +35,7 @@
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "JavaTestVersion": "1.11",
       "Agent": {
-        "ubuntu-1804": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+        "ubuntu-2004": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       },
       "ArmTemplateParameters": "@{endpointType='storage'}",
       "TestFromSource": true