webkitpy: Add macOS Catalina, iOS 13
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jun 2019 15:33:14 +0000 (15:33 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jun 2019 15:33:14 +0000 (15:33 +0000)
https://bugs.webkit.org/show_bug.cgi?id=198492

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina@2x.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13@2x.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator@2x.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
* BuildSlaveSupport/ews-build/steps.py:
* Scripts/webkitpy/common/version_name_map.py:
* Scripts/webkitpy/common/version_name_map_unittest.py:
* Scripts/webkitpy/layout_tests/models/test_expectations.py:
* TestResultServer/static-dashboards/flakiness_dashboard.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina@2x.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13@2x.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator@2x.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css
Tools/BuildSlaveSupport/ews-build/steps.py
Tools/ChangeLog
Tools/Scripts/webkitpy/common/version_name_map.py
Tools/Scripts/webkitpy/common/version_name_map_unittest.py
Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
Tools/TestResultServer/static-dashboards/flakiness_dashboard.js

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png
new file mode 100644 (file)
index 0000000..1f0aa1d
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina@2x.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina@2x.png
new file mode 100644 (file)
index 0000000..f239cc5
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina@2x.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png
new file mode 100644 (file)
index 0000000..427b318
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13@2x.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13@2x.png
new file mode 100644 (file)
index 0000000..a6f35c7
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13@2x.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png
new file mode 100644 (file)
index 0000000..ce87b07
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator@2x.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator@2x.png
new file mode 100644 (file)
index 0000000..f9acf6f
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator@2x.png differ
index 61a3ae3..7ed9c3d 100644 (file)
@@ -25,8 +25,9 @@
 
 Dashboard = {
     Platform: {
-        macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 1 },
-        macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 2 },
+        macOSCatalina: { name: "macos-catalina", readableName: "macOS Catalina", order: 1 },
+        macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 2 },
+        macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 3 },
         iOS12Simulator: { name: "ios-simulator-12", readableName: "iOS 12 Simulator", order: 20 },
         iOS12Device: { name: "ios-12", readableName: "iOS 12", order: 25 },
         Windows10: { name: "windows-10", readableName: "Windows 10", order: 30 },
index 865bfac..9416a51 100644 (file)
@@ -205,6 +205,16 @@ table.queue-grid tr.platform.ios-12 img.logo {
     content: -webkit-image-set(url(../Images/IOS12@2x.png) 2x, url(../Images/IOS12.png) 1x);
 }
 
+table.queue-grid tr.platform.ios-simulator-13 img.logo {
+    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+    content: -webkit-image-set(url(../Images/IOS13Simulator@2x.png) 2x, url(../Images/IOS13Simulator.png) 1x);
+}
+
+table.queue-grid tr.platform.ios-13 img.logo {
+    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+    content: -webkit-image-set(url(../Images/IOS13@2x.png) 2x, url(../Images/IOS13.png) 1x);
+}
+
 table.queue-grid tr.platform.macos-highsierra img.logo {
     content: -webkit-image-set(url(../Images/HighSierra@2x.png) 2x, url(../Images/HighSierra.png) 1x);
 }
@@ -213,6 +223,10 @@ table.queue-grid tr.platform.macos-mojave img.logo {
     content: -webkit-image-set(url(../Images/Mojave@2x.png) 2x, url(../Images/Mojave.png) 1x);
 }
 
+table.queue-grid tr.platform.macos-catalina img.logo {
+    content: -webkit-image-set(url(../Images/Catalina@2x.png) 2x, url(../Images/Catalina.png) 1x);
+}
+
 table.queue-grid tr.platform.wincairo-windows-10 img.logo {
     content: -webkit-image-set(url(../Images/Windows10@2x.png) 2x, url(../Images/Windows10.png) 1x);
 }
