Move JSC testers from Yosemite to Sierra

https://bugs.webkit.org/show_bug.cgi?id=165925

Reviewed by Lucas Forschler.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot):

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

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
index c5cb632..e0550dc 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -2,16 +2,12 @@
     "slaves":     [ { "name": "test-slave", "platform": "*" },
 
                     { "name": "bot139", "platform": "mac-yosemite" },
-                    { "name": "bot155", "platform": "mac-yosemite" },
-                    { "name": "bot157", "platform": "mac-yosemite" },
                     { "name": "bot180", "platform": "mac-yosemite" },
                     { "name": "bot181", "platform": "mac-yosemite" },
                     { "name": "bot182", "platform": "mac-yosemite" },
                     { "name": "bot183", "platform": "mac-yosemite" },
                     { "name": "bot184", "platform": "mac-yosemite" },
                     { "name": "bot185", "platform": "mac-yosemite" },
-                    { "name": "bot186", "platform": "mac-yosemite" },
-                    { "name": "bot187", "platform": "mac-yosemite" },
                     { "name": "bot190", "platform": "mac-yosemite" },
                     { "name": "bot191", "platform": "mac-yosemite" },
                     { "name": "bot192", "platform": "mac-yosemite" },
@@ -45,8 +41,12 @@
                     { "name": "bot122", "platform": "mac-sierra" },
                     { "name": "bot141", "platform": "mac-sierra" },
                     { "name": "bot143", "platform": "mac-sierra" },
+                    { "name": "bot155", "platform": "mac-sierra" },
+                    { "name": "bot157", "platform": "mac-sierra" },
                     { "name": "bot160", "platform": "mac-sierra" },
                     { "name": "bot164", "platform": "mac-sierra" },
+                    { "name": "bot186", "platform": "mac-sierra" },
+                    { "name": "bot187", "platform": "mac-sierra" },
                     { "name": "bot199", "platform": "mac-sierra" },
                     { "name": "bot219", "platform": "mac-sierra" },
                     { "name": "bot439", "platform": "mac-sierra" },
@@ -97,7 +97,7 @@
 
     "builders":   [ { "name": "Apple Sierra Debug (Build)", "type": "Build", "builddir": "sierra-debug",
                       "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
-                      "triggers": ["sierra-debug-tests-wk1", "sierra-debug-tests-wk2"],
+                      "triggers": ["sierra-debug-tests-jsc", "sierra-debug-tests-wk1", "sierra-debug-tests-wk2"],
                       "slavenames": ["bot439", "bot698"]
                     },
                     { "name": "Apple Sierra Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-debug-tests-wk1",
@@ -112,7 +112,7 @@
                     },
                     { "name": "Apple Sierra Release (Build)", "type": "Build", "builddir": "sierra-release",
                       "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
-                      "triggers": ["sierra-release-tests-wk1", "sierra-release-tests-wk2"],
+                      "triggers": ["sierra-release-tests-jsc", "sierra-release-tests-wk1", "sierra-release-tests-wk2"],
                       "slavenames": ["bot443", "bot699"]
                     },
                     { "name": "Apple Sierra Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-release-tests-wk1",
@@ -129,6 +129,22 @@
                       "platform": "mac-sierra", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["bot600"]
                     },
+                    { "name": "Apple Sierra Debug JSC (Tests)", "type": "TestJSC", "builddir": "sierra-debug-tests-jsc",
+                      "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
+                      "slavenames": ["bot155"]
+                    },
+                    { "name": "Apple Sierra Release JSC (Tests)", "type": "TestJSC", "builddir": "sierra-release-tests-jsc",
+                      "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
+                      "slavenames": ["bot157"]
+                    },
+                    { "name": "Apple Sierra LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "sierra-cloop-debug",
+                      "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
+                      "slavenames": ["bot186"]
+                    },
+                    { "name": "Apple Sierra 32-bit JSC (BuildAndTest)", "type": "BuildAndTest32bitJSC", "builddir": "sierra-32bitJSC-debug",
+                      "platform": "mac-sierra", "configuration": "debug", "architectures": ["i386"],
+                      "slavenames": ["bot187"]
+                    },
                     { "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
                       "platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["elcapitan-debug-tests-jsc", "elcapitan-debug-tests-wk1", "elcapitan-debug-tests-wk2"],
@@ -200,13 +216,9 @@
                     },
                     { "name": "Apple Yosemite Debug (Build)", "type": "Build", "builddir": "yosemite-debug",
                       "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
-                      "triggers": ["yosemite-debug-tests-jsc", "yosemite-debug-tests-wk1", "yosemite-debug-tests-wk2"],
+                      "triggers": ["yosemite-debug-tests-wk1", "yosemite-debug-tests-wk2"],
                       "slavenames": ["bot180", "bot181"]
                     },
-                    { "name": "Apple Yosemite Debug JSC (Tests)", "type": "TestJSC", "builddir": "yosemite-debug-tests-jsc",
-                      "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
-                      "slavenames": ["bot155"]
-                    },
                     { "name": "Apple Yosemite Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "yosemite-debug-tests-wk1",
                       "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
@@ -217,23 +229,11 @@
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
                       "slavenames": ["bot184", "bot185"]
                     },
-                    { "name": "Apple Yosemite LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "yosemite-cloop-debug",
-                      "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
-                      "slavenames": ["bot186"]
-                    },
-                    { "name": "Apple Yosemite 32-bit JSC (BuildAndTest)", "type": "BuildAndTest32bitJSC", "builddir": "yosemite-32bitJSC-debug",
-                      "platform": "mac-yosemite", "configuration": "debug", "architectures": ["i386"],
-                      "slavenames": ["bot187"]
-                    },
                     { "name": "Apple Yosemite Release (Build)", "type": "Build", "builddir": "yosemite-release",
                       "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
-                      "triggers": ["yosemite-release-tests-jsc", "yosemite-release-tests-wk1", "yosemite-release-tests-wk2", "yosemite-release-perf"],
+                      "triggers": ["yosemite-release-tests-wk1", "yosemite-release-tests-wk2", "yosemite-release-perf"],
                       "slavenames": ["bot400", "bot401"]
                     },
-                    { "name": "Apple Yosemite Release JSC (Tests)", "type": "TestJSC", "builddir": "yosemite-release-tests-jsc",
-                      "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
-                      "slavenames": ["bot157"]
-                    },
                     { "name": "Apple Yosemite Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "yosemite-release-tests-wk1",
                       "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
@@ -391,13 +391,13 @@
                                        "WinCairo 64-Bit Release"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "mac-yosemite", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple Yosemite Release (Build)", "Apple Yosemite Debug (Build)", "Apple Yosemite LLINT CLoop (BuildAndTest)", "Apple Yosemite 32-bit JSC (BuildAndTest)", "Apple Yosemite Release (32-bit Build)"]
+                      "builderNames": ["Apple Yosemite Release (Build)", "Apple Yosemite Debug (Build)", "Apple Yosemite Release (32-bit Build)"]
                     },
                     { "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": "mac-sierra", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple Sierra Release (Build)", "Apple Sierra Debug (Build)", "Apple Sierra Release (32-bit Build)"]
+                      "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)"]
@@ -420,6 +420,12 @@
                     { "type": "Triggerable", "name": "sierra-debug-tests-wk2",
                       "builderNames": ["Apple Sierra Debug WK2 (Tests)"]
                     },
+                    { "type": "Triggerable", "name": "sierra-debug-tests-jsc",
+                      "builderNames": ["Apple Sierra Debug JSC (Tests)"]
+                    },
+                    { "type": "Triggerable", "name": "sierra-release-tests-jsc",
+                      "builderNames": ["Apple Sierra Release JSC (Tests)"]
+                    },
                     { "type": "Triggerable", "name": "elcapitan-leaks",
                       "builderNames": ["Apple El Capitan (Leaks)"]
                     },
@@ -444,18 +450,12 @@
                     { "type": "Triggerable", "name": "elcapitan-release-perf",
                       "builderNames": ["Apple El Capitan Release WK2 (Perf)"]
                     },
-                    { "type": "Triggerable", "name": "yosemite-release-tests-jsc",
-                      "builderNames": ["Apple Yosemite Release JSC (Tests)"]
-                    },
                     { "type": "Triggerable", "name": "yosemite-release-tests-wk1",
                       "builderNames": ["Apple Yosemite Release WK1 (Tests)"]
                     },
                     { "type": "Triggerable", "name": "yosemite-release-tests-wk2",
                       "builderNames": ["Apple Yosemite Release WK2 (Tests)"]
                     },
-                    { "type": "Triggerable", "name": "yosemite-debug-tests-jsc",
-                      "builderNames": ["Apple Yosemite Debug JSC (Tests)"]
-                    },
                     { "type": "Triggerable", "name": "yosemite-debug-tests-wk1",
                       "builderNames": ["Apple Yosemite Debug WK1 (Tests)"]
                     },

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
index f089857..32d3a36 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
@@ -33,6 +33,12 @@ WebKitBuildbot = function()
         "Apple Sierra Debug WK2 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
         "Apple Sierra Release WK1 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
         "Apple Sierra Release WK2 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple Sierra JSC": {platform: Dashboard.Platform.macOSSierra, heading: "JavaScript", combinedQueues: {
+            "Apple Sierra 32-bit JSC (BuildAndTest)": {heading: "32-bit JSC (BuildAndTest)"},
+            "Apple Sierra LLINT CLoop (BuildAndTest)": {heading: "LLINT CLoop (BuildAndTest)"},
+            "Apple Sierra Debug JSC (Tests)": {heading: "Debug JSC (Tests)"},
+            "Apple Sierra Release JSC (Tests)": {heading: "Release JSC (Tests)"},
+        }},
         "Apple El Capitan Debug (Build)": {platform: Dashboard.Platform.MacOSXElCapitan, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
         "Apple El Capitan Release (Build)": {platform: Dashboard.Platform.MacOSXElCapitan, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
         "Apple El Capitan Release (32-bit Build)": {platform: Dashboard.Platform.MacOSXElCapitan, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
@@ -56,12 +62,6 @@ WebKitBuildbot = function()
         "Apple Yosemite Release WK1 (Tests)": {platform: Dashboard.Platform.MacOSXYosemite, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
         "Apple Yosemite Release WK2 (Tests)": {platform: Dashboard.Platform.MacOSXYosemite, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
         "Apple Yosemite Release WK2 (Perf)": {platform: Dashboard.Platform.MacOSXYosemite, debug: false, performance: true, heading: "Performance"},
-        "Apple Yosemite JSC": {platform: Dashboard.Platform.MacOSXYosemite, heading: "JavaScript", combinedQueues: {
-            "Apple Yosemite 32-bit JSC (BuildAndTest)": {heading: "32-bit JSC (BuildAndTest)"},
-            "Apple Yosemite LLINT CLoop (BuildAndTest)": {heading: "LLINT CLoop (BuildAndTest)"},
-            "Apple Yosemite Debug JSC (Tests)": {heading: "Debug JSC (Tests)"},
-            "Apple Yosemite Release JSC (Tests)": {heading: "Release JSC (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},

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 895b8e0..52d2d3e 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2016-12-15  Alexey Proskuryakov  <ap@apple.com>
+
+        Move JSC testers from Yosemite to Sierra
+        https://bugs.webkit.org/show_bug.cgi?id=165925
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+        (WebKitBuildbot):
+
 2016-12-15  Megan Gardner  <megan_gardner@apple.com>
 
         Add coordinate space to event streams and streamline tests