<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184879] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184879">184879</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-05-26 15:06:05 -0700 (Tue, 26 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Botwatcher's dashboard doesn't show JSC test regressions on Apple bots
https://bugs.webkit.org/show_bug.cgi?id=143091
rdar://problem/19330328
Reviewed by Darin Adler and Timothy Hatcher.
We have many of these, which are hard to fit on the dashboard. Added a view that
collapses to a single green bubble when everything is good, and expands when there
are failures (or manually).
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html: Added BuildbotCombinedQueueView.js
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
(Buildbot.prototype.set isAuthenticated):
(Buildbot.prototype._normalizeQueueInfo):
(Buildbot.prototype._normalizeQueuesInfo):
(Buildbot.prototype.updateQueues):
Moved queue info normalization here from BuildbitQueue. The latter is a model class
that shouldn't have to know about presentation, and this lets us leep the knowledge
about combined queues out if it. Later, we can refactor existing code, and move out
all knowledge about headings and such.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:
Added the new view. It's not quite universal, and doesn't have as helpful popovers
as other views, but we can extend it when/if we use it for more than JSC.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue): Now that info is normalized before creating a queue, don't do that here.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
(documentReady): Added support for combined queues. These are currently always ending up
in Other column, but it's easy to customize in the future if we need to.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot): Added JSC queus.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css:
(.combined-queue-popover):
(.combined-queue-popover .revision):
Added styles for the combined view.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsWebKitBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesQueueViewcss">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardindexhtml">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotCombinedQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js (184878 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2015-05-26 21:50:39 UTC (rev 184878)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,16 +31,24 @@
</span><span class="cx"> console.assert(queuesInfo);
</span><span class="cx">
</span><span class="cx"> this.baseURL = baseURL;
</span><ins>+ this.queuesInfo = queuesInfo;
</ins><span class="cx"> this.queues = {};
</span><span class="cx">
</span><ins>+ this._normalizeQueuesInfo();
+
</ins><span class="cx"> // We regard _needsAuthentication as a hint whether this Buildbot requires authentication so that we can show
</span><span class="cx"> // an appropriate initial status message (say, an "unauthorized" status if the Buildbot requires authentication)
</span><span class="cx"> // for its associated queues before we make the actual HTTP request for the status of each queue.
</span><span class="cx"> this._needsAuthentication = typeof options === "object" && options.needsAuthentication === true;
</span><span class="cx"> this._authenticationStatus = Buildbot.AuthenticationStatus.Unauthenticated;
</span><span class="cx">
</span><del>- for (var id in queuesInfo)
- this.queues[id] = new BuildbotQueue(this, id, queuesInfo[id]);
</del><ins>+ for (var id in queuesInfo) {
+ if (queuesInfo[id].combinedQueues) {
+ for (var combinedQueueID in queuesInfo[id].combinedQueues)
+ this.queues[combinedQueueID] = new BuildbotQueue(this, combinedQueueID, queuesInfo[id].combinedQueues[combinedQueueID]);
+ } else
+ this.queues[id] = new BuildbotQueue(this, id, queuesInfo[id]);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> BaseObject.addConstructorFunctions(Buildbot);
</span><span class="lines">@@ -92,6 +100,35 @@
</span><span class="cx"> this._authenticationStatus = value ? Buildbot.AuthenticationStatus.Authenticated : Buildbot.AuthenticationStatus.InvalidCredentials;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _normalizeQueueInfo: function(queueInfo)
+ {
+ queueInfo.branch = queueInfo.branch || { openSource: "trunk", internal: "trunk" };
+ queueInfo.debug = queueInfo.debug || false;
+ queueInfo.builder = queueInfo.builder || false;
+ queueInfo.tester = queueInfo.tester || false;
+ queueInfo.performance = queueInfo.performance || false;
+ queueInfo.staticAnalyzer = queueInfo.staticAnalyzer || false;
+ queueInfo.leaks = queueInfo.leaks || false;
+ queueInfo.architecture = queueInfo.architecture || null;
+ queueInfo.testCategory = queueInfo.testCategory || null;
+ queueInfo.heading = queueInfo.heading || null;
+ queueInfo.crashesOnly = queueInfo.crashesOnly || false;
+ },
+
+ _normalizeQueuesInfo: function()
+ {
+ for (queueName in this.queuesInfo) {
+ var queueInfo = this.queuesInfo[queueName];
+ this._normalizeQueueInfo(queueInfo);
+ if (queueInfo.combinedQueues) {
+ for (combinedQueueName in queueInfo.combinedQueues) {
+ queueInfo.combinedQueues[combinedQueueName].platform = queueInfo.platform;
+ this._normalizeQueueInfo(queueInfo.combinedQueues[combinedQueueName]);
+ }
+ }
+ }
+ },
+
</ins><span class="cx"> updateQueues: function(updateReason)
</span><span class="cx"> {
</span><span class="cx"> var shouldReauthenticate = updateReason === Buildbot.UpdateReason.Reauthenticate;
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotCombinedQueueViewjs"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js (0 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -0,0 +1,211 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+BuildbotCombinedQueueView = function(queue)
+{
+ for (var i = 1, end = queue.combinedQueues.length; i < end; ++i) {
+ console.assert(queue.combinedQueues[0].buildbot === queue.combinedQueues[i].buildbot);
+ console.assert(queue.combinedQueues[0].branch.openSource === queue.combinedQueues[i].branch.openSource);
+ console.assert(queue.combinedQueues[0].branch.internal === queue.combinedQueues[i].branch.internal);
+ }
+
+ BuildbotQueueView.call(this, queue.combinedQueues);
+
+ this._alwaysExpand = false;
+ this.combinedQueue = queue;
+ this.update();
+};
+
+BaseObject.addConstructorFunctions(BuildbotCombinedQueueView);
+
+BuildbotCombinedQueueView.prototype = {
+ constructor: BuildbotCombinedQueueView,
+ __proto__: BuildbotQueueView.prototype,
+
+ update: function()
+ {
+ BuildbotQueueView.prototype.update.call(this);
+
+ this.element.removeChildren();
+
+ if (!this._alwaysExpand && this._queuesShouldDisplayCombined()) {
+ var releaseLabel = document.createElement("a");
+ releaseLabel.classList.add("queueLabel");
+ releaseLabel.href = "#";
+ releaseLabel.textContent = this.combinedQueue.heading;
+ releaseLabel.onclick = function() { this._alwaysExpand = true; this.update(); return false; }.bind(this);
+ this.element.appendChild(releaseLabel);
+
+ var queue = this.queues[0]; // All queues in the combined queue are from the same buildbot.
+ if (queue.buildbot.needsAuthentication && !queue.buildbot.isAuthenticated) {
+ this._appendUnauthorizedLineView(queue);
+ return;
+ }
+
+ // Show the revision for the slowest queue, because we don't know if any newer revisions are green on all queues.
+ // This can be slightly misleading after fixing a problem, because we can show a known broken revision as green.
+ var slowestQueue = this.queues.slice().sort(function(a, b) { return BuildbotQueue.prototype.compareIterationsByRevisions(a.mostRecentSuccessfulIteration, b.mostRecentSuccessfulIteration); }).pop();
+ this._appendPendingRevisionCount(slowestQueue);
+
+ var message = this.revisionContentForIteration(slowestQueue.mostRecentSuccessfulIteration);
+ var status = new StatusLineView(message, StatusLineView.Status.Good, "all tests passed", null, null);
+ new PopoverTracker(status.statusBubbleElement, this._presentPopoverForCombinedGreenBubble.bind(this));
+ this.element.appendChild(status.element);
+ } else {
+ this.appendBuildStyle.call(this, this.queues, null, function(queue) {
+ if (queue.buildbot.needsAuthentication && !queue.buildbot.isAuthenticated) {
+ this._appendUnauthorizedLineView(queue);
+ return;
+ }
+
+ this._appendPendingRevisionCount(queue);
+
+ var firstRecentUnsuccessfulIteration = queue.firstRecentUnsuccessfulIteration;
+ var mostRecentFinishedIteration = queue.mostRecentFinishedIteration;
+ var mostRecentSuccessfulIteration = queue.mostRecentSuccessfulIteration;
+
+ if (firstRecentUnsuccessfulIteration && firstRecentUnsuccessfulIteration.loaded && mostRecentFinishedIteration && mostRecentFinishedIteration.loaded) {
+ console.assert(!mostRecentFinishedIteration.successful);
+ var message = this.revisionContentForIteration(mostRecentFinishedIteration, mostRecentFinishedIteration.productive ? mostRecentSuccessfulIteration : null);
+ if (mostRecentFinishedIteration.failed) {
+ // Direct links to some common logs.
+ var url = mostRecentFinishedIteration.failureLogURL("build log");
+ if (!url)
+ url = mostRecentFinishedIteration.failureLogURL("stdio");
+ var status = StatusLineView.Status.Bad;
+ } else
+ var status = StatusLineView.Status.Danger;
+
+ // Show a popover when the URL is not a main build page one, because there are usually multiple logs, and it's good to provide a choice.
+ var needsPopover = !url;
+
+ // Some other step failed, link to main buildbot page for the iteration.
+ if (!url)
+ url = queue.buildbot.buildPageURLForIteration(mostRecentFinishedIteration);
+ var status = new StatusLineView(message, status, mostRecentFinishedIteration.text, null, url);
+ this.element.appendChild(status.element);
+
+ if (needsPopover)
+ new PopoverTracker(status.statusBubbleElement, this._presentIndividualQueuePopover.bind(this), mostRecentFinishedIteration);
+ }
+
+ if (mostRecentSuccessfulIteration && mostRecentSuccessfulIteration.loaded) {
+ var message = this.revisionContentForIteration(mostRecentSuccessfulIteration);
+ var url = queue.buildbot.buildPageURLForIteration(mostRecentSuccessfulIteration);
+ var status = new StatusLineView(message, StatusLineView.Status.Good, firstRecentUnsuccessfulIteration ? "last succeeded" : "all tests passed", null, url);
+ this.element.appendChild(status.element);
+ } else {
+ var status = new StatusLineView("unknown", StatusLineView.Status.Neutral, firstRecentUnsuccessfulIteration ? "last succeeded" : "all tests passed");
+ this.element.appendChild(status.element);
+
+ if (firstRecentUnsuccessfulIteration) {
+ // We have a failed iteration but no successful. It might be further back in time.
+ queue.loadMoreHistoricalIterations();
+ }
+ }
+ });
+ }
+ },
+
+ // All queues are green, or all are unauthorized (the latter case always applies to all queues, because they are all from the same buildbot).
+ _queuesShouldDisplayCombined: function()
+ {
+ for (var i = 0, end = this.queues.length; i < end; ++i) {
+ var queue = this.queues[i];
+ if (queue.buildbot.needsAuthentication && !queue.buildbot.isAuthenticated)
+ return true;
+ if (!queue.mostRecentFinishedIteration || !queue.mostRecentFinishedIteration.successful)
+ return false;
+ }
+ return true;
+ },
+
+ _presentPopoverForCombinedGreenBubble: function(element, popover)
+ {
+ var content = document.createElement("div");
+ content.className = "combined-queue-popover";
+
+ var title = document.createElement("div");
+ title.className = "popover-iteration-heading";
+ title.textContent = "latest tested revisions";
+ content.appendChild(title);
+
+ this._addDividerToPopover(content);
+
+ function addQueue(queue, view) {
+ var line = document.createElement("div");
+ var link = document.createElement("a");
+ link.className = "queue-link";
+ link.href = queue.overviewURL;
+ link.textContent = queue.heading;
+ link.target = "_blank";
+ line.appendChild(link);
+ var revision = document.createElement("span");
+ revision.className = "revision";
+ revision.appendChild(view.revisionContentForIteration(queue.mostRecentSuccessfulIteration));
+ line.appendChild(revision);
+ content.appendChild(line);
+ }
+
+ for (var i = 0, end = this.queues.length; i < end; ++i)
+ addQueue(this.queues[i], this);
+
+ var rect = Dashboard.Rect.rectFromClientRect(element.getBoundingClientRect());
+ popover.content = content;
+ popover.present(rect, [Dashboard.RectEdge.MIN_Y, Dashboard.RectEdge.MAX_Y, Dashboard.RectEdge.MAX_X, Dashboard.RectEdge.MIN_X]);
+ return true;
+ },
+
+ _presentIndividualQueuePopover: function(element, popover, iteration)
+ {
+ var content = document.createElement("div");
+ content.className = "build-logs-popover";
+
+ function addLog(name, url) {
+ var line = document.createElement("a");
+ line.className = "build-log-link";
+ line.href = url;
+ line.textContent = name;
+ line.target = "_blank";
+ content.appendChild(line);
+ }
+
+ this._addIterationHeadingToPopover(iteration, content);
+ this._addDividerToPopover(content);
+
+ var logsHeadingLine = document.createElement("div");
+ logsHeadingLine.className = "build-logs-heading";
+ logsHeadingLine.textContent = iteration.firstFailedStepName + " failed";
+ content.appendChild(logsHeadingLine);
+
+ for (var i = 0, end = iteration.failureLogs.length; i < end; ++i)
+ addLog(iteration.failureLogs[i][0], iteration.failureLogs[i][1]);
+
+ var rect = Dashboard.Rect.rectFromClientRect(element.getBoundingClientRect());
+ popover.content = content;
+ popover.present(rect, [Dashboard.RectEdge.MIN_Y, Dashboard.RectEdge.MAX_Y, Dashboard.RectEdge.MAX_X, Dashboard.RectEdge.MIN_X]);
+ return true;
+ },
+};
</ins><span class="cx">Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js (184878 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-05-26 21:50:39 UTC (rev 184878)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -33,18 +33,19 @@
</span><span class="cx"> this.buildbot = buildbot;
</span><span class="cx"> this.id = id;
</span><span class="cx">
</span><del>- this.branch = info.branch || { openSource: "trunk", internal: "trunk" };
- this.platform = info.platform.name || "unknown";
- this.debug = info.debug || false;
- this.builder = info.builder || false;
- this.tester = info.tester || false;
- this.performance = info.performance || false;
- this.staticAnalyzer = info.staticAnalyzer || false;
- this.leaks = info.leaks || false;
- this.architecture = info.architecture || null;
- this.testCategory = info.testCategory || null;
- this.heading = info.heading || null;
- this.crashesOnly = info.crashesOnly || false;
</del><ins>+ // FIXME: Some of these are presentation only, and should be handled above BuildbotQueue level.
+ this.branch = info.branch;
+ this.platform = info.platform.name;
+ this.debug = info.debug;
+ this.builder = info.builder;
+ this.tester = info.tester;
+ this.performance = info.performance;
+ this.staticAnalyzer = info.staticAnalyzer;
+ this.leaks = info.leaks;
+ this.architecture = info.architecture;
+ this.testCategory = info.testCategory;
+ this.heading = info.heading;
+ this.crashesOnly = info.crashesOnly;
</ins><span class="cx">
</span><span class="cx"> this.iterations = [];
</span><span class="cx"> this._knownIterations = {};
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js (184878 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-05-26 21:50:39 UTC (rev 184878)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -30,11 +30,23 @@
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < buildbots.length; ++i) {
</span><span class="cx"> var buildbot = buildbots[i];
</span><del>- for (var id in buildbot.queues) {
- var queue = buildbot.queues[id];
- var platform = categorizedQueuesByPlatformAndBuildType[queue.platform];
</del><ins>+ for (var id in buildbot.queuesInfo) {
+ if (buildbot.queuesInfo[id].combinedQueues) {
+ var info = buildbot.queuesInfo[id];
+ var queue = {
+ id: id,
+ branch: info.branch,
+ platform: info.platform.name,
+ heading: info.heading,
+ combinedQueues: Object.keys(info.combinedQueues).map(function(combinedQueueID) { return buildbot.queues[combinedQueueID]; }),
+ };
+ } else
+ var queue = buildbot.queues[id];
+
+ var platformName = queue.platform;
+ var platform = categorizedQueuesByPlatformAndBuildType[platformName];
</ins><span class="cx"> if (!platform)
</span><del>- platform = categorizedQueuesByPlatformAndBuildType[queue.platform] = {};
</del><ins>+ platform = categorizedQueuesByPlatformAndBuildType[platformName] = {};
</ins><span class="cx"> if (!platform.builders)
</span><span class="cx"> platform.builders = [];
</span><span class="cx">
</span><span class="lines">@@ -49,6 +61,8 @@
</span><span class="cx"> categoryName = "leaks";
</span><span class="cx"> else if (queue.staticAnalyzer)
</span><span class="cx"> categoryName = "staticAnalyzer";
</span><ins>+ else if ("combinedQueues" in queue)
+ categoryName = "combinedQueues";
</ins><span class="cx"> else {
</span><span class="cx"> console.assert("Unknown queue type.");
</span><span class="cx"> continue;
</span><span class="lines">@@ -220,17 +234,21 @@
</span><span class="cx"> cell.appendChild(view.element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- row.appendChild(cell);
</del><ins>+ if (platformQueues[BubblesCategory]) {
+ var view = new BubbleQueueView(platformQueues[BubblesCategory]);
+ cell.appendChild(view.element);
+ }
</ins><span class="cx">
</span><del>- if (hasBubbles) {
- if (platformQueues[BubblesCategory]) {
- var view = new BubbleQueueView(platformQueues[BubblesCategory]);
</del><ins>+ // 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]);
</ins><span class="cx"> cell.appendChild(view.element);
</span><span class="cx"> }
</span><del>-
- row.appendChild(cell);
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ row.appendChild(cell);
+
</ins><span class="cx"> table.appendChild(row);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsWebKitBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (184878 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2015-05-26 21:50:39 UTC (rev 184878)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -33,6 +33,10 @@
</span><span class="cx"> "Apple Mavericks Release WK1 (Tests)": {platform: Dashboard.Platform.MacOSXMavericks, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
</span><span class="cx"> "Apple Mavericks Release WK2 (Tests)": {platform: Dashboard.Platform.MacOSXMavericks, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
</span><span class="cx"> "Apple Mavericks Release WK2 (Perf)": {platform: Dashboard.Platform.MacOSXMavericks, debug: false, performance: true, heading: "Performance"},
</span><ins>+ "Apple Mavericks JSC": {platform: Dashboard.Platform.MacOSXMavericks, heading: "JavaScript", combinedQueues: {
+ "Apple Mavericks 32-bit JSC (BuildAndTest)": {heading: "32-bit JSC (BuildAndTest)"},
+ "Apple Mavericks LLINT CLoop (BuildAndTest)": {heading: "LLINT CLoop (BuildAndTest)"},
+ }},
</ins><span class="cx"> "Apple Yosemite Debug (Build)": {platform: Dashboard.Platform.MacOSXYosemite, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
</span><span class="cx"> "Apple Yosemite Release (Build)": {platform: Dashboard.Platform.MacOSXYosemite, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
</span><span class="cx"> "Apple Yosemite Release (32-bit Build)": {platform: Dashboard.Platform.MacOSXYosemite, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
</span><span class="lines">@@ -42,6 +46,12 @@
</span><span class="cx"> "Apple Yosemite Release WK2 (Tests)": {platform: Dashboard.Platform.MacOSXYosemite, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
</span><span class="cx"> "Apple Yosemite Release WK2 (Perf)": {platform: Dashboard.Platform.MacOSXYosemite, debug: false, performance: true, heading: "Performance"},
</span><span class="cx"> "Apple Yosemite (Leaks)": {platform: Dashboard.Platform.MacOSXYosemite, debug: true, leaks: true},
</span><ins>+ "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)"},
+ }},
</ins><span class="cx"> "Apple Win Debug (Build)": {platform: Dashboard.Platform.Windows7, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
</span><span class="cx"> "Apple Win Release (Build)": {platform: Dashboard.Platform.Windows7, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
</span><span class="cx"> "Apple Win 7 Debug (Tests)": {platform: Dashboard.Platform.Windows7, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesQueueViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css (184878 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css 2015-05-26 21:50:39 UTC (rev 184878)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -121,7 +121,8 @@
</span><span class="cx">
</span><span class="cx"> .bubble-server-popover,
</span><span class="cx"> .performance-popover,
</span><del>-.leaks-popover {
</del><ins>+.leaks-popover,
+.combined-queue-popover {
</ins><span class="cx"> font-family: "HelveticaNeue-Light", "Helvetica Neue", sans-serif;
</span><span class="cx"> color: rgb(145, 135, 95);
</span><span class="cx"> font-size: 12px;
</span><span class="lines">@@ -152,3 +153,7 @@
</span><span class="cx"> .performance-popover .dashboard-link {
</span><span class="cx"> color: blue;
</span><span class="cx"> }
</span><ins>+
+.combined-queue-popover .revision {
+ padding-left: 7px;
+}
</ins></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html (184878 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html 2015-05-26 21:50:39 UTC (rev 184878)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> <script src="Scripts/BuildbotQueueView.js"></script>
</span><span class="cx"> <script src="Scripts/BuildbotBuilderQueueView.js"></script>
</span><span class="cx"> <script src="Scripts/BuildbotTesterQueueView.js"></script>
</span><ins>+ <script src="Scripts/BuildbotCombinedQueueView.js"></script>
</ins><span class="cx"> <script src="Scripts/BuildbotPerformanceQueueView.js"></script>
</span><span class="cx"> <script src="Scripts/BuildbotLeaksQueueView.js"></script>
</span><span class="cx"> <script src="Scripts/BubbleQueueView.js"></script>
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184878 => 184879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-26 21:50:39 UTC (rev 184878)
+++ trunk/Tools/ChangeLog 2015-05-26 22:06:05 UTC (rev 184879)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-05-26 Alexey Proskuryakov <ap@apple.com>
+
+ Botwatcher's dashboard doesn't show JSC test regressions on Apple bots
+ https://bugs.webkit.org/show_bug.cgi?id=143091
+ rdar://problem/19330328
+
+ Reviewed by Darin Adler and Timothy Hatcher.
+
+ We have many of these, which are hard to fit on the dashboard. Added a view that
+ collapses to a single green bubble when everything is good, and expands when there
+ are failures (or manually).
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html: Added BuildbotCombinedQueueView.js
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+ (Buildbot.prototype.set isAuthenticated):
+ (Buildbot.prototype._normalizeQueueInfo):
+ (Buildbot.prototype._normalizeQueuesInfo):
+ (Buildbot.prototype.updateQueues):
+ Moved queue info normalization here from BuildbitQueue. The latter is a model class
+ that shouldn't have to know about presentation, and this lets us leep the knowledge
+ about combined queues out if it. Later, we can refactor existing code, and move out
+ all knowledge about headings and such.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:
+ Added the new view. It's not quite universal, and doesn't have as helpful popovers
+ as other views, but we can extend it when/if we use it for more than JSC.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
+ (BuildbotQueue): Now that info is normalized before creating a queue, don't do that here.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
+ (documentReady): Added support for combined queues. These are currently always ending up
+ in Other column, but it's easy to customize in the future if we need to.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ (WebKitBuildbot): Added JSC queus.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css:
+ (.combined-queue-popover):
+ (.combined-queue-popover .revision):
+ Added styles for the combined view.
+
</ins><span class="cx"> 2015-05-26 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Changed a file to use Unix line endings.
</span></span></pre>
</div>
</div>
</body>
</html>