Work towards: Add status of Safari projects on iOS Dashboard on build-safari
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Jun 2015 22:41:39 +0000 (22:41 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Jun 2015 22:41:39 +0000 (22:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=146126
<rdar://problem/18226291>

Patch by Jason Marcell <jmarcell@apple.com> on 2015-06-24
Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
(documentReady): Using combined queues to display iOS projects

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

Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js
Tools/ChangeLog

index a6da072..c6e618d 100644 (file)
@@ -38,6 +38,7 @@ for (var i = 0; i < buildbots.length; ++i) {
                 branch: info.branch,
                 platform: info.platform.name,
                 heading: info.heading,
+                builder: info.builder,
                 combinedQueues: Object.keys(info.combinedQueues).map(function(combinedQueueID) { return buildbot.queues[combinedQueueID]; }),
             };
         } else
@@ -51,7 +52,12 @@ for (var i = 0; i < buildbots.length; ++i) {
             platform.builders = [];
 
         var categoryName;
-        if (queue.builder)
+        if ("combinedQueues" in queue)
+            if (queue.builder)
+                categoryName = "builderCombinedQueues";
+            else
+                categoryName = "otherCombinedQueues"
+        else if (queue.builder)
             categoryName = "builders";
         else if (queue.tester)
             categoryName = queue.testCategory;
@@ -61,8 +67,6 @@ for (var i = 0; i < buildbots.length; ++i) {
             categoryName = "leaks";
         else if (queue.staticAnalyzer)
             categoryName = "staticAnalyzer";
-        else if ("combinedQueues" in queue)
-            categoryName = "combinedQueues";
         else {
             console.assert("Unknown queue type.");
             continue;
@@ -233,6 +237,13 @@ function documentReady()
         cell.appendChild(view.element);
         row.appendChild(cell);
 
+        if ("builderCombinedQueues" in platformQueues) {
+            for (var i = 0; i < platformQueues.builderCombinedQueues.length; ++i) {
+                var view = new BuildbotCombinedQueueView(platformQueues.builderCombinedQueues[i]);
+                cell.appendChild(view.element);
+            }
+        }
+
         for (var testerKey in Buildbot.TestCategory) {
             var cell = document.createElement("td");
 
@@ -266,10 +277,9 @@ function documentReady()
             cell.appendChild(view.element);
         }
 
-        // Currently, all combined queues are in Other column.
-        if (platformQueues.combinedQueues) {
-            for (var i = 0; i < platformQueues.combinedQueues.length; ++i) {
-                var view = new BuildbotCombinedQueueView(platformQueues.combinedQueues[i]);
+        if ("otherCombinedQueues" in platformQueues) {
+            for (var i = 0; i < platformQueues.otherCombinedQueues.length; ++i) {
+                var view = new BuildbotCombinedQueueView(platformQueues.otherCombinedQueues[i]);
                 cell.appendChild(view.element);
             }
         }
index ac3029d..e4da3c3 100644 (file)
@@ -1,3 +1,14 @@
+2015-06-24  Jason Marcell  <jmarcell@apple.com>
+
+        Work towards: Add status of Safari projects on iOS Dashboard on build-safari
+        https://bugs.webkit.org/show_bug.cgi?id=146126
+        <rdar://problem/18226291>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
+        (documentReady): Using combined queues to display iOS projects
+
 2015-06-24  Doug Russell  <d_russell@apple.com>
 
         Bug 146177 - AX: AXObjectCache should try to use an unignored accessibilityObject