Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js (174114 => 174115)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js 2014-09-30 19:48:09 UTC (rev 174115)
@@ -105,7 +105,7 @@
latestMessage: patch.latest_message,
latestMessageTime: patch.latest_message_time ? new Date(patch.latest_message_time) : null,
detailedResultsURLForLatestMessage: patch.latest_results,
- messageCount: patch.message_count,
+ retryCount: patch.retry_count,
active: patch.active,
activeSince: new Date(activeSinceTime),
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js (174114 => 174115)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js 2014-09-30 19:48:09 UTC (rev 174115)
@@ -154,8 +154,8 @@
this.addLinkToRow(rowElement, "patch-details-link", patch.attachmentID, patch.statusPageURL);
- if (patch.messageCount)
- this.addTextToRow(rowElement, "failure-count", patch.messageCount + "\xa0" + (patch.messageCount === 1 ? "attempt" : "attempts"));
+ if (patch.retryCount)
+ this.addTextToRow(rowElement, "failure-count", patch.retryCount + "\xa0" + (patch.retryCount === 1 ? "attempt" : "attempts"));
if (patch.detailedResultsURLForLatestMessage)
this.addLinkToRow(rowElement, "latest-status-with-link", patch.latestMessage, patch.detailedResultsURLForLatestMessage);
Modified: trunk/Tools/ChangeLog (174114 => 174115)
--- trunk/Tools/ChangeLog 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/ChangeLog 2014-09-30 19:48:09 UTC (rev 174115)
@@ -1,5 +1,23 @@
2014-09-30 Alexey Proskuryakov <[email protected]>
+ build.webkit.org/dashboard: Switch EWS view to using actual retry count
+ https://bugs.webkit.org/show_bug.cgi?id=137240
+
+ Reviewed by Ryosuke Niwa.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js:
+ (EWSQueue.prototype.loadDetailedStatus):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js:
+ (EWSQueueView.prototype._popoverContentForEWSQueue):
+ Use the new retry_count data member from JSON.
+
+ * QueueStatusServer/app.yaml: Updating the version.
+
+ * QueueStatusServer/handlers/queuestatusjson.py: (QueueStatusJSON._rows_for_work_items):
+ Instead of message_count, produce retry_count.
+
+2014-09-30 Alexey Proskuryakov <[email protected]>
+
EWS doesn't need to show all the bubbles when a patch fails to apply
https://bugs.webkit.org/show_bug.cgi?id=137256
Modified: trunk/Tools/QueueStatusServer/app.yaml (174114 => 174115)
--- trunk/Tools/QueueStatusServer/app.yaml 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/QueueStatusServer/app.yaml 2014-09-30 19:48:09 UTC (rev 174115)
@@ -1,5 +1,5 @@
application: webkit-queues
-version: 174114 # Bugzilla bug ID of last major change
+version: 174115 # Bugzilla bug ID of last major change
runtime: python
api_version: 1
Modified: trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py (174114 => 174115)
--- trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py 2014-09-30 19:48:09 UTC (rev 174115)
@@ -26,6 +26,7 @@
from google.appengine.ext import webapp
from google.appengine.ext.webapp import template
+from model.patchlog import PatchLog
from model.queues import Queue
from model.queuestatus import QueueStatus
@@ -57,17 +58,22 @@
bug_id = statuses[0].active_bug_id
results_url = self.request.host_url + "/results/" + str(statuses[0].key().id()) if statuses[0].results_file else None
- rows.append({
+ row = {
"attachment_id": item_id,
"bug_id": bug_id,
"active": active_items and active_items.time_for_item(item_id) != None,
"active_since": active_items and active_items.time_for_item(item_id),
"latest_message": message,
"latest_message_time": message_time,
- "message_count": patchStatusQuery.count(),
"status_page": self.request.host_url + "/patch/" + str(item_id),
"latest_results": results_url,
- })
+ }
+
+ patch_log = PatchLog.lookup_if_exists(item_id, queue.name())
+ if patch_log and patch_log.retry_count:
+ row["retry_count"] = patch_log.retry_count
+
+ rows.append(row)
return rows
def _bots(self, queue):
Modified: trunk/Tools/QueueStatusServer/templates/statusbubble.html (174114 => 174115)
--- trunk/Tools/QueueStatusServer/templates/statusbubble.html 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/QueueStatusServer/templates/statusbubble.html 2014-09-30 19:48:09 UTC (rev 174115)
@@ -36,7 +36,7 @@
background-color: #E98080;
}
.started {
- background-color: #D8FFFA;
+ background-color: #E1F5FF;
}
.provisional-fail {
background-color: #FFAF05;
