[webkit-changes] [236294] trunk/Tools

Thu, 20 Sep 2018 16:51:28 -0700

Title: [236294] trunk/Tools
Revision
236294
Author
[email protected]
Date
2018-09-20 16:50:06 -0700 (Thu, 20 Sep 2018)

Log Message

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

Reviewed by Aakash Jain.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12Simulator.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
* 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):
(table.queue-grid tr.platform.ios-12 img.logo):
(table.queue-grid tr.platform.ios-simulator-11 img.logo): Deleted.
(table.queue-grid tr.platform.ios-11 img.logo): Deleted.
* BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
(_should_file_trigger_build):
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
(ShouldBuildTest):
(ShouldBuildTest.test_should_build):

Modified Paths

Added Paths

Diff

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2018-09-20 23:50:06 UTC (rev 236294)
@@ -37,15 +37,15 @@
                     { "name": "bot698", "platform": "mac-sierra" },
                     { "name": "bot699", "platform": "mac-sierra" },
 
-                    { "name": "bot673", "platform": "ios-11" },
-                    { "name": "bot626", "platform": "ios-simulator-11" },
-                    { "name": "bot618", "platform": "ios-simulator-11" },
-                    { "name": "bot620", "platform": "ios-simulator-11" },
-                    { "name": "bot621", "platform": "ios-simulator-11" },
-                    { "name": "bot651", "platform": "ios-simulator-11" },
-                    { "name": "bot652", "platform": "ios-simulator-11" },
-                    { "name": "bot653", "platform": "ios-simulator-11" },
-                    { "name": "bot654", "platform": "ios-simulator-11" },
+                    { "name": "bot673", "platform": "ios-12" },
+                    { "name": "bot626", "platform": "ios-simulator-12" },
+                    { "name": "bot618", "platform": "ios-simulator-12" },
+                    { "name": "bot620", "platform": "ios-simulator-12" },
+                    { "name": "bot621", "platform": "ios-simulator-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": "bot516", "platform": "win" },
                     { "name": "bot514", "platform": "win" },
@@ -189,31 +189,31 @@
                       "slavenames": ["bot632"]
                     },
                     {
-                      "name": "Apple iOS 11 Release (Build)", "type": "Build", "builddir": "ios-11-release",
-                      "platform": "ios-11", "configuration": "release", "architectures": ["arm64"],
+                      "name": "Apple iOS 12 Release (Build)", "type": "Build", "builddir": "ios-12-release",
+                      "platform": "ios-12", "configuration": "release", "architectures": ["arm64"],
                       "slavenames": ["bot673"]
                     },
                     {
-                      "name": "Apple iOS 11 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-11-release",
-                      "platform": "ios-simulator-11", "configuration": "release", "architectures": ["x86_64"],
-                      "triggers": ["ios-simulator-11-release-tests-wk2"],
+                      "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"],
                       "slavenames": ["bot618", "bot620"]
                     },
                     {
-                      "name": "Apple iOS 11 Simulator Debug (Build)", "type": "Build", "builddir": "ios-simulator-11-debug",
-                      "platform": "ios-simulator-11", "configuration": "debug", "architectures": ["x86_64"],
-                      "triggers": ["ios-simulator-11-debug-tests-wk2"],
+                      "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"],
                       "slavenames": ["bot626", "bot621"]
                     },
                     {
-                      "name": "Apple iOS 11 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-11-release-tests-wk2",
-                      "platform": "ios-simulator-11", "configuration": "release", "architectures": ["x86_64"],
+                      "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"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot651", "bot652"]
                     },
                     {
-                      "name": "Apple iOS 11 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-11-debug-tests-wk2",
-                      "platform": "ios-simulator-11", "configuration": "debug", "architectures": ["x86_64"],
+                      "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"],
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
                       "slavenames": ["bot653", "bot654"]
                     },
@@ -391,11 +391,11 @@
                     { "type": "PlatformSpecificScheduler", "platform": "mac-sierra", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple Sierra Release (Build)", "Apple Sierra Debug (Build)", "Apple Sierra Release (32-bit Build)"]
                     },
