Title: [249960] trunk/Tools
Revision
249960
Author
ryanhad...@apple.com
Date
2019-09-17 09:49:49 -0700 (Tue, 17 Sep 2019)

Log Message

Bring up queues for iOS 13
https://bugs.webkit.org/show_bug.cgi?id=201710

Reviewed by Jonathan Bedard.

* BuildSlaveSupport/build.webkit.org-config/config.json: Move iOS 12 queues to iOS 13.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: Ditto.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
(table.queue-grid tr.platform.ios-simulator-12 img.logo): Deleted.
(table.queue-grid tr.platform.ios-12 img.logo): Deleted.
* BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Update unit tests.
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
(_should_file_trigger_build):
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
(ShouldBuildTest):
(ShouldBuildTest.test_should_build):
* BuildSlaveSupport/ews-build/config.json: Move iOS 12 queues to iOS 13.

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2019-09-17 16:49:49 UTC (rev 249960)
@@ -34,15 +34,15 @@
                     { "name": "bot636", "platform": "mac-highsierra" },
                     { "name": "bot638", "platform": "mac-highsierra" },
 
-                    { "name": "bot673", "platform": "ios-12" },
-                    { "name": "bot651", "platform": "ios-simulator-12" },
-                    { "name": "bot652", "platform": "ios-simulator-12" },
-                    { "name": "bot653", "platform": "ios-simulator-12" },
-                    { "name": "bot654", "platform": "ios-simulator-12" },
-                    { "name": "bot677", "platform": "ios-simulator-12" },
-                    { "name": "bot682", "platform": "ios-simulator-12" },
-                    { "name": "bot694", "platform": "ios-simulator-12" },
-                    { "name": "bot695", "platform": "ios-simulator-12" },
+                    { "name": "bot673", "platform": "ios-13" },
+                    { "name": "bot651", "platform": "ios-simulator-13" },
+                    { "name": "bot652", "platform": "ios-simulator-13" },
+                    { "name": "bot653", "platform": "ios-simulator-13" },
+                    { "name": "bot654", "platform": "ios-simulator-13" },
+                    { "name": "bot677", "platform": "ios-simulator-13" },
+                    { "name": "bot682", "platform": "ios-simulator-13" },
+                    { "name": "bot694", "platform": "ios-simulator-13" },
+                    { "name": "bot695", "platform": "ios-simulator-13" },
 
                     { "name": "bot543", "platform": "win" },
                     { "name": "bot544", "platform": "win" },
@@ -174,31 +174,31 @@
                       "slavenames": ["bot632"]
                     },
                     {
-                      "name": "Apple iOS 12 Release (Build)", "type": "Build", "builddir": "ios-12-release",
-                      "platform": "ios-12", "configuration": "release", "architectures": ["arm64"],
+                      "name": "Apple iOS 13 Release (Build)", "type": "Build", "builddir": "ios-13-release",
+                      "platform": "ios-13", "configuration": "release", "architectures": ["arm64"],
                       "slavenames": ["bot673"]
                     },
                     {
-                      "name": "Apple iOS 12 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-12-release",
-                      "platform": "ios-simulator-12", "configuration": "release", "architectures": ["x86_64"],
-                      "triggers": ["ios-simulator-12-release-tests-wk2"],
+                      "name": "Apple iOS 13 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-13-release",
+                      "platform": "ios-simulator-13", "configuration": "release", "architectures": ["x86_64"],
+                      "triggers": ["ios-simulator-13-release-tests-wk2"],
                       "slavenames": ["bot677", "bot682"]
                     },
                     {
-                      "name": "Apple iOS 12 Simulator Debug (Build)", "type": "Build", "builddir": "ios-simulator-12-debug",
-                      "platform": "ios-simulator-12", "configuration": "debug", "architectures": ["x86_64"],
-                      "triggers": ["ios-simulator-12-debug-tests-wk2"],
+                      "name": "Apple iOS 13 Simulator Debug (Build)", "type": "Build", "builddir": "ios-simulator-13-debug",
+                      "platform": "ios-simulator-13", "configuration": "debug", "architectures": ["x86_64"],
+                      "triggers": ["ios-simulator-13-debug-tests-wk2"],
                       "slavenames": ["bot694", "bot695"]
                     },
                     {
-                      "name": "Apple iOS 12 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-12-release-tests-wk2",
-                      "platform": "ios-simulator-12", "configuration": "release", "architectures": ["x86_64"],
+                      "name": "Apple iOS 13 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-13-release-tests-wk2",
+                      "platform": "ios-simulator-13", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot651", "bot652"]
                     },
                     {
-                      "name": "Apple iOS 12 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-12-debug-tests-wk2",
-                      "platform": "ios-simulator-12", "configuration": "debug", "architectures": ["x86_64"],
+                      "name": "Apple iOS 13 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-13-debug-tests-wk2",
+                      "platform": "ios-simulator-13", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
                       "slavenames": ["bot653", "bot654"]
                     },
