Switch build.webkit.org to iOS 10
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Sep 2016 23:08:54 +0000 (23:08 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Sep 2016 23:08:54 +0000 (23:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=161930

Reviewed by Daniel Bates.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests.start):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10@2x.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator@2x.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice.png:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice@2x.png:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator@2x.png: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
* BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
* Scripts/webkitpy/port/ios.py:
* TestResultServer/static-dashboards/builders.jsonp:

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

20 files changed:
Tools/BuildSlaveSupport/build.webkit.org-config/config.json
Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10@2x.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator@2x.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice.png
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice@2x.png
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator@2x.png [new file with mode: 0644]
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css
Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py
Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
Tools/ChangeLog
Tools/Scripts/webkitpy/port/ios.py
Tools/TestResultServer/static-dashboards/builders.jsonp

index efeb192..148bcb0 100644 (file)
                     { "name": "bot418", "platform": "mac-elcapitan" },
                     { "name": "bot419", "platform": "mac-elcapitan" },
 
-                    { "name": "bot407", "platform": "ios-9" },
-                    { "name": "bot197", "platform": "ios-simulator-9" },
-                    { "name": "bot329", "platform": "ios-simulator-9" },
-                    { "name": "bot402", "platform": "ios-simulator-9" },
-                    { "name": "bot403", "platform": "ios-simulator-9" },
-                    { "name": "bot404", "platform": "ios-simulator-9" },
-                    { "name": "bot215", "platform": "ios-simulator-9" },
-                    { "name": "bot216", "platform": "ios-simulator-9" },
-                    { "name": "bot217", "platform": "ios-simulator-9" },
-                    { "name": "bot651", "platform": "ios-simulator-9" },
-                    { "name": "bot652", "platform": "ios-simulator-9" },
-                    { "name": "bot653", "platform": "ios-simulator-9" },
-                    { "name": "bot654", "platform": "ios-simulator-9" },
+                    { "name": "bot407", "platform": "ios-10" },
+                    { "name": "bot197", "platform": "ios-simulator-10" },
+                    { "name": "bot329", "platform": "ios-simulator-10" },
+                    { "name": "bot402", "platform": "ios-simulator-10" },
+                    { "name": "bot403", "platform": "ios-simulator-10" },
+                    { "name": "bot404", "platform": "ios-simulator-10" },
+                    { "name": "bot215", "platform": "ios-simulator-10" },
+                    { "name": "bot216", "platform": "ios-simulator-10" },
+                    { "name": "bot217", "platform": "ios-simulator-10" },
+                    { "name": "bot651", "platform": "ios-simulator-10" },
+                    { "name": "bot652", "platform": "ios-simulator-10" },
+                    { "name": "bot653", "platform": "ios-simulator-10" },
+                    { "name": "bot654", "platform": "ios-simulator-10" },
 
                     { "name": "bot516", "platform": "win" },
                     { "name": "bot514", "platform": "win" },
                       "slavenames": ["bot194"]
                     },
                     {
-                      "name": "Apple iOS 9 Release (Build)", "type": "Build", "builddir": "ios-9-release",
-                      "platform": "ios-9", "configuration": "release", "architectures": ["armv7s", "arm64"],
+                      "name": "Apple iOS 10 Release (Build)", "type": "Build", "builddir": "ios-10-release",
+                      "platform": "ios-10", "configuration": "release", "architectures": ["armv7s", "arm64"],
                       "slavenames": ["bot407"]
                     },
                     {
-                      "name": "Apple iOS 9 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-9-release",
-                      "platform": "ios-simulator-9", "configuration": "release", "architectures": ["x86_64"],
-                      "triggers": ["ios-simulator-9-release-tests-wk1", "ios-simulator-9-release-tests-wk2"],
+                      "name": "Apple iOS 10 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-10-release",
+                      "platform": "ios-simulator-10", "configuration": "release", "architectures": ["x86_64"],
+                      "triggers": ["ios-simulator-10-release-tests-wk1", "ios-simulator-10-release-tests-wk2"],
                       "slavenames": ["bot402", "bot403"]
                     },
                     {
-                      "name": "Apple iOS 9 Simulator Debug (Build)", "type": "Build", "builddir": "ios-simulator-9-debug",
-                      "platform": "ios-simulator-9", "configuration": "debug", "architectures": ["x86_64"],
-                      "triggers": ["ios-simulator-9-debug-tests-wk1", "ios-simulator-9-debug-tests-wk2"],
+                      "name": "Apple iOS 10 Simulator Debug (Build)", "type": "Build", "builddir": "ios-simulator-10-debug",
+                      "platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
+                      "triggers": ["ios-simulator-10-debug-tests-wk1", "ios-simulator-10-debug-tests-wk2"],
                       "slavenames": ["bot329", "bot404"]
                     },
                     {
-                      "name": "Apple iOS 9 Simulator Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-9-release-tests-wk1",
-                      "platform": "ios-simulator-9", "configuration": "release", "architectures": ["x86_64"],
+                      "name": "Apple iOS 10 Simulator Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-10-release-tests-wk1",
+                      "platform": "ios-simulator-10", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot197", "bot215"]
                     },
                     {
-                      "name": "Apple iOS 9 Simulator Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-9-debug-tests-wk1",
-                      "platform": "ios-simulator-9", "configuration": "debug", "architectures": ["x86_64"],
+                      "name": "Apple iOS 10 Simulator Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-10-debug-tests-wk1",
+                      "platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot216", "bot217"]
                     },
                     {
-                      "name": "Apple iOS 9 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-9-release-tests-wk2",
-                      "platform": "ios-simulator-9", "configuration": "release", "architectures": ["x86_64"],
+                      "name": "Apple iOS 10 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-10-release-tests-wk2",
+                      "platform": "ios-simulator-10", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot651", "bot652"]
                     },
                     {
-                      "name": "Apple iOS 9 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-9-debug-tests-wk2",
-                      "platform": "ios-simulator-9", "configuration": "debug", "architectures": ["x86_64"],
+                      "name": "Apple iOS 10 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-10-debug-tests-wk2",
+                      "platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot653", "bot654"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "mac-elcapitan", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple El Capitan Release (Build)", "Apple El Capitan Debug (Build)", "Apple El Capitan LLINT CLoop (BuildAndTest)", "Apple El Capitan 32-bit JSC (BuildAndTest)", "Apple El Capitan Release (32-bit Build)", "Apple El Capitan CMake Debug (Build)"]
                     },