-                    { "type": "PlatformSpecificScheduler", "platform": "ios-11", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple iOS 11 Release (Build)"]
+                    { "type": "PlatformSpecificScheduler", "platform": "ios-12", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple iOS 12 Release (Build)"]
                     },
-                    { "type": "PlatformSpecificScheduler", "platform": "ios-simulator-11", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple iOS 11 Simulator Release (Build)", "Apple iOS 11 Simulator Debug (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": "win", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
@@ -442,11 +442,11 @@
                     { "type": "Triggerable", "name": "sierra-release-tests-test262",
                       "builderNames": ["Apple Sierra Release Test262 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-11-release-tests-wk2",
-                      "builderNames": ["Apple iOS 11 Simulator Release WK2 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-12-release-tests-wk2",
+                      "builderNames": ["Apple iOS 12 Simulator Release WK2 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-11-debug-tests-wk2",
-                      "builderNames": ["Apple iOS 11 Simulator Debug WK2 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-12-debug-tests-wk2",
+                      "builderNames": ["Apple iOS 12 Simulator Debug WK2 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "win-release-tests",
                       "builderNames": ["Apple Win 7 Release (Tests)"]

Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12.png


(Binary files differ)
Index: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12.png =================================================================== --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12.png 2018-09-20 23:46:43 UTC (rev 236293) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12.png 2018-09-20 23:50:06 UTC (rev 236294) Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12.png ___________________________________________________________________

Added: svn:mime-type

+image/png \ No newline at end of property

Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12Simulator.png


(Binary files differ)
Index: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12Simulator.png =================================================================== --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12Simulator.png 2018-09-20 23:46:43 UTC (rev 236293) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12Simulator.png 2018-09-20 23:50:06 UTC (rev 236294) Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12Simulator.png ___________________________________________________________________

Added: svn:mime-type

+image/png \ No newline at end of property

Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]


(Binary files differ)
Index: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] =================================================================== --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2018-09-20 23:46:43 UTC (rev 236293) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2018-09-20 23:50:06 UTC (rev 236294) Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] ___________________________________________________________________

Added: svn:mime-type

+image/png \ No newline at end of property

Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]


(Binary files differ)
Index: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] =================================================================== --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2018-09-20 23:46:43 UTC (rev 236293) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2018-09-20 23:50:06 UTC (rev 236294) Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] ___________________________________________________________________

Added: svn:mime-type

+image/png \ No newline at end of property

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2018-09-20 23:50:06 UTC (rev 236294)
@@ -28,8 +28,8 @@
         macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 6 },
         macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 7 },
         macOSSierra: { name: "macos-sierra", readableName: "macOS Sierra", order: 8 },
-        iOS11Simulator: { name: "ios-simulator-11", readableName: "iOS 11 Simulator", order: 20 },
-        iOS11Device: { name: "ios-11", readableName: "iOS 11", order: 25 },
+        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: 50 },
         Windows7: { name: "windows-7", readableName: "Windows 7", order: 60 },
         LinuxWPE: { name : "linux-wpe", readableName: "Linux WPE", order: 90 },

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2018-09-20 23:50:06 UTC (rev 236294)
@@ -52,11 +52,11 @@
             "Apple Sierra Debug Test262 (Tests)": {heading: "Debug Test262 (Tests)"},
             "Apple Sierra Release Test262 (Tests)": {heading: "Release Test262 (Tests)"},
         }},
-        "Apple iOS 11 Release (Build)": {platform: Dashboard.Platform.iOS11Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 11 Simulator Release (Build)": {platform: Dashboard.Platform.iOS11Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 11 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS11Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
-        "Apple iOS 11 Simulator Debug (Build)": {platform: Dashboard.Platform.iOS11Simulator, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 11 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS11Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "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 Win Debug (Build)": {platform: Dashboard.Platform.Windows7, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
         "Apple Win Release (Build)": {platform: Dashboard.Platform.Windows7, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
         "Apple Win 7 Debug (Tests)": {platform: Dashboard.Platform.Windows7, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2018-09-20 23:50:06 UTC (rev 236294)
@@ -170,14 +170,14 @@
     clip-path: circle(72px at center);
 }
 
-table.queue-grid tr.platform.ios-simulator-11 img.logo {
+table.queue-grid tr.platform.ios-simulator-12 img.logo {
     background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
-    content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS11Simulator.png) 1x);
+    content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS12Simulator.png) 1x);
 }
 
-table.queue-grid tr.platform.ios-11 img.logo {
+table.queue-grid tr.platform.ios-12 img.logo {
     background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
-    content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS11.png) 1x);
+    content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS12.png) 1x);
 }
 
 table.queue-grid tr.platform.macos-sierra img.logo {

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2018-09-20 23:50:06 UTC (rev 236294)
@@ -538,12 +538,12 @@
     'Apple Sierra Release Test262 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'test262-test'],
     'Apple 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 iOS 11 Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
-    'Apple iOS 11 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 11 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 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 11 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 11 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 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'],
 
     '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 (236293 => 236294)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2018-09-20 23:50:06 UTC (rev 236294)
@@ -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-11", "ios-simulator-11", "ios-12", "ios-simulator-12"))
+    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-12", "ios-simulator-12"))
 
     directories = [
         # Directories that shouldn't trigger builds on any bots.

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2018-09-20 23:50:06 UTC (rev 236294)
@@ -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-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
-        (["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
+        (["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.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-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
+        (["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/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-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
-        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
+        (["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"]),
         (["Source/WebKitLegacy/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
-        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
-        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
-        (["Source/WebCore/ios/foo"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
+        (["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/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-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
+        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-12", "ios-simulator-12"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
-        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
+        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-12", "ios-simulator-12"]),
         (["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-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
+        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-12", "ios-simulator-12"]),
         (["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-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]:
+            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-12", "ios-simulator-12"]:
                 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/ChangeLog (236293 => 236294)


--- trunk/Tools/ChangeLog	2018-09-20 23:46:43 UTC (rev 236293)
+++ trunk/Tools/ChangeLog	2018-09-20 23:50:06 UTC (rev 236294)
@@ -1,3 +1,30 @@
+2018-09-20  Ryan Haddad  <[email protected]>
+
+        Bring up queues for iOS 12
+        https://bugs.webkit.org/show_bug.cgi?id=189683
+
+        Reviewed by Aakash Jain.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS12Simulator.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+        * 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):
+        (table.queue-grid tr.platform.ios-12 img.logo):
+        (table.queue-grid tr.platform.ios-simulator-11 img.logo): Deleted.
+        (table.queue-grid tr.platform.ios-11 img.logo): Deleted.
+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        (_should_file_trigger_build):
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+        (ShouldBuildTest):
+        (ShouldBuildTest.test_should_build):
+
 2018-09-20  Basuke Suzuki  <[email protected]>
 
         [Win] TestRunner::queueLoad() fails to generate correct url for some urls.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to