<!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>[242827] 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/242827">242827</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2019-03-12 13:58:12 -0700 (Tue, 12 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ews-build] Show status bubbles while the patch is waiting in queue
https://bugs.webkit.org/show_bug.cgi?id=195618

Reviewed by Lucas Forschler.

* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble): Added ALL_QUEUES and ENABLED_QUEUES. Only certain queues are 
enabled in initial deployment.
(StatusBubble._build_bubble): Display bubble even when build hasn't started.
(StatusBubble.get_latest_build_for_queue): Get latest build for a given queue.
(StatusBubble.get_builds_for_queue): Get all builds for a given queue.
(StatusBubble._should_show_bubble_for): Display bubble for only ENABLED_QUEUES for now.
(StatusBubble._build_bubbles_for_patch):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportewsappewsviewsstatusbubblepy">trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportewsappewsviewsstatusbubblepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (242826 => 242827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py  2019-03-12 20:57:43 UTC (rev 242826)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py     2019-03-12 20:58:12 UTC (rev 242827)
</span><span class="lines">@@ -31,15 +31,24 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class StatusBubble(View):
</span><del>-    def _build_bubble(self, build, patch):
-        builder_display_name = build.builder_display_name
-        builder_full_name = build.builder_name
</del><ins>+    # These queue names are from shortname in https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/config.json
+    # FIXME: Auto-generate this list https://bugs.webkit.org/show_bug.cgi?id=195640
+    ALL_QUEUES = ['api-ios', 'api-mac', 'bindings', 'gtk', 'ios', 'ios-sim', 'ios-wk2', 'jsc', 'mac', 'mac-32bit', 'mac-32bit-wk2',
+                    'mac-debug', 'mac-debug-wk1', 'mac-wk1', 'mac-wk2', 'style', 'webkitperl', 'webkitpy', 'win', 'wincairo', 'wpe']
+    ENABLED_QUEUES = ['api-ios', 'api-mac']
</ins><span class="cx"> 
</span><ins>+    def _build_bubble(self, patch, queue):
</ins><span class="cx">         bubble = {
</span><del>-            "name": builder_display_name,
-            "url": 'https://{}/#/builders/{}/builds/{}'.format(config.BUILDBOT_SERVER_HOST, build.builder_id, build.number),
</del><ins>+            "name": queue,
</ins><span class="cx">         }
</span><ins>+        build = self.get_latest_build_for_queue(patch, queue)
+        if not build:
+            bubble["state"] = "none"
+            bubble["details_message"] = 'Waiting in queue, processing has not started yet.'
+            return bubble
</ins><span class="cx"> 
</span><ins>+        bubble["url"] = 'https://{}/#/builders/{}/builds/{}'.format(config.BUILDBOT_SERVER_HOST, build.builder_id, build.number)
+        builder_full_name = build.builder_name
</ins><span class="cx">         bubble["details_message"] = '{}\n{}'.format(builder_full_name, build.state_string)
</span><span class="cx">         if build.result is None:
</span><span class="cx">             bubble["state"] = "started"
</span><span class="lines">@@ -60,9 +69,19 @@
</span><span class="cx"> 
</span><span class="cx">         return bubble
</span><span class="cx"> 
</span><del>-    def _should_show_bubble_for(self, patch, build):
</del><ins>+    def get_latest_build_for_queue(self, patch, queue):
+        builds = self.get_builds_for_queue(patch, queue)
+        if not builds:
+            return None
+        builds.sort(key=lambda build: build.started_at, reverse=True)
+        return builds[0]
+
+    def get_builds_for_queue(self, patch, queue):
+        return [build for build in patch.build_set.all() if build.builder_display_name == queue]
+
+    def _should_show_bubble_for(self, patch, queue):
</ins><span class="cx">         # TODO: https://bugs.webkit.org/show_bug.cgi?id=194597
</span><del>-        return True
</del><ins>+        return queue in StatusBubble.ENABLED_QUEUES
</ins><span class="cx"> 
</span><span class="cx">     def _build_bubbles_for_patch(self, patch):
</span><span class="cx">         show_submit_to_ews = True
</span><span class="lines">@@ -69,15 +88,16 @@
</span><span class="cx">         failed_to_apply = False  # TODO: https://bugs.webkit.org/show_bug.cgi?id=194598
</span><span class="cx">         bubbles = []
</span><span class="cx"> 
</span><del>-        if not patch:
</del><ins>+        if not (patch and patch.sent_to_buildbot):
</ins><span class="cx">             return (None, show_submit_to_ews, failed_to_apply)
</span><span class="cx"> 
</span><del>-        for build in patch.build_set.all():
-            show_submit_to_ews = False
-            if not self._should_show_bubble_for(patch, build):
</del><ins>+        for queue in StatusBubble.ALL_QUEUES:
+            if not self._should_show_bubble_for(patch, queue):
</ins><span class="cx">                 continue
</span><del>-            bubble = self._build_bubble(build, patch)
</del><ins>+
+            bubble = self._build_bubble(patch, queue)
</ins><span class="cx">             if bubble:
</span><ins>+                show_submit_to_ews = False
</ins><span class="cx">                 bubbles.append(bubble)
</span><span class="cx"> 
</span><span class="cx">         return (bubbles, show_submit_to_ews, failed_to_apply)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (242826 => 242827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-03-12 20:57:43 UTC (rev 242826)
+++ trunk/Tools/ChangeLog       2019-03-12 20:58:12 UTC (rev 242827)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-03-12  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Show status bubbles while the patch is waiting in queue
+        https://bugs.webkit.org/show_bug.cgi?id=195618
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+        (StatusBubble): Added ALL_QUEUES and ENABLED_QUEUES. Only certain queues are 
+        enabled in initial deployment.
+        (StatusBubble._build_bubble): Display bubble even when build hasn't started.
+        (StatusBubble.get_latest_build_for_queue): Get latest build for a given queue.
+        (StatusBubble.get_builds_for_queue): Get all builds for a given queue.
+        (StatusBubble._should_show_bubble_for): Display bubble for only ENABLED_QUEUES for now.
+        (StatusBubble._build_bubbles_for_patch):
+
</ins><span class="cx"> 2019-03-12  Robin Morisset  <rmorisset@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Alter Tools/Scripts/dump-class-layout to be able to dump all classes with suspicious padding
</span></span></pre>
</div>
</div>

</body>
</html>