@@ -386,11 +386,11 @@
                     { "type": "PlatformSpecificScheduler", "platform": "mac-highsierra", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple High Sierra Release (Build)", "Apple High Sierra Debug (Build)", "Apple High Sierra LLINT CLoop (BuildAndTest)"]
                     },
-                    { "type": "PlatformSpecificScheduler", "platform": "ios-12", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple iOS 12 Release (Build)"]
+                    { "type": "PlatformSpecificScheduler", "platform": "ios-13", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple iOS 13 Release (Build)"]
                     },
-                    { "type": "PlatformSpecificScheduler", "platform": "ios-simulator-12", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple iOS 12 Simulator Release (Build)", "Apple iOS 12 Simulator Debug (Build)"]
+                    { "type": "PlatformSpecificScheduler", "platform": "ios-simulator-13", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple iOS 13 Simulator Release (Build)", "Apple iOS 13 Simulator Debug (Build)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple Win 7 Release (Build)", "Apple Win 10 Release (Build)", "Apple Win 10 Debug (Build)"]
@@ -422,11 +422,11 @@
                     { "type": "Triggerable", "name": "highsierra-release-tests-test262",
                       "builderNames": ["Apple High Sierra Release Test262 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-12-release-tests-wk2",
-                      "builderNames": ["Apple iOS 12 Simulator Release WK2 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-13-release-tests-wk2",
+                      "builderNames": ["Apple iOS 13 Simulator Release WK2 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-12-debug-tests-wk2",
-                      "builderNames": ["Apple iOS 12 Simulator Debug WK2 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-13-debug-tests-wk2",
+                      "builderNames": ["Apple iOS 13 Simulator Debug WK2 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "win10-release-tests",
                       "builderNames": ["Apple Win 10 Release (Tests)"]

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2019-09-17 16:49:49 UTC (rev 249960)
@@ -28,8 +28,8 @@
         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 },
+        iOS13Simulator: { name: "ios-simulator-13", readableName: "iOS 13 Simulator", order: 20 },
+        iOS13Device: { name: "ios-13", readableName: "iOS 13", order: 25 },
         Windows10: { name: "windows-10", readableName: "Windows 10", order: 30 },
         Windows7: { name: "windows-7", readableName: "Windows 7", order: 35 },
         WinCairo: { name: "wincairo-windows-10", readableName: "WinCairo", order: 50 },

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2019-09-17 16:49:49 UTC (rev 249960)
@@ -47,11 +47,11 @@
             "Apple High Sierra Debug Test262 (Tests)": {heading: "Debug Test262 (Tests)"},
             "Apple High Sierra Release Test262 (Tests)": {heading: "Release Test262 (Tests)"},
         }},
-        "Apple iOS 12 Release (Build)": {platform: Dashboard.Platform.iOS12Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 12 Simulator Release (Build)": {platform: Dashboard.Platform.iOS12Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 12 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS12Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
-        "Apple iOS 12 Simulator Debug (Build)": {platform: Dashboard.Platform.iOS12Simulator, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 12 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS12Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple iOS 13 Release (Build)": {platform: Dashboard.Platform.iOS13Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "Apple iOS 13 Simulator Release (Build)": {platform: Dashboard.Platform.iOS13Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "Apple iOS 13 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple iOS 13 Simulator Debug (Build)": {platform: Dashboard.Platform.iOS13Simulator, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "Apple iOS 13 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
         "Apple Win 10 Debug (Build)": {platform: Dashboard.Platform.Windows10, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit },
         "Apple Win 10 Release (Build)": {platform: Dashboard.Platform.Windows10, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
         "Apple Win 10 Debug (Tests)": {platform: Dashboard.Platform.Windows10, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2019-09-17 16:49:49 UTC (rev 249960)
@@ -195,16 +195,6 @@
     content: "Windows 7";
 }
 
-table.queue-grid tr.platform.ios-simulator-12 img.logo {
-    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
-    content: -webkit-image-set(url(../Images/ios12simula...@2x.png) 2x, url(../Images/IOS12Simulator.png) 1x);
-}
-
-table.queue-grid tr.platform.ios-12 img.logo {
-    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
-    content: -webkit-image-set(url(../Images/io...@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/ios13simula...@2x.png) 2x, url(../Images/IOS13Simulator.png) 1x);

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2019-09-17 16:49:49 UTC (rev 249960)
@@ -548,12 +548,12 @@
     'Apple High Sierra Release WK2 (Perf)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'perf-test'],
     'Apple High Sierra Release WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
 
-    'Apple iOS 12 Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
-    'Apple iOS 12 Simulator Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
-    'Apple iOS 12 Simulator Release WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple iOS 13 Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+    'Apple iOS 13 Simulator Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
+    'Apple iOS 13 Simulator Release WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
 
-    'Apple iOS 12 Simulator Debug (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
-    'Apple iOS 12 Simulator Debug WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple iOS 13 Simulator Debug (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
+    'Apple iOS 13 Simulator Debug WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
 
     'JSCOnly Linux ARMv7 Thumb2 Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
     'JSCOnly Linux ARMv7 Thumb2 SoftFP Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2019-09-17 16:49:49 UTC (rev 249960)
@@ -37,7 +37,7 @@
     # and start using it for their bots. Someone familiar with each platform
     # will have to figure out what the right set of directories/patterns is for
     # that platform.
-    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-12", "ios-simulator-12"))
+    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-13", "ios-simulator-13"))
 
     directories = [
         # Directories that shouldn't trigger builds on any bots.

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2019-09-17 16:49:49 UTC (rev 249960)
@@ -29,8 +29,8 @@
         (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit/ChangeLog-2011-02-11"], []),
         (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
         (["Websites/bugs.webkit.org/foo"], []),
-        (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-12", "ios-simulator-12"]),
-        (["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-12", "ios-simulator-12"]),
+        (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13"]),
+        (["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13"]),
         (["Source/_javascript_Core/_javascript_Core.vcproj/foo", "Source/WebKit/win/WebKit2.vcproj", "Source/WebKitLegacy/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
         (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
         (["LayoutTests/foo"], ["*"]),
@@ -40,10 +40,10 @@
         (["LayoutTests/platform/mac-sierra/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
         (["LayoutTests/platform/mac-highsierra/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["LayoutTests/platform/mac-mojave/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
-        (["LayoutTests/platform/ios-simulator/foo"], ["ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-12", "ios-simulator-12"]),
+        (["LayoutTests/platform/ios-simulator/foo"], ["ios-13", "ios-simulator-13"]),
+        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-13", "ios-simulator-13"]),
+        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-13", "ios-simulator-13"]),
+        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13"]),
         (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         (["LayoutTests/platform/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win"]),
@@ -51,19 +51,19 @@
         (["LayoutTests/platform/win-xp/foo"], ["win"]),
         (["LayoutTests/platform/win-wk1/foo"], ["win"]),
         (["LayoutTests/platform/win/foo"], ["win"]),
-        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-12", "ios-simulator-12"]),
+        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13"]),
+        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-13", "ios-simulator-13"]),
         (["Source/WebKitLegacy/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
-        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-12", "ios-simulator-12"]),
-        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-12", "ios-simulator-12"]),
-        (["Source/WebCore/ios/foo"], ["ios-12", "ios-simulator-12"]),
+        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-13", "ios-simulator-13"]),
+        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13"]),
+        (["Source/WebCore/ios/foo"], ["ios-13", "ios-simulator-13"]),
         (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         (["Source/WebCore/win/foo"], ["win"]),
-        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-12", "ios-simulator-12"]),
+        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
-        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-12", "ios-simulator-12"]),
+        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-13", "ios-simulator-13"]),
         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
-        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-12", "ios-simulator-12"]),
+        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-13", "ios-simulator-13"]),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]
 
@@ -71,7 +71,7 @@
         for files, platforms in self._should_build_tests:
             # FIXME: We should test more platforms here once
             # wkbuild._should_file_trigger_build is implemented for them.
-            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-12", "ios-simulator-12"]:
+            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-13", "ios-simulator-13"]:
                 should_build = platform in platforms or "*" in platforms
                 self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))
 

Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (249959 => 249960)


--- trunk/Tools/BuildSlaveSupport/ews-build/config.json	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json	2019-09-17 16:49:49 UTC (rev 249960)
@@ -82,11 +82,11 @@
     },
     {
       "name": "ews108",
-      "platform": "ios-12"
+      "platform": "ios-13"
     },
     {
       "name": "ews109",
-      "platform": "ios-12"
+      "platform": "ios-13"
     },
     {
       "name": "ews112",
@@ -126,27 +126,27 @@
     },
     {
       "name": "ews121",
-      "platform": "ios-simulator-12"
+      "platform": "ios-simulator-13"
     },
     {
       "name": "ews122",
-      "platform": "ios-simulator-12"
+      "platform": "ios-simulator-13"
     },
     {
       "name": "ews123",
-      "platform": "ios-simulator-12"
+      "platform": "ios-simulator-13"
     },
     {
       "name": "ews124",
-      "platform": "ios-simulator-12"
+      "platform": "ios-simulator-13"
     },
     {
       "name": "ews125",
-      "platform": "ios-simulator-12"
+      "platform": "ios-simulator-13"
     },
     {
       "name": "ews126",
-      "platform": "ios-simulator-12"
+      "platform": "ios-simulator-13"
     },
     {
       "name": "ews127",
@@ -305,32 +305,32 @@
       "workernames": ["igalia1-gtk-wk2-ews", "igalia2-gtk-wk2-ews", "igalia3-gtk-wk2-ews", "igalia4-gtk-wk2-ews", "aperez-gtk-ews"]
     },
     {
-      "name": "iOS-12-Build-EWS",
+      "name": "iOS-13-Build-EWS",
       "shortname": "ios",
       "icon": "buildOnly",
       "factory": "iOSBuildFactory",
-      "platform": "ios-12",
+      "platform": "ios-13",
       "configuration": "release",
       "architectures": ["arm64"],
       "workernames": ["ews152", "ews154", "ews108", "ews109"]
     },
     {
-      "name": "iOS-12-Simulator-Build-EWS",
+      "name": "iOS-13-Simulator-Build-EWS",
       "shortname": "ios-sim",
       "icon": "buildOnly",
       "factory": "iOSBuildFactory",
-      "platform": "ios-simulator-12",
+      "platform": "ios-simulator-13",
       "configuration": "release",
       "architectures": ["x86_64"],
-      "triggers": ["api-tests-ios-sim-ews", "ios-12-sim-wk2-tests-ews"],
+      "triggers": ["api-tests-ios-sim-ews", "ios-13-sim-wk2-tests-ews"],
       "workernames": ["ews152", "ews154", "ews156", "ews157"]
     },
     {
-      "name": "iOS-12-Simulator-WK2-Tests-EWS",
+      "name": "iOS-13-Simulator-WK2-Tests-EWS",
       "shortname": "ios-wk2",
       "icon": "testOnly",
       "factory": "iOSTestsFactory",
-      "platform": "ios-simulator-12",
+      "platform": "ios-simulator-13",
       "configuration": "release",
       "architectures": ["x86_64"],
       "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
@@ -480,7 +480,7 @@
       "type": "Try_Userpass",
       "name": "try",
       "port": 5555,
-      "builderNames": ["Apply-WatchList-EWS", "Bindings-Tests-EWS", "GTK-Webkit2-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
+      "builderNames": ["Apply-WatchList-EWS", "Bindings-Tests-EWS", "GTK-Webkit2-EWS", "iOS-13-Build-EWS", "iOS-13-Simulator-Build-EWS",
                        "macOS-High-Sierra-Debug-Build-EWS", "macOS-High-Sierra-Release-Build-EWS",
                        "Services-EWS", "Style-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WPE-EWS", "WinCairo-EWS"]
     },
@@ -513,9 +513,9 @@
     },
     {
       "type": "Triggerable",
-      "name": "ios-12-sim-wk2-tests-ews",
+      "name": "ios-13-sim-wk2-tests-ews",
       "builderNames": [
-        "iOS-12-Simulator-WK2-Tests-EWS"
+        "iOS-13-Simulator-WK2-Tests-EWS"
       ]
     },
     {

Modified: trunk/Tools/ChangeLog (249959 => 249960)


--- trunk/Tools/ChangeLog	2019-09-17 16:32:11 UTC (rev 249959)
+++ trunk/Tools/ChangeLog	2019-09-17 16:49:49 UTC (rev 249960)
@@ -1,3 +1,25 @@
+2019-09-17  Ryan Haddad  <ryanhad...@apple.com>
+
+        Bring up queues for iOS 13
+        https://bugs.webkit.org/show_bug.cgi?id=201710
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json: Move iOS 12 queues to iOS 13.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: Ditto.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+        (WebKitBuildbot):
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
+        (table.queue-grid tr.platform.ios-simulator-12 img.logo): Deleted.
+        (table.queue-grid tr.platform.ios-12 img.logo): Deleted.
+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Update unit tests.
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        (_should_file_trigger_build):
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+        (ShouldBuildTest):
+        (ShouldBuildTest.test_should_build):
+        * BuildSlaveSupport/ews-build/config.json: Move iOS 12 queues to iOS 13.
+
 2019-09-17  Truitt Savell  <tsav...@apple.com>
 
         Unreviewed, rolling out r249950.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to