-                    { "type": "PlatformSpecificScheduler", "platform": "ios-9", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple iOS 9 Release (Build)"]
+                    { "type": "PlatformSpecificScheduler", "platform": "ios-10", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple iOS 10 Release (Build)"]
                     },
-                    { "type": "PlatformSpecificScheduler", "platform": "ios-simulator-9", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple iOS 9 Simulator Release (Build)", "Apple iOS 9 Simulator Debug (Build)"]
+                    { "type": "PlatformSpecificScheduler", "platform": "ios-simulator-10", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple iOS 10 Simulator Release (Build)", "Apple iOS 10 Simulator Debug (Build)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
                     { "type": "Triggerable", "name": "yosemite-release-perf",
                       "builderNames": ["Apple Yosemite Release WK2 (Perf)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-9-release-tests-wk1",
-                      "builderNames": ["Apple iOS 9 Simulator Release WK1 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-10-release-tests-wk1",
+                      "builderNames": ["Apple iOS 10 Simulator Release WK1 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-9-debug-tests-wk1",
-                      "builderNames": ["Apple iOS 9 Simulator Debug WK1 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-10-debug-tests-wk1",
+                      "builderNames": ["Apple iOS 10 Simulator Debug WK1 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-9-release-tests-wk2",
-                      "builderNames": ["Apple iOS 9 Simulator Release WK2 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-10-release-tests-wk2",
+                      "builderNames": ["Apple iOS 10 Simulator Release WK2 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-9-debug-tests-wk2",
-                      "builderNames": ["Apple iOS 9 Simulator Debug WK2 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-10-debug-tests-wk2",
+                      "builderNames": ["Apple iOS 10 Simulator Debug WK2 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "win-release-tests",
                       "builderNames": ["Apple Win 7 Release (Tests)"]
index 245ade4..94da7e2 100644 (file)
@@ -357,7 +357,7 @@ class RunWebKitTests(shell.Test):
         if platform == "win":
             self.setCommand(self.command + ['--batch-size', '100', '--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin32")])
 
-        if WithProperties("%(buildername)s") != "Apple iOS 9 Simulator Release WK2 (Tests)":
+        if WithProperties("%(buildername)s") != "Apple iOS 10 Simulator Release WK2 (Tests)":
             self.setCommand(self.command + ['--no-sample-on-timeout'])
 
         if additionalArguments:
index 2e8ae59..a7fa25d 100755 (executable)
@@ -399,14 +399,14 @@ expected_build_steps = {
     'Apple El Capitan Release WK1 (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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
     'Apple El Capitan 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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
 
-    'Apple iOS 9 Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
-    'Apple iOS 9 Simulator Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
-    'Apple iOS 9 Simulator Release WK1 (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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-    'Apple iOS 9 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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-
-    'Apple iOS 9 Simulator Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
-    'Apple iOS 9 Simulator Debug WK1 (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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-    'Apple iOS 9 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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple iOS 10 Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+    'Apple iOS 10 Simulator Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
+    'Apple iOS 10 Simulator Release WK1 (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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple iOS 10 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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+
+    'Apple iOS 10 Simulator Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
+    'Apple iOS 10 Simulator Debug WK1 (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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple iOS 10 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-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
 
     'EFL Linux 64-bit Release WK2' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
     'EFL Linux 64-bit Release WK2 (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'perf-test'],
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10.png
new file mode 100644 (file)
index 0000000..6198d78
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10@2x.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10@2x.png
new file mode 100644 (file)
index 0000000..dfe47dc
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10@2x.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator.png
new file mode 100644 (file)
index 0000000..1d0b92f
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator@2x.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator@2x.png
new file mode 100644 (file)
index 0000000..5f8599c
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator@2x.png differ
index 603696e..57c478c 100644 (file)
Binary files a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice.png and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice.png differ
index c4d3a1a..d9d557e 100644 (file)
Binary files a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice@2x.png and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice@2x.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator.png
new file mode 100644 (file)
index 0000000..59b03dc
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator.png differ
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator@2x.png b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator@2x.png
new file mode 100644 (file)
index 0000000..4e89de9
Binary files /dev/null and b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator@2x.png differ
index b5acc8a..fe3e1bb 100644 (file)
@@ -29,8 +29,8 @@ BubbleQueueServer = function()
         "commit-queue": {platform: Dashboard.Platform.MacOSXYosemite, shortName: "commit", title: "Commit Queue"},
         "style-queue": {shortName: "style", title: "Style Checker Queue"},
         "gtk-wk2-ews": {platform: Dashboard.Platform.LinuxGTK, shortName: "gtk-wk2", title: "WebKit2\xa0Release\xa0Build\xa0EWS"},
-        "ios-ews": {platform: Dashboard.Platform.iOS9Device, shortName: "ios", title: "Release\xa0Build\xa0EWS"},
-        "ios-sim-ews": {platform: Dashboard.Platform.iOS9Simulator, shortName: "ios-sim", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
+        "ios-ews": {platform: Dashboard.Platform.iOS10Device, shortName: "ios", title: "Release\xa0Build\xa0EWS"},
+        "ios-sim-ews": {platform: Dashboard.Platform.iOS10Simulator, shortName: "ios-sim", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
         "mac-ews": {platform: Dashboard.Platform.MacOSXYosemite, shortName: "mac", title: "WebKit1\xa0Release\xa0Tests\xa0EWS"},
         "mac-wk2-ews": {platform: Dashboard.Platform.MacOSXYosemite, shortName: "mac-wk2", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
         "mac-debug-ews": {platform: Dashboard.Platform.MacOSXYosemite, shortName: "mac-debug", title: "WebKit1\xa0Debug\xa0Tests\xa0EWS"},
index b6186f2..18b3b8c 100644 (file)
@@ -29,8 +29,10 @@ Dashboard = {
         MacOSXElCapitan: { name: "mac-os-x-elcapitan", readableName: "OS X El Capitan", order: 9 },
         MacOSXYosemite: { name: "mac-os-x-yosemite", readableName: "OS X Yosemite", order: 10 },
         MacOSXMavericks: { name: "mac-os-x-mavericks", readableName: "OS X Mavericks", order: 20 },
-        iOS9Simulator: { name: "ios-simulator-9", readableName: "iOS 9 Simulator", order: 30 },
-        iOS9Device: { name: "ios-9", readableName: "iOS 9", order: 40 },
+        iOS10Simulator: { name: "ios-simulator-10", readableName: "iOS 10 Simulator", order: 30 },
+        iOS10Device: { name: "ios-10", readableName: "iOS 10", order: 40 },
+        iOS9Simulator: { name: "ios-simulator-9", readableName: "iOS 9 Simulator", order: 41 },
+        iOS9Device: { name: "ios-9", readableName: "iOS 9", order: 42 },
         Windows8: { name: "windows-8", readableName: "Windows 8", order: 50 },
         Windows7: { name: "windows-7", readableName: "Windows 7", order: 60 },
         WindowsXP: { name: "windows-xp", readableName: "Windows XP", order: 70 },
index 298e629..456dc21 100644 (file)
@@ -55,13 +55,13 @@ WebKitBuildbot = function()
             "Apple Yosemite Debug JSC (Tests)": {heading: "Debug JSC (Tests)"},
             "Apple Yosemite Release JSC (Tests)": {heading: "Release JSC (Tests)"},
         }},
-        "Apple iOS 9 Release (Build)": {platform: Dashboard.Platform.iOS9Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.Universal},
-        "Apple iOS 9 Simulator Release (Build)": {platform: Dashboard.Platform.iOS9Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 9 Simulator Release WK1 (Tests)": {platform: Dashboard.Platform.iOS9Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
-        "Apple iOS 9 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS9Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
-        "Apple iOS 9 Simulator Debug (Build)": {platform: Dashboard.Platform.iOS9Simulator, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
-        "Apple iOS 9 Simulator Debug WK1 (Tests)": {platform: Dashboard.Platform.iOS9Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
-        "Apple iOS 9 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS9Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple iOS 10 Release (Build)": {platform: Dashboard.Platform.iOS10Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.Universal},
+        "Apple iOS 10 Simulator Release (Build)": {platform: Dashboard.Platform.iOS10Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "Apple iOS 10 Simulator Release WK1 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+        "Apple iOS 10 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple iOS 10 Simulator Debug (Build)": {platform: Dashboard.Platform.iOS10Simulator, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "Apple iOS 10 Simulator Debug WK1 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+        "Apple iOS 10 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, 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},
index 3a4fcbe..e86ed0e 100644 (file)
@@ -170,6 +170,16 @@ table.queue-grid td.logo img.logo {
     clip-path: circle(72px at center);
 }
 
+table.queue-grid tr.platform.ios-simulator-10 img.logo {
+    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+    content: -webkit-image-set(url(../Images/IOS10Simulator@2x.png) 2x, url(../Images/IOS10Simulator.png) 1x);
+}
+
+table.queue-grid tr.platform.ios-10 img.logo {
+    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+    content: -webkit-image-set(url(../Images/IOS10@2x.png) 2x, url(../Images/IOS10.png) 1x);
+}
+
 table.queue-grid tr.platform.ios-simulator-9 img.logo {
     content: -webkit-image-set(url(../Images/IOS9Simulator@2x.png) 2x, url(../Images/IOS9Simulator.png) 1x);
 }
@@ -178,10 +188,6 @@ table.queue-grid tr.platform.ios-9 img.logo {
     content: -webkit-image-set(url(../Images/IOS9@2x.png) 2x, url(../Images/IOS9.png) 1x);
 }
 
-table.queue-grid tr.platform.ios-8 img.logo {
-    content: -webkit-image-set(url(../Images/IOSDevice@2x.png) 2x, url(../Images/IOSDevice.png) 1x);
-}
-
 table.queue-grid tr.platform.mac-os-x-elcapitan img.logo {
     content: -webkit-image-set(url(../Images/ElCapitan@2x.png) 2x, url(../Images/ElCapitan.png) 1x);
 }
index e593f0b..25fbe2c 100644 (file)
@@ -37,7 +37,7 @@ def _should_file_trigger_build(target_platform, file):
     # 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", "win", "ios-9", "ios-simulator-9"))
+    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "win", "ios-10", "ios-simulator-10"))
 
     directories = [
         # Directories that shouldn't trigger builds on any bots.
index 344e9aa..11b98c0 100644 (file)
@@ -29,8 +29,8 @@ class ShouldBuildTest(unittest.TestCase):
         (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit2/ChangeLog-2011-02-11"], []),
         (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
         (["Websites/bugs.webkit.org/foo"], []),
-        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-9", "ios-simulator-9"]),
-        (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-9", "ios-simulator-9"]),
+        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
+        (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
         (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
         (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
         (["LayoutTests/foo"], ["*"]),
@@ -38,10 +38,10 @@ class ShouldBuildTest(unittest.TestCase):
         (["LayoutTests/platform/mac-yosemite/foo"], ["mac-yosemite"]),
         (["LayoutTests/platform/mac-elcapitan/foo"], ["mac-yosemite", "mac-elcapitan"]),
         (["LayoutTests/platform/mac-sierra/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
-        (["LayoutTests/platform/ios-simulator/foo"], ["ios-9", "ios-simulator-9"]),
-        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-9", "ios-simulator-9"]),
-        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-9", "ios-simulator-9"]),
-        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-9", "ios-simulator-9"]),
+        (["LayoutTests/platform/ios-simulator/foo"], ["ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
         (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
         (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
         (["LayoutTests/platform/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "win"]),
@@ -49,19 +49,19 @@ class ShouldBuildTest(unittest.TestCase):
         (["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", "ios-9", "ios-simulator-9"]),
-        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "win", "ios-9", "ios-simulator-9"]),
+        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "win", "ios-10", "ios-simulator-10"]),
         (["Source/WebKit/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
-        (["Source/WebKit/ios/WebKit.iOS.exp"], ["ios-9", "ios-simulator-9"]),
-        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-9", "ios-simulator-9"]),
-        (["Source/WebCore/ios/foo"], ["ios-9", "ios-simulator-9"]),
+        (["Source/WebKit/ios/WebKit.iOS.exp"], ["ios-10", "ios-simulator-10"]),
+        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
+        (["Source/WebCore/ios/foo"], ["ios-10", "ios-simulator-10"]),
         (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
         (["Source/WebCore/win/foo"], ["win"]),
-        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-9", "ios-simulator-9"]),
+        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "ios-10", "ios-simulator-10"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
-        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-9", "ios-simulator-9"]),
+        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-10", "ios-simulator-10"]),
         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
-        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-9", "ios-simulator-9"]),
+        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-10", "ios-simulator-10"]),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]
 
@@ -69,7 +69,7 @@ class ShouldBuildTest(unittest.TestCase):
         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", "win", "ios-9", "ios-simulator-9"]:
+            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "win", "ios-10", "ios-simulator-10"]:
                 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)))
 
index f3e9685..164fbcd 100644 (file)
@@ -1,3 +1,31 @@
+2016-09-13  Alexey Proskuryakov  <ap@apple.com>
+
+        Switch build.webkit.org to iOS 10
+        https://bugs.webkit.org/show_bug.cgi?id=161930
+
+        Reviewed by Daniel Bates.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunWebKitTests.start):
+        * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10@2x.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS10Simulator@2x.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice.png:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSDevice@2x.png:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOSSimulator@2x.png: Added.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+        * Scripts/webkitpy/port/ios.py:
+        * TestResultServer/static-dashboards/builders.jsonp:
+
 2016-09-13  Tim Horton  <timothy_horton@apple.com>
 
         Provide a mechanism to specify the maximum width of WKThumbnailView snapshots
index 8e7f403..7a58eda 100644 (file)
@@ -47,7 +47,7 @@ class IOSPort(ApplePort):
 
     ARCHITECTURES = ['armv7', 'armv7s', 'arm64']
     DEFAULT_ARCHITECTURE = 'arm64'
-    VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8', 'ios-9']
+    VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8', 'ios-9', 'ios-10']
 
     @classmethod
     def determine_full_port_name(cls, host, options, port_name):
index 5a64fad..81ad457 100644 (file)
@@ -17,10 +17,10 @@ LOAD_BUILDBOT_DATA([
                     "Apple Yosemite Debug WK2 (Tests)", 
                     "Apple Yosemite Release WK1 (Tests)", 
                     "Apple Yosemite Release WK2 (Tests)", 
-                    "Apple iOS 9 Simulator Debug WK1 (Tests)", 
-                    "Apple iOS 9 Simulator Debug WK2 (Tests)", 
-                    "Apple iOS 9 Simulator Release WK1 (Tests)", 
-                    "Apple iOS 9 Simulator Release WK2 (Tests)", 
+                    "Apple iOS 10 Simulator Debug WK1 (Tests)", 
+                    "Apple iOS 10 Simulator Debug WK2 (Tests)", 
+                    "Apple iOS 10 Simulator Release WK1 (Tests)", 
+                    "Apple iOS 10 Simulator Release WK2 (Tests)", 
                     "EFL Linux 64-bit Release WK2", 
                     "GTK Linux 64-bit Debug (Tests)", 
                     "GTK Linux 64-bit Release (Tests)"