Upgrade Linux MSan to Focal

Bug: chromium:1260217
Change-Id: I2c8ee36fbf2cd754ac5fd7a983c44478b81ef068
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291840
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39260}

5 files changed, 50 insertions, 43 deletions

diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 9f992751a3..bb7f62e6f9 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -2907,7 +2907,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -2928,7 +2928,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -2949,7 +2949,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -2970,7 +2970,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -2994,7 +2994,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3015,7 +3015,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 2
@@ -3037,7 +3037,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 6
@@ -3059,7 +3059,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 4
@@ -3081,7 +3081,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3102,7 +3102,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3123,7 +3123,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3144,7 +3144,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 6
@@ -3166,7 +3166,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3187,7 +3187,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 4
@@ -3209,7 +3209,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3230,7 +3230,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3251,7 +3251,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3272,7 +3272,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 4
@@ -3294,7 +3294,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -3315,7 +3315,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index d803419b22..b25a1fd679 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -129,6 +129,13 @@
       }
     }
   },
+  'linux-focal': {
+    'swarming': {
+      'dimensions': {
+        'os': 'Ubuntu-20.04'
+      }
+    }
+  },
   'mac-m1-cpu': {
     'swarming': {
       'dimensions': {
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 26b8e145bb..20fe7767ae 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -7770,7 +7770,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -7791,7 +7791,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -7812,7 +7812,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -7833,7 +7833,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -7857,7 +7857,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -7878,7 +7878,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 2
@@ -7900,7 +7900,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 6
@@ -7922,7 +7922,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 4
@@ -7944,7 +7944,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -7965,7 +7965,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -7986,7 +7986,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -8007,7 +8007,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 6
@@ -8029,7 +8029,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -8050,7 +8050,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 4
@@ -8072,7 +8072,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -8093,7 +8093,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -8114,7 +8114,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -8135,7 +8135,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ],
           "shards": 4
@@ -8157,7 +8157,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
@@ -8178,7 +8178,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-20.04"
             }
           ]
         },
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index a24ada6256..2cd477d432 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -93,7 +93,7 @@
       },
       'Linux MSan': {
         'os_type': 'linux',
-        'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
+        'mixins': ['linux-focal', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
           # TODO(crbug.com/webrtc/14568): Using 'linux_tests'
           # fails on "MemorySanitizer: use-of-uninitialized-value in
@@ -508,7 +508,7 @@
       },
       'linux_msan': {
         'os_type': 'linux',
-        'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
+        'mixins': ['linux-focal', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
           # TODO(crbug.com/webrtc/14568): Using 'linux_tests'
           # fails on "MemorySanitizer: use-of-uninitialized-value in
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index ddfa666056..b7b827f0ef 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -421,7 +421,7 @@
     },
     'msan': {
       'gn_args': 'is_msan=true msan_track_origins=2'
-                 ' instrumented_libraries_release = "xenial"',
+                 ' instrumented_libraries_release = "focal"',
     },
     'no_ios_code_signing': {
       'gn_args': 'ios_enable_code_signing=false',