<!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>[161099] 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/161099">161099</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2013-12-27 00:37:12 -0800 (Fri, 27 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Display EWS status on bot watcher's dashboard
https://bugs.webkit.org/show_bug.cgi?id=126224
Reviewed by Timothy Hatcher.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: Added.
Moved platform definitions out of Buildbot.js, as they are also needed for EWS.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js: Added.
(QueueView):
(QueueView.prototype.updateSoon):
(QueueView.prototype.update):
(QueueView.prototype._updateHiddenState):
Moved auto-update and hide logic to a base class, as it equally applies to EWS.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWS.js: Added.
This is a peer to Buildbot.js and WebKitBuildbot.js.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js: Added.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js: Added.
Quite simple for now, only keeping track of queue size.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Initialization.js:
Initialize EWS.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
Create EWS views.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
Updated for Buildbot.Platform rename, it's now Dashboard.Platform.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotBuilderQueueView.css: Removed.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css: Removed.
These were empty, no reason to waste the time loading them.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotTesterQueueView.css: Removed.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css: Copied from Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css.
Renamed, as these styles apply to all queues, not just buildbot ones (and they have to, as columns should look alike).
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html:
- Changed page title, as it no longer displays just buildbot status.
- Updated subresource lists for the new, renamed and removed files.</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_htmldashboardScriptsBuildbotQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsInitializationjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Initialization.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_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_htmldashboardScriptsDashboardjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsEWSjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWS.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsEWSQueuejs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsEWSQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesQueueViewcss">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesBuildbotBuilderQueueViewcss">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotBuilderQueueView.css</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesBuildbotQueueViewcss">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesBuildbotTesterQueueViewcss">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotTesterQueueView.css</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 (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -39,19 +39,6 @@
</span><span class="cx">
</span><span class="cx"> BaseObject.addConstructorFunctions(Buildbot);
</span><span class="cx">
</span><del>-// Ordered importance/recency.
-Buildbot.Platform = {
- MacOSXMavericks: { name: "mac-os-x-mavericks", readableName: "OS X Mavericks", order: 10 },
- MacOSXMountainLion: { name: "mac-os-x-mountain-lion", readableName: "OS X Mountain Lion", order: 20 },
- MacOSXLion: { name : "mac-os-x-lion", readableName: "Mac OS X Lion", order: 30 },
- Windows8: { name: "windows-8", readableName: "Windows 8", order: 40 },
- Windows7: { name: "windows-7", readableName: "Windows 7", order: 50 },
- WindowsXP: { name: "windows-xp", readableName: "Windows XP", order: 60 },
- LinuxQt: { name : "linux-qt", readableName: "Linux Qt", order: 70 },
- LinuxGTK: { name : "linux-gtk", readableName: "Linux GTK", order: 80 },
- LinuxEFL: { name: "linux-efl", readableName: "Linux EFL", order : 90 }
-};
-
</del><span class="cx"> // Ordered importance.
</span><span class="cx"> Buildbot.TestCategory = {
</span><span class="cx"> WebKit2: "webkit-2",
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -25,15 +25,11 @@
</span><span class="cx">
</span><span class="cx"> BuildbotQueueView = function(debugQueues, releaseQueues)
</span><span class="cx"> {
</span><del>- BaseObject.call(this);
</del><ins>+ QueueView.call(this);
</ins><span class="cx">
</span><span class="cx"> this.releaseQueues = releaseQueues || [];
</span><span class="cx"> this.debugQueues = debugQueues || [];
</span><span class="cx">
</span><del>- this.element = document.createElement("div");
- this.element.classList.add("queue-view");
- this.element.__queueView = this;
-
</del><span class="cx"> this.releaseQueues.forEach(function(queue) {
</span><span class="cx"> if (this.platform && this.platform != queue.platform)
</span><span class="cx"> throw "A buildbot view may not contain queues for multiple platforms."
</span><span class="lines">@@ -53,10 +49,6 @@
</span><span class="cx"> webkitTrac.addEventListener(Trac.Event.NewCommitsRecorded, this._newCommitsRecorded, this);
</span><span class="cx"> if (typeof internalTrac != "undefined")
</span><span class="cx"> internalTrac.addEventListener(Trac.Event.NewCommitsRecorded, this._newCommitsRecorded, this);
</span><del>-
- this.updateTimer = null;
- this._updateHiddenState();
- settings.addSettingListener("hiddenPlatforms", this._updateHiddenState.bind(this));
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> BaseObject.addConstructorFunctions(BuildbotQueueView);
</span><span class="lines">@@ -66,25 +58,8 @@
</span><span class="cx">
</span><span class="cx"> BuildbotQueueView.prototype = {
</span><span class="cx"> constructor: BuildbotQueueView,
</span><del>- __proto__: BaseObject.prototype,
</del><ins>+ __proto__: QueueView.prototype,
</ins><span class="cx">
</span><del>- updateSoon: function()
- {
- if (this._updateTimeout)
- return;
- this._updateTimeout = setTimeout(this.update.bind(this), BuildbotQueueView.UpdateSoonTimeout);
- },
-
- update: function()
- {
- if (this._updateTimeout) {
- clearTimeout(this._updateTimeout);
- delete this._updateTimeout;
- }
-
- // Implemented by subclasses.
- },
-
</del><span class="cx"> _appendPendingRevisionCount: function(queue)
</span><span class="cx"> {
</span><span class="cx"> for (var i = 0; i < queue.iterations.length; ++i) {
</span><span class="lines">@@ -151,20 +126,6 @@
</span><span class="cx"> return fragment;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _updateHiddenState: function()
- {
- var hiddenPlatforms = settings.getObject("hiddenPlatforms");
- var wasHidden = !this.updateTimer;
- var isHidden = hiddenPlatforms && hiddenPlatforms.contains(this.platform);
-
- if (wasHidden && !isHidden)
- this.updateTimer = setInterval(this._updateQueues.bind(this), BuildbotQueueView.UpdateInterval);
- else if (!wasHidden && isHidden) {
- clearInterval(this.updateTimer);
- this.updateTimer = null;
- }
- },
-
</del><span class="cx"> _updateQueues: function()
</span><span class="cx"> {
</span><span class="cx"> this.releaseQueues.forEach(function(queue) { queue.update(); });
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsDashboardjs"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (0 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2013 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.
+ */
+
+Dashboard = {
+ Platform: {
+ MacOSXMavericks: { name: "mac-os-x-mavericks", readableName: "OS X Mavericks", order: 10 },
+ MacOSXMountainLion: { name: "mac-os-x-mountain-lion", readableName: "OS X Mountain Lion", order: 20 },
+ MacOSXLion: { name : "mac-os-x-lion", readableName: "Mac OS X Lion", order: 30 },
+ Windows8: { name: "windows-8", readableName: "Windows 8", order: 40 },
+ Windows7: { name: "windows-7", readableName: "Windows 7", order: 50 },
+ WindowsXP: { name: "windows-xp", readableName: "Windows XP", order: 60 },
+ LinuxQt: { name : "linux-qt", readableName: "Linux Qt", order: 70 },
+ LinuxGTK: { name : "linux-gtk", readableName: "Linux GTK", order: 80 },
+ LinuxEFL: { name: "linux-efl", readableName: "Linux EFL", order : 90 }
+ }
+};
</ins><span class="cx">Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.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_htmldashboardScriptsEWSjs"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWS.js (0 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWS.js (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWS.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2013 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.
+ */
+
+EWS = function()
+{
+ const queueInfo = {
+ "mac": {platform: Dashboard.Platform.MacOSXMountainLion, title: "WebKit1 Release Tests"},
+ "mac-wk2": {platform: Dashboard.Platform.MacOSXMountainLion, title: "WebKit2 Release Tests"},
+ "win": {platform: Dashboard.Platform.Windows7, title: "WebKit1 Release Build"},
+ "gtk": {platform: Dashboard.Platform.LinuxGTK, title: "WebKit1 Release Build"},
+ "gtk-wk2": {platform: Dashboard.Platform.LinuxGTK, title: "WebKit2 Release Build"},
+ "efl": {platform: Dashboard.Platform.LinuxEFL, title: "WebKit1 Release Build"},
+ "efl-wk2": {platform: Dashboard.Platform.LinuxEFL, title: "WebKit2 Release Build"}
+ };
+
+ BaseObject.call(this);
+
+ this.baseURL = "http://webkit-queues.appspot.com/";
+ this.queues = {};
+
+ for (var id in queueInfo)
+ this.queues[id] = new EWSQueue(this, id, queueInfo[id]);
+};
+
+BaseObject.addConstructorFunctions(EWS);
+
+EWS.prototype = {
+ constructor: EWS,
+ __proto__: BaseObject.prototype,
+};
</ins><span class="cx">Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWS.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_htmldashboardScriptsEWSQueuejs"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js (0 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+/*
+ * Copyright (C) 2013 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.
+ */
+
+EWSQueue = function(ews, id, info)
+{
+ BaseObject.call(this);
+
+ console.assert(ews);
+ console.assert(id);
+
+ this.ews = ews;
+ this.id = id;
+ this.title = info.title || "\xa0";
+
+ this.platform = info.platform.name || "unknown";
+
+ this.update();
+};
+
+BaseObject.addConstructorFunctions(EWSQueue);
+
+EWSQueue.Event = {
+ Updated: "updated"
+};
+
+EWSQueue.prototype = {
+ constructor: EWSQueue,
+ __proto__: BaseObject.prototype,
+
+ get baseURL()
+ {
+ return this.ews.baseURL + "queue-status-json/" + encodeURIComponent(this.id) + "-ews";
+ },
+
+ get statusPage()
+ {
+ return this.ews.baseURL + "queue-status/" + encodeURIComponent(this.id) + "-ews";
+ },
+
+ get patchCount()
+ {
+ return this._patchCount;
+ },
+
+ update: function()
+ {
+ JSON.load(this.baseURL, function(data) {
+ var newPatchCount = data.queue.length;
+ if (this._patchCount == newPatchCount && this._latestMessageTime == newLatestMessageTime)
+ return;
+ this._patchCount = newPatchCount;
+
+ this.dispatchEventToListeners(EWSQueue.Event.Updated, null);
+ }.bind(this));
+ }
+};
</ins><span class="cx">Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.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_htmldashboardScriptsEWSQueueViewjs"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js (0 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+/*
+ * Copyright (C) 2013 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.
+ */
+
+EWSQueueView = function(queues)
+{
+ QueueView.call(this);
+
+ this.queues = queues || [];
+
+ this.queues.forEach(function(queue) {
+ if (this.platform && this.platform != queue.platform)
+ throw "A EWS view may not contain queues for multiple platforms."
+ else
+ this.platform = queue.platform;
+ queue.addEventListener(EWSQueue.Event.Updated, this._queueUpdated, this);
+ }.bind(this));
+
+ this.update();
+};
+
+BaseObject.addConstructorFunctions(EWSQueueView);
+
+EWSQueueView.prototype = {
+ constructor: EWSQueueView,
+ __proto__: QueueView.prototype,
+
+ update: function()
+ {
+ QueueView.prototype.update.call(this);
+
+ this.element.removeChildren();
+
+ function appendQueue(queue)
+ {
+ var releaseLabel = document.createElement("a");
+ releaseLabel.classList.add("queueLabel");
+ releaseLabel.textContent = queue.title;
+ releaseLabel.href = queue.statusPage;
+ releaseLabel.target = "_blank";
+ this.element.appendChild(releaseLabel);
+
+ var patchCount = queue.patchCount;
+
+ var message = patchCount === 1 ? "patch in queue" : "patches in queue";
+ var status = new StatusLineView(message, StatusLineView.Status.Neutral, null, patchCount || "0");
+ this.element.appendChild(status.element);
+ }
+
+ this.queues.forEach(function(queue) {
+ appendQueue.call(this, queue);
+ }, this);
+ },
+
+ _updateQueues: function()
+ {
+ this.queues.forEach(function(queue) { queue.update(); });
+ },
+
+ _queueUpdated: function(event)
+ {
+ this.updateSoon();
+ },
+};
</ins><span class="cx">Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.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_htmldashboardScriptsInitializationjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Initialization.js (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Initialization.js 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Initialization.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -26,3 +26,4 @@
</span><span class="cx"> var settings = new Settings;
</span><span class="cx"> var buildbot = new WebKitBuildbot;
</span><span class="cx"> var webkitTrac = new Trac("http://trac.webkit.org/");
</span><ins>+var ews = new EWS;
</ins></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 (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -23,6 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+var hasEWS = typeof ews != "undefined";
+var EWSCategory = "ews";
+
</ins><span class="cx"> var categorizedQueuesByPlatformAndBuildType = {};
</span><span class="cx">
</span><span class="cx"> for (var id in buildbot.queues) {
</span><span class="lines">@@ -56,6 +59,25 @@
</span><span class="cx"> buildQueues.push(queue);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if (hasEWS) {
+ for (var id in ews.queues) {
+ var queue = ews.queues[id];
+ var platform = categorizedQueuesByPlatformAndBuildType[queue.platform];
+ if (!platform)
+ platform = categorizedQueuesByPlatformAndBuildType[queue.platform] = {};
+ if (!platform.builders)
+ platform.builders = {};
+
+ var categoryName = EWSCategory;
+
+ platformQueues = platform[categoryName];
+ if (!platformQueues)
+ platformQueues = platform[categoryName] = [];
+
+ platformQueues.push(queue);
+ }
+}
+
</ins><span class="cx"> var testNames = {};
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
</span><span class="lines">@@ -64,8 +86,8 @@
</span><span class="cx"> {
</span><span class="cx"> var platforms = [];
</span><span class="cx">
</span><del>- for (var platformKey in Buildbot.Platform)
- platforms.push(Buildbot.Platform[platformKey]);
</del><ins>+ for (var platformKey in Dashboard.Platform)
+ platforms.push(Dashboard.Platform[platformKey]);
</ins><span class="cx">
</span><span class="cx"> platforms.sort(function(a, b) {
</span><span class="cx"> return a.order - b.order;
</span><span class="lines">@@ -120,6 +142,12 @@
</span><span class="cx"> row.appendChild(header);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (hasEWS) {
+ var header = document.createElement("th");
+ header.textContent = "EWS";
+ row.appendChild(header);
+ }
+
</ins><span class="cx"> table.appendChild(row);
</span><span class="cx">
</span><span class="cx"> var platforms = sortedPlatforms();
</span><span class="lines">@@ -172,6 +200,17 @@
</span><span class="cx"> row.appendChild(cell);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (hasEWS) {
+ var cell = document.createElement("td");
+
+ if (platformQueues[EWSCategory]) {
+ var view = new EWSQueueView(platformQueues[EWSCategory]);
+ cell.appendChild(view.element);
+ }
+
+ 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_htmldashboardScriptsQueueViewjs"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js (0 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+/*
+ * Copyright (C) 2013 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.
+ */
+
+QueueView = function()
+{
+ BaseObject.call(this);
+
+ this.element = document.createElement("div");
+ this.element.classList.add("queue-view");
+ this.element.__queueView = this;
+
+ this.updateTimer = null;
+ this._updateHiddenState();
+ settings.addSettingListener("hiddenPlatforms", this._updateHiddenState.bind(this));
+};
+
+BaseObject.addConstructorFunctions(QueueView);
+
+QueueView.UpdateInterval = 45000; // 45 seconds
+QueueView.UpdateSoonTimeout = 1000; // 1 second
+
+QueueView.prototype = {
+ constructor: QueueView,
+ __proto__: BaseObject.prototype,
+
+ updateSoon: function()
+ {
+ if (this._updateTimeout)
+ return;
+ this._updateTimeout = setTimeout(this.update.bind(this), QueueView.UpdateSoonTimeout);
+ },
+
+ update: function()
+ {
+ if (this._updateTimeout) {
+ clearTimeout(this._updateTimeout);
+ delete this._updateTimeout;
+ }
+
+ // Implemented by subclasses.
+ },
+
+ _updateHiddenState: function()
+ {
+ var hiddenPlatforms = settings.getObject("hiddenPlatforms");
+ var wasHidden = !this.updateTimer;
+ var isHidden = hiddenPlatforms && hiddenPlatforms.contains(this.platform);
+
+ if (wasHidden && !isHidden)
+ this.updateTimer = setInterval(this._updateQueues.bind(this), QueueView.UpdateInterval);
+ else if (!wasHidden && isHidden) {
+ clearInterval(this.updateTimer);
+ this.updateTimer = null;
+ }
+ }
+};
</ins><span class="cx">Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.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_htmldashboardScriptsWebKitBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -26,28 +26,28 @@
</span><span class="cx"> WebKitBuildbot = function()
</span><span class="cx"> {
</span><span class="cx"> const queueInfo = {
</span><del>- "Apple MountainLion Release (Build)": {platform: Buildbot.Platform.MacOSXMountainLion, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
- "Apple MountainLion Release (32-bit Build)": {platform: Buildbot.Platform.MacOSXMountainLion, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
- "Apple MountainLion Debug (Build)": {platform: Buildbot.Platform.MacOSXMountainLion, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
- "Apple MountainLion Release WK1 (Tests)": {platform: Buildbot.Platform.MacOSXMountainLion, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "Apple MountainLion Debug WK1 (Tests)": {platform: Buildbot.Platform.MacOSXMountainLion, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "Apple MountainLion Release WK2 (Tests)": {platform: Buildbot.Platform.MacOSXMountainLion, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "Apple MountainLion Debug WK2 (Tests)": {platform: Buildbot.Platform.MacOSXMountainLion, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "Apple Mavericks Debug (Build)": {platform: Buildbot.Platform.MacOSXMavericks, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
- "Apple Mavericks Release (Build)": {platform: Buildbot.Platform.MacOSXMavericks, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
- "Apple Mavericks Debug WK1 (Tests)": {platform: Buildbot.Platform.MacOSXMavericks, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "Apple Mavericks Debug WK2 (Tests)": {platform: Buildbot.Platform.MacOSXMavericks, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "Apple Mavericks Release WK1 (Tests)": {platform: Buildbot.Platform.MacOSXMavericks, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "Apple Mavericks Release WK2 (Tests)": {platform: Buildbot.Platform.MacOSXMavericks, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "Apple Win Debug (Build)": {platform: Buildbot.Platform.Windows7, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
- "Apple Win Release (Build)": {platform: Buildbot.Platform.Windows7, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
- "Apple Win 7 Debug (Tests)": {platform: Buildbot.Platform.Windows7, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "Apple Win 7 Release (Tests)": {platform: Buildbot.Platform.Windows7, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "GTK Linux 64-bit Release": {platform: Buildbot.Platform.LinuxGTK, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "GTK Linux 64-bit Release WK1 (Tests)": {platform: Buildbot.Platform.LinuxGTK, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "EFL Linux 32-bit Release (Build)": {platform: Buildbot.Platform.LinuxEFL, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
- "EFL Linux 64-bit Release WK1": {platform: Buildbot.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "EFL Linux 64-bit Release WK2": {platform: Buildbot.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit2}
</del><ins>+ "Apple MountainLion Release (Build)": {platform: Dashboard.Platform.MacOSXMountainLion, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple MountainLion Release (32-bit Build)": {platform: Dashboard.Platform.MacOSXMountainLion, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
+ "Apple MountainLion Debug (Build)": {platform: Dashboard.Platform.MacOSXMountainLion, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple MountainLion Release WK1 (Tests)": {platform: Dashboard.Platform.MacOSXMountainLion, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+ "Apple MountainLion Debug WK1 (Tests)": {platform: Dashboard.Platform.MacOSXMountainLion, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+ "Apple MountainLion Release WK2 (Tests)": {platform: Dashboard.Platform.MacOSXMountainLion, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+ "Apple MountainLion Debug WK2 (Tests)": {platform: Dashboard.Platform.MacOSXMountainLion, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+ "Apple Mavericks Debug (Build)": {platform: Dashboard.Platform.MacOSXMavericks, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple Mavericks Release (Build)": {platform: Dashboard.Platform.MacOSXMavericks, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple Mavericks Debug WK1 (Tests)": {platform: Dashboard.Platform.MacOSXMavericks, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+ "Apple Mavericks Debug WK2 (Tests)": {platform: Dashboard.Platform.MacOSXMavericks, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+ "Apple Mavericks Release WK1 (Tests)": {platform: Dashboard.Platform.MacOSXMavericks, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+ "Apple Mavericks Release WK2 (Tests)": {platform: Dashboard.Platform.MacOSXMavericks, debug: false, 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},
+ "Apple Win 7 Release (Tests)": {platform: Dashboard.Platform.Windows7, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+ "GTK Linux 64-bit Release": {platform: Dashboard.Platform.LinuxGTK, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+ "GTK Linux 64-bit Release WK1 (Tests)": {platform: Dashboard.Platform.LinuxGTK, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+ "EFL Linux 32-bit Release (Build)": {platform: Dashboard.Platform.LinuxEFL, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
+ "EFL Linux 64-bit Release WK1": {platform: Dashboard.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+ "EFL Linux 64-bit Release WK2": {platform: Dashboard.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit2}
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Buildbot.call(this, "http://build.webkit.org/", queueInfo);
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesBuildbotBuilderQueueViewcss"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotBuilderQueueView.css (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotBuilderQueueView.css 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotBuilderQueueView.css 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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.
- */
-
</del></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesBuildbotQueueViewcss"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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.
- */
-
-.queue-view {
- width: 200px;
- min-height: 200px;
- padding: 10px 20px;
-}
-
-.queue-view .queueLabel {
- display: block;
- font-family: "HelveticaNeue-Light", "Helvetica Neue", sans-serif;
- color: rgb(145, 135, 95);
- text-align: left;
-}
-
-.queue-view .queueLabel:not(:first-child) {
- margin-top: 10px;
-}
</del></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesBuildbotTesterQueueViewcss"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotTesterQueueView.css (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotTesterQueueView.css 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotTesterQueueView.css 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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.
- */
-
</del></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesQueueViewcssfromrev161092trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardStylesBuildbotQueueViewcss"></a>
<div class="copfile"><h4>Copied: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css (from rev 161092, trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css) (0 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2013 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.
+ */
+
+.queue-view {
+ width: 200px;
+ min-height: 200px;
+ padding: 10px 20px;
+}
+
+.queue-view .queueLabel {
+ display: block;
+ font-family: "HelveticaNeue-Light", "Helvetica Neue", sans-serif;
+ color: rgb(145, 135, 95);
+ text-align: left;
+}
+
+.queue-view .queueLabel:not(:first-child) {
+ margin-top: 10px;
+}
</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 (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -25,24 +25,27 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>- <title>WebKit Buildbot Dashboard</title>
</del><ins>+ <title>WebKit Bot Watcher's Dashboard</title>
</ins><span class="cx">
</span><span class="cx"> <link rel="stylesheet" href="Styles/Main.css"></link>
</span><del>- <link rel="stylesheet" href="Styles/BuildbotQueueView.css"></link>
- <link rel="stylesheet" href="Styles/BuildbotBuilderQueueView.css"></link>
- <link rel="stylesheet" href="Styles/BuildbotTesterQueueView.css"></link>
</del><ins>+ <link rel="stylesheet" href="Styles/QueueView.css"></link>
</ins><span class="cx"> <link rel="stylesheet" href="Styles/StatusLineView.css"></link>
</span><span class="cx">
</span><span class="cx"> <script src="Scripts/Utilities.js"></script>
</span><span class="cx"> <script src="Scripts/BaseObject.js"></script>
</span><ins>+ <script src="Scripts/Dashboard.js"></script>
</ins><span class="cx"> <script src="Scripts/Buildbot.js"></script>
</span><ins>+ <script src="Scripts/EWS.js"></script>
</ins><span class="cx"> <script src="Scripts/WebKitBuildbot.js"></script>
</span><span class="cx"> <script src="Scripts/BuildbotQueue.js"></script>
</span><ins>+ <script src="Scripts/EWSQueue.js"></script>
</ins><span class="cx"> <script src="Scripts/BuildbotIteration.js"></script>
</span><span class="cx"> <script src="Scripts/BuildbotTestResults.js"></script>
</span><ins>+ <script src="Scripts/QueueView.js"></script>
</ins><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/EWSQueueView.js"></script>
</ins><span class="cx"> <script src="Scripts/StatusLineView.js"></script>
</span><span class="cx"> <script src="Scripts/Settings.js"></script>
</span><span class="cx"> <script src="Scripts/Trac.js"></script>
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161098 => 161099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-27 08:29:32 UTC (rev 161098)
+++ trunk/Tools/ChangeLog 2013-12-27 08:37:12 UTC (rev 161099)
</span><span class="lines">@@ -1,5 +1,52 @@
</span><span class="cx"> 2013-12-26 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Display EWS status on bot watcher's dashboard
+ https://bugs.webkit.org/show_bug.cgi?id=126224
+
+ Reviewed by Timothy Hatcher.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: Added.
+ Moved platform definitions out of Buildbot.js, as they are also needed for EWS.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js: Added.
+ (QueueView):
+ (QueueView.prototype.updateSoon):
+ (QueueView.prototype.update):
+ (QueueView.prototype._updateHiddenState):
+ Moved auto-update and hide logic to a base class, as it equally applies to EWS.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWS.js: Added.
+ This is a peer to Buildbot.js and WebKitBuildbot.js.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js: Added.
+ Quite simple for now, only keeping track of queue size.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Initialization.js:
+ Initialize EWS.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
+ Create EWS views.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ Updated for Buildbot.Platform rename, it's now Dashboard.Platform.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotBuilderQueueView.css: Removed.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css: Removed.
+ These were empty, no reason to waste the time loading them.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotTesterQueueView.css: Removed.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css: Copied from Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/BuildbotQueueView.css.
+ Renamed, as these styles apply to all queues, not just buildbot ones (and they have to, as columns should look alike).
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/index.html:
+ - Changed page title, as it no longer displays just buildbot status.
+ - Updated subresource lists for the new, renamed and removed files.
+
+2013-12-26 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> EWS status JSON should include Access-Control-Allow-Origin
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126246
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>