Merge lp:~mwhudson/lava-dashboard/data-views-and-reports-better-kernel-ci into lp:~linaro-validation/lava-dashboard/data-views-and-reports

Proposed by Michael Hudson-Doyle on 2011-09-13
Status: Merged
Merged at revision: 30
Proposed branch: lp:~mwhudson/lava-dashboard/data-views-and-reports-better-kernel-ci
Merge into: lp:~linaro-validation/lava-dashboard/data-views-and-reports
Diff against target: 73 lines (+27/-16)
2 files modified
reports/kernel-ci-data.html (+19/-5)
views/kernel-ci-data.xml (+8/-11)
To merge this branch: bzr merge lp:~mwhudson/lava-dashboard/data-views-and-reports-better-kernel-ci
Reviewer Review Type Date Requested Status
Paul Larson (community) 2011-09-13 Approve on 2011-09-13
Review via email: mp+75108@code.launchpad.net

Description of the change

Hi,

This branch doesn't change anything fundamental, but I think it makes the kernel ci view a bit more usable by making it fit into a window that's not a mile wide. It trims duplicate data returned from the view and links to the test results from the pass/fail cells. Possibly the duplicate data should be returned and checked by the js, but that's not what I did...

It looks like this now: http://people.linaro.org/~mwh/kernel-ci-changes.png

Cheers,
mwh

To post a comment you must log in.
Paul Larson (pwlars) wrote :

+1 Certainly an improvement over what we have there now. Would be nice to incorporate a date somehow, but I'm happy to even see this merged as-is.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'reports/kernel-ci-data.html'
2--- reports/kernel-ci-data.html 2011-09-07 18:28:22 +0000
3+++ reports/kernel-ci-data.html 2011-09-13 04:03:26 +0000
4@@ -11,8 +11,18 @@
5 var dataset = response.result;
6 var html = "<table class='demo_jui display' id='kernel_ci_results'>";
7 html += "<thead><tr>";
8+ var build_test_run_index;
9+ var boot_test_run_index;
10 $.each(dataset.columns, function (index, column) {
11- html += "<th>" + column.name + "</th>";
12+ if (column.name.indexOf("test run") >= 0) {
13+ if (column.name.indexOf("Boot") >= 0) {
14+ boot_test_run_index = index;
15+ } else {
16+ build_test_run_index = index;
17+ }
18+ } else {
19+ html += "<th>" + column.name + "</th>";
20+ }
21 });
22 html += "</tr></thead><tbody>";
23 $.each(dataset.rows, function (index, row) {
24@@ -20,10 +30,14 @@
25 $.each(row, function (index, cell) {
26 var column = dataset.columns[index];
27 var cell_link = null;
28- if (column.name.indexOf("UUID") > 0) {
29- /* This is a bit hacky but will work for now */
30- cell_link = "{{ API_URL }}../permalink/test-run/" + cell + "/";
31- cell_html = "go to test run"
32+ if (column.name == "Build result") {
33+ cell_html = cell;
34+ cell_link = "{{ API_URL }}../permalink/test-run/" + row[build_test_run_index] + "/";
35+ } else if (column.name == "Boot result") {
36+ cell_html = cell;
37+ cell_link = "{{ API_URL }}../permalink/test-run/" + row[boot_test_run_index] + "/";
38+ } else if (column.name.indexOf("test run") > 0) {
39+ return;
40 } else {
41 cell_html = cell;
42 }
43
44=== modified file 'views/kernel-ci-data.xml'
45--- views/kernel-ci-data.xml 2011-09-08 09:30:03 +0000
46+++ views/kernel-ci-data.xml 2011-09-13 04:03:26 +0000
47@@ -1,18 +1,15 @@
48 <data-view name="CI Kernel Data">
49 <sql>
50 SELECT
51- BuildNamedAttribute_BuildID.value AS "Jenkins build ID (build)",
52- BootNamedAttribute_BuildID.value AS "Jenkins build ID (boot)",
53- BuildSoftwareSource.branch_url AS "Git URL (build)",
54- BuildSoftwareSource.branch_revision AS "Git Commit ID (build)",
55- BuildNamedAttribute_KernelConfig.value AS "Kernel Config (build)",
56- BootNamedAttribute_GitURL.value AS "Git URL (boot)",
57- BootNamedAttribute_GitCommitID.value AS "Git Commit ID (boot)",
58+ BuildNamedAttribute_BuildID.value AS "Build ID",
59+ BuildSoftwareSource.branch_url AS "Git URL",
60+ BuildSoftwareSource.branch_revision AS "Git Commit ID",
61+ BuildNamedAttribute_KernelConfig.value AS "Kernel Config",
62+ (CASE WHEN BuildTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Build result",
63 (CASE WHEN BootTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Boot result",
64- (CASE WHEN BuildTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Build result",
65- BootNamedAttribute_TargetHostname.value AS "Boot target Hostname",
66- BootTestRun.analyzer_assigned_uuid AS "Boot test run UUID",
67- BuildTestRun.analyzer_assigned_uuid AS "Build test run UUID"
68+ BuildTestRun.analyzer_assigned_uuid AS "Build test run",
69+ BootTestRun.analyzer_assigned_uuid AS "Boot test run",
70+ BootNamedAttribute_TargetHostname.value AS "Boot target Hostname"
71 FROM
72 dashboard_app_testresult AS BuildTestResult
73 INNER JOIN dashboard_app_testrun AS BuildTestRun ON BuildTestResult.test_run_id = BuildTestRun.id

Subscribers

People subscribed via source and target branches