index f2b74f3..18bda56 100644 (file)
@@ -1086,6 +1086,7 @@ class PrintConfiguration(steps.ShellSequence):
             return 'Unknown'
 
         build_to_name_mapping = {
+            '10.15': 'Catalina',
             '10.14': 'Mojave',
             '10.13': 'High Sierra',
             '10.12': 'Sierra',
index 63e8fde..29545fe 100644 (file)
@@ -1,3 +1,24 @@
+2019-06-17  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Add macOS Catalina, iOS 13
+        https://bugs.webkit.org/show_bug.cgi?id=198492
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina@2x.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13@2x.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator@2x.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
+        * BuildSlaveSupport/ews-build/steps.py:
+        * Scripts/webkitpy/common/version_name_map.py:
+        * Scripts/webkitpy/common/version_name_map_unittest.py:
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+        * TestResultServer/static-dashboards/flakiness_dashboard.js:
+
 2019-06-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. [GTK] Bump WPEBackend-fdo requirement to 1.3.1
index daabbc8..42c3519 100644 (file)
@@ -60,10 +60,11 @@ class VersionNameMap(object):
                 'Sierra': Version(10, 12),
                 'High Sierra': Version(10, 13),
                 'Mojave': Version(10, 14),
+                'Catalina': Version(10, 15),
             },
-            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(12)),
-            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(12)),
-            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(5)),
+            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(13)),
+            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(13)),
+            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(6)),
             'win': {
                 'Win10': Version(10),
                 '8.1': Version(6, 3),
index c444215..ae509c4 100644 (file)
@@ -36,6 +36,8 @@ class VersionMapTestCase(unittest.TestCase):
 
     def test_mac_version_by_name(self):
         map = VersionNameMap()
+        self.assertEqual(('mac', Version(10, 15)), map.from_name('Catalina'))
+        self.assertEqual(('mac', Version(10, 15)), map.from_name('catalina'))
         self.assertEqual(('mac', Version(10, 14)), map.from_name('Mojave'))
         self.assertEqual(('mac', Version(10, 14)), map.from_name('mojave'))
         self.assertEqual(('mac', Version(10, 13)), map.from_name('High Sierra'))
@@ -57,6 +59,7 @@ class VersionMapTestCase(unittest.TestCase):
 
     def test_mac_name_by_version(self):
         map = VersionNameMap()
+        self.assertEqual('Catalina', map.to_name(version=Version(10, 15), platform='mac'))
         self.assertEqual('Mojave', map.to_name(version=Version(10, 14), platform='mac'))
         self.assertEqual('High Sierra', map.to_name(version=Version(10, 13), platform='mac'))
         self.assertEqual('High Sierra', map.to_name(version=Version(10, 13, 3), platform='mac'))
@@ -66,6 +69,7 @@ class VersionMapTestCase(unittest.TestCase):
 
     def test_ios_name_by_version(self):
         map = VersionNameMap()
+        self.assertEqual('iOS 13', map.to_name(version=Version(13), platform='ios'))
         self.assertEqual('iOS 12', map.to_name(version=Version(12), platform='ios'))
         self.assertEqual('iOS 11', map.to_name(version=Version(11), platform='ios'))
         self.assertEqual('iOS 10', map.to_name(version=Version(10), platform='ios'))
index 2587b0b..69e3362 100644 (file)
@@ -226,7 +226,7 @@ class TestExpectationParser(object):
     # FIXME: Update the original modifiers and remove this once the old syntax is gone.
     _configuration_tokens_list = [
         'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite', 'ElCapitan', # Legacy macOS
-        'Mac', 'Sierra', 'HighSierra', 'Mojave',
+        'Mac', 'Sierra', 'HighSierra', 'Mojave', 'Catalina',
         'Win', 'XP', 'Vista', 'Win7',
         'Linux',
         'Android',
index e50c384..a2a45bc 100644 (file)
@@ -61,6 +61,12 @@ var PLATFORMS = {
                             'WK2': { fallbackPlatforms: ['APPLE_MAC_MOJAVE', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
                         }
                     },
+                    'CATALINA': {
+                        subPlatforms: {
+                            'WK1': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC'] },
+                            'WK2': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
+                        }
+                    },
                 }
             },
             'WIN': {
@@ -359,6 +365,8 @@ function determineBuilderPlatform(builderNameUpperCase)
     if (string.contains(builderNameUpperCase, 'WINCAIRO'))
         return 'WINCAIRO';
 
+    if (string.contains(builderNameUpperCase, 'CATALINA'))
+        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_CATALINA');
     if (string.contains(builderNameUpperCase, 'MOJAVE'))
         return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_MOJAVE');
     if (string.contains(builderNameUpperCase, 'HIGHSIERRA'))
@@ -712,6 +720,7 @@ function getParsedExpectations(data)
             'Sierra': 'SIERRA',
             'HighSierra': 'HIGHSIERRA',
             'Mojave': 'MOJAVE',
+            'Catalina': 'CATALINA',
             'Win7': 'WIN7',
             'Win10': 'WIN10',
             'XP': 'XP',