From 33be582009bc54d5ae0feeee339f0194f59fcd3d Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Mon, 10 Feb 2020 14:51:53 +0000
Subject: [PATCH] Bug 1612149 - Update linux64 try syntax aliases for 18.04;
 r=jmaher

Update existing unit test aliases for linux64 to include the new 18.04 platforms.

Differential Revision: https://phabricator.services.mozilla.com/D62137

--HG--
extra : moz-landing-system : lando
---
 .../taskgraph/test/test_try_option_syntax.py   |  3 ++-
 taskcluster/taskgraph/try_option_syntax.py     | 18 ++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/taskcluster/taskgraph/test/test_try_option_syntax.py b/taskcluster/taskgraph/test/test_try_option_syntax.py
index 6bf5bccaa675..cf52a52a31ce 100644
--- a/taskcluster/taskgraph/test/test_try_option_syntax.py
+++ b/taskcluster/taskgraph/test/test_try_option_syntax.py
@@ -246,7 +246,8 @@ class TestTryOptionSyntax(unittest.TestCase):
         parameters = {'try_options': parse_message('try: -u gtest[Ubuntu]')}
         tos = TryOptionSyntax(parameters, graph_with_jobs, GRAPH_CONFIG)
         self.assertEqual(sorted(tos.unittests), sorted([
-            {'test': 'gtest', 'platforms': ['linux32', 'linux64', 'linux64-asan']},
+            {'test': 'gtest', 'platforms': ['linux32', 'linux64', 'linux64-asan',
+                                            'linux1804-64', 'linux1804-64-asan']},
         ]))
 
     def test_u_platforms_negated(self):
diff --git a/taskcluster/taskgraph/try_option_syntax.py b/taskcluster/taskgraph/try_option_syntax.py
index aa7a6f18a7cf..310d2817a22f 100644
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -119,29 +119,23 @@ UNITTEST_PLATFORM_PRETTY_NAMES = {
     'Ubuntu': [
         'linux32',
         'linux64',
-        'linux64-asan'
+        'linux64-asan',
+        'linux1804-64',
+        'linux1804-64-asan'
     ],
     'x64': [
         'linux64',
-        'linux64-asan'
+        'linux64-asan',
+        'linux1804-64',
+        'linux1804-64-asan'
     ],
     'Android 7.0 Moto G5 32bit': ['android-hw-g5-7.0-arm7-api-16'],
     'Android 8.0 Google Pixel 2 32bit': ['android-hw-p2-8.0-arm7-api-16'],
     'Android 8.0 Google Pixel 2 64bit': ['android-hw-p2-8.0-android-aarch64'],
     '10.14': ['macosx1014-64'],
-    # other commonly-used substrings for platforms not yet supported with
-    # in-tree taskgraphs:
-    # '10.10.5': [..TODO..],
-    # '10.6': [..TODO..],
-    # '10.8': [..TODO..],
-    # 'Android 2.3 API9': [..TODO..],
     'Windows 7':  ['windows7-32'],
     'Windows 7 VM':  ['windows7-32-vm'],
-    'Windows 8':  ['windows8-64'],
     'Windows 10':  ['windows10-64'],
-    # 'Windows XP': [..TODO..],
-    # 'win32': [..TODO..],
-    # 'win64': [..TODO..],
 }
 
 TEST_CHUNK_SUFFIX = re.compile('(.*)-([0-9]+)$')