Title: [222229] trunk/Tools
Revision
222229
Author
[email protected]
Date
2017-09-19 15:17:58 -0700 (Tue, 19 Sep 2017)

Log Message

Update bot configuration for iOS 11.
https://bugs.webkit.org/show_bug.cgi?id=177165

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
(BubbleQueueServer):
* 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-10 img.logo): Deleted.
(table.queue-grid tr.platform.ios-10 img.logo): Deleted.
* 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

Diff

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2017-09-19 22:17:58 UTC (rev 222229)
@@ -42,19 +42,19 @@
                     { "name": "bot698", "platform": "mac-sierra" },
                     { "name": "bot699", "platform": "mac-sierra" },
 
-                    { "name": "bot673", "platform": "ios-10" },
-                    { "name": "bot197", "platform": "ios-simulator-10" },
-                    { "name": "bot626", "platform": "ios-simulator-10" },
-                    { "name": "bot618", "platform": "ios-simulator-10" },
-                    { "name": "bot620", "platform": "ios-simulator-10" },
-                    { "name": "bot621", "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": "bot673", "platform": "ios-11" },
+                    { "name": "bot197", "platform": "ios-simulator-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": "bot215", "platform": "ios-simulator-11" },
+                    { "name": "bot216", "platform": "ios-simulator-11" },
+                    { "name": "bot217", "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": "bot516", "platform": "win" },
                     { "name": "bot514", "platform": "win" },
@@ -209,43 +209,32 @@
                       "slavenames": ["bot434"]
                     },
                     {
-                      "name": "Apple iOS 10 Release (Build)", "type": "Build", "builddir": "ios-10-release",
-                      "platform": "ios-10", "configuration": "release", "architectures": ["armv7s", "arm64"],
+                      "name": "Apple iOS 11 Release (Build)", "type": "Build", "builddir": "ios-11-release",
+                      "platform": "ios-11", "configuration": "release", "architectures": ["arm64"],
                       "slavenames": ["bot673"]
                     },
                     {
-                      "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"],
+                      "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-wk1", "ios-simulator-11-release-tests-wk2"],
                       "slavenames": ["bot618", "bot620"]
                     },
                     {
-                      "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"],
+                      "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-wk1", "ios-simulator-11-debug-tests-wk2"],
                       "slavenames": ["bot626", "bot621"]
                     },
                     {
-                      "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", "--no-sample-on-timeout"],
-                      "slavenames": ["bot197", "bot215"]
-                    },
-                    {
-                      "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", "--no-sample-on-timeout"],
-                      "slavenames": ["bot216", "bot217"]
-                    },
-                    {
-                      "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"],
+
+                      "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"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot651", "bot652"]
                     },
                     {
-                      "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"],
+                      "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"],
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
                       "slavenames": ["bot653", "bot654"]
                     },
@@ -375,11 +364,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)", "Apple Sierra LLINT CLoop (BuildAndTest)", "Apple Sierra 32-bit JSC (BuildAndTest)"]
                     },
-                    { "type": "PlatformSpecificScheduler", "platform": "ios-10", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple iOS 10 Release (Build)"]
+                    { "type": "PlatformSpecificScheduler", "platform": "ios-11", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple iOS 11 Release (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": "ios-simulator-11", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple iOS 11 Simulator Release (Build)", "Apple iOS 11 Simulator Debug (Build)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
@@ -432,18 +421,12 @@
                     { "type": "Triggerable", "name": "elcapitan-release-tests-test262",
                       "builderNames": ["Apple El Capitan Release Test262 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-10-release-tests-wk1",
-                      "builderNames": ["Apple iOS 10 Simulator Release WK1 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-11-release-tests-wk2",
+                      "builderNames": ["Apple iOS 11 Simulator Release WK2 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-10-debug-tests-wk1",
-                      "builderNames": ["Apple iOS 10 Simulator Debug WK1 (Tests)"]
+                    { "type": "Triggerable", "name": "ios-simulator-11-debug-tests-wk2",
+                      "builderNames": ["Apple iOS 11 Simulator Debug WK2 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "ios-simulator-10-release-tests-wk2",
-                      "builderNames": ["Apple iOS 10 Simulator Release 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)"]
                     },

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (222228 => 222229)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py	2017-09-19 22:17:58 UTC (rev 222229)
@@ -438,14 +438,12 @@
     'Apple Sierra 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-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
     'Apple 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 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', 'archive-built-product', 'upload', 'transfer-to-s3', '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-generator-tests', 'dashboard-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-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    '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 10 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 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-generator-tests', 'dashboard-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-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'],
 
     'JSCOnly Linux ARMv7 Thumb2 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
     'JSCOnly Linux ARMv7 Traditional Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js (222228 => 222229)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js	2017-09-19 22:17:58 UTC (rev 222229)
@@ -29,8 +29,8 @@
         "commit-queue": {platform: Dashboard.Platform.MacOSXElCapitan, 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.iOS10Device, shortName: "ios", title: "Release\xa0Build\xa0EWS"},
-        "ios-sim-ews": {platform: Dashboard.Platform.iOS10Simulator, shortName: "ios-sim", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
+        "ios-ews": {platform: Dashboard.Platform.iOS11Device, shortName: "ios", title: "Release\xa0Build\xa0EWS"},
+        "ios-sim-ews": {platform: Dashboard.Platform.iOS11Simulator, shortName: "ios-sim", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
         "bindings-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "bindings", title: "Bindings\xa0EWS"},
         "jsc-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "jsc", title: "Release\xa0JSC\xa0Tests\xa0EWS"},
         "mac-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "mac", title: "WebKit1\xa0Release\xa0Tests\xa0EWS"},

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	2017-09-19 22:17:58 UTC (rev 222229)
@@ -30,8 +30,6 @@
         MacOSXElCapitan: { name: "mac-os-x-elcapitan", readableName: "OS X El Capitan", order: 9 },
         iOS11Simulator: { name: "ios-simulator-11", readableName: "iOS 11 Simulator", order: 20 },
         iOS11Device: { name: "ios-11", readableName: "iOS 11", order: 25 },
-        iOS10Simulator: { name: "ios-simulator-10", readableName: "iOS 10 Simulator", order: 30 },
-        iOS10Device: { name: "ios-10", readableName: "iOS 10", order: 40 },
         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 },

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2017-09-19 22:17:58 UTC (rev 222229)
@@ -56,13 +56,11 @@
             "Apple El Capitan Debug Test262 (Tests)": {heading: "Debug Test262 (Tests)"},
             "Apple El Capitan Release Test262 (Tests)": {heading: "Release Test262 (Tests)"},
         }},
-        "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 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 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 (222228 => 222229)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	2017-09-19 22:17:58 UTC (rev 222229)
@@ -170,16 +170,6 @@
     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/[email protected]) 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/[email protected]) 2x, url(../Images/IOS10.png) 1x);
-}
-
 table.queue-grid tr.platform.ios-simulator-11 img.logo {
     background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
     content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS11Simulator.png) 1x);

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2017-09-19 22:17:58 UTC (rev 222229)
@@ -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", "win", "ios-10", "ios-simulator-10"))
+    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-11", "ios-simulator-11"))
 
     directories = [
         # Directories that shouldn't trigger builds on any bots.

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2017-09-19 22:17:58 UTC (rev 222229)
@@ -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", "ios-10", "ios-simulator-10"]),
-        (["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
+        (["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-11", "ios-simulator-11"]),
+        (["Source/_javascript_Core/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-11", "ios-simulator-11"]),
         (["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"], ["*"]),
@@ -39,10 +39,10 @@
         (["LayoutTests/platform/mac-elcapitan/foo"], ["mac-yosemite", "mac-elcapitan"]),
         (["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/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", "mac-highsierra", "ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/ios-simulator/foo"], ["ios-11", "ios-simulator-11"]),
+        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-11", "ios-simulator-11"]),
+        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-11", "ios-simulator-11"]),
+        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-11", "ios-simulator-11"]),
         (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["LayoutTests/platform/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win"]),
@@ -50,19 +50,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", "ios-10", "ios-simulator-10"]),
-        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-10", "ios-simulator-10"]),
+        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-11", "ios-simulator-11"]),
+        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-11", "ios-simulator-11"]),
         (["Source/WebKitLegacy/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
-        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-10", "ios-simulator-10"]),
-        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
-        (["Source/WebCore/ios/foo"], ["ios-10", "ios-simulator-10"]),
+        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-11", "ios-simulator-11"]),
+        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-11", "ios-simulator-11"]),
+        (["Source/WebCore/ios/foo"], ["ios-11", "ios-simulator-11"]),
         (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         (["Source/WebCore/win/foo"], ["win"]),
-        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-10", "ios-simulator-10"]),
+        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "ios-11", "ios-simulator-11"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
-        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-10", "ios-simulator-10"]),
+        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-11", "ios-simulator-11"]),
         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
-        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-10", "ios-simulator-10"]),
+        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-11", "ios-simulator-11"]),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]
 
@@ -70,7 +70,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", "win", "ios-10", "ios-simulator-10"]:
+            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "win", "ios-11", "ios-simulator-11"]:
                 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 (222228 => 222229)


--- trunk/Tools/ChangeLog	2017-09-19 21:50:03 UTC (rev 222228)
+++ trunk/Tools/ChangeLog	2017-09-19 22:17:58 UTC (rev 222229)
@@ -1,3 +1,26 @@
+2017-09-19  Ryan Haddad  <[email protected]>
+
+        Update bot configuration for iOS 11.
+        https://bugs.webkit.org/show_bug.cgi?id=177165
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
+        (BubbleQueueServer):
+        * 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-10 img.logo): Deleted.
+        (table.queue-grid tr.platform.ios-10 img.logo): Deleted.
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        (_should_file_trigger_build):
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+        (ShouldBuildTest):
+        (ShouldBuildTest.test_should_build):
+
 2017-09-19  Filip Pizlo  <[email protected]>
 
         Primitive protocol should have capital name
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to