Skip to content

Commit 554de60

Browse files
committed
ui: status: split HW and non-HW results
We used to display HW and non-HW results in one contest table because the assumption was that it'd make it easier to see the results vs patch propagation (patches get included in the net-next-hw stream after a pass in net-next). In practice over the last year I never looked at the results from this perspective and the HW results are increasingly noisy. So split the tables. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent fe8f214 commit 554de60

2 files changed

Lines changed: 52 additions & 24 deletions

File tree

ui/status.html

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,8 @@ <h3>Continuous testing results</h3>
8484
Hide all-pass runs
8585
</label>
8686
</div>
87-
<table id="contest">
88-
<tr>
89-
<th>Branch</th>
90-
<th>Remote</th>
91-
<th>Time</th>
92-
<th>Tests</th>
93-
<th>Result</th>
94-
</tr>
95-
</table>
87+
<div id="contest-tables">
88+
</div>
9689
<br>
9790
<h3>Recent failures</h3>
9891
<table id="recent-fails">
@@ -147,16 +140,9 @@ <h4>Ignored tests:</h4>
147140
</div>
148141
</div>
149142
<div class="column">
150-
<table id="contest-purgatory">
143+
<div id="contest-purgatory-tables">
151144
<h3>Not reporting to patchwork:</h3>
152-
<tr>
153-
<th>Branch</th>
154-
<th>Remote</th>
155-
<th>Time</th>
156-
<th>Tests</th>
157-
<th>Result</th>
158-
</tr>
159-
</table>
145+
</div>
160146
</div>
161147
</div>
162148
</body>

ui/status.js

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,26 @@ function reset_summary(summary, branch)
617617
summary["hidden"] = 0;
618618
}
619619

620+
function contest_create_table(stream_name, container)
621+
{
622+
var h4 = document.createElement("h4");
623+
h4.innerText = stream_name;
624+
container.appendChild(h4);
625+
626+
var table = document.createElement("table");
627+
container.appendChild(table);
628+
629+
var hdr = table.insertRow();
630+
var headers = ["Branch", "Remote", "Time", "Tests", "Result"];
631+
$.each(headers, function(i, name) {
632+
var th = document.createElement("th");
633+
th.innerText = name;
634+
hdr.appendChild(th);
635+
});
636+
637+
return table;
638+
}
639+
620640
function load_result_table_one(data_raw, table, reported, avgs)
621641
{
622642
const summarize = document.getElementById("contest-summary").checked;
@@ -774,8 +794,6 @@ var awol_executors;
774794

775795
function load_result_table(data_raw, reload)
776796
{
777-
var table = document.getElementById("contest");
778-
var table_nr = document.getElementById("contest-purgatory");
779797
var branch_pull_status = {};
780798
var branch_start = {};
781799

@@ -910,10 +928,34 @@ function load_result_table(data_raw, reload)
910928
return 0;
911929
});
912930

913-
$("#contest tr").slice(1).remove();
914-
$("#contest-purgatory tr").slice(1).remove();
915-
load_result_table_one(data_raw, table, true, avgs);
916-
load_result_table_one(data_raw, table_nr, false, avgs);
931+
// Collect unique stream prefixes in alphabetical order
932+
var stream_set = new Set();
933+
$.each(data_raw, function(i, v) {
934+
stream_set.add(v.br_pfx);
935+
});
936+
var stream_order = Array.from(stream_set).sort();
937+
938+
var contest_div = document.getElementById("contest-tables");
939+
var purgatory_div = document.getElementById("contest-purgatory-tables");
940+
941+
// Delete the previously loaded tables
942+
contest_div.innerHTML = "";
943+
purgatory_div.innerHTML = "<h3>Not reporting to patchwork:</h3>";
944+
945+
$.each(stream_order, function(i, pfx) {
946+
var stream_data = [];
947+
$.each(data_raw, function(i, v) {
948+
if (v.br_pfx == pfx)
949+
stream_data.push(v);
950+
});
951+
952+
var table = contest_create_table(pfx, contest_div);
953+
load_result_table_one(stream_data, table, true, avgs);
954+
955+
var table_nr = contest_create_table(pfx, purgatory_div);
956+
load_result_table_one(stream_data, table_nr, false, avgs);
957+
});
958+
917959
if (!reload) {
918960
load_fails(data_raw);
919961
load_partial_tests(data_raw);

0 commit comments

Comments
 (0)