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
=== modified file 'reports/kernel-ci-data.html'
--- reports/kernel-ci-data.html 2011-09-07 18:28:22 +0000
+++ reports/kernel-ci-data.html 2011-09-13 04:03:26 +0000
@@ -11,8 +11,18 @@
11 var dataset = response.result;11 var dataset = response.result;
12 var html = "<table class='demo_jui display' id='kernel_ci_results'>";12 var html = "<table class='demo_jui display' id='kernel_ci_results'>";
13 html += "<thead><tr>";13 html += "<thead><tr>";
14 var build_test_run_index;
15 var boot_test_run_index;
14 $.each(dataset.columns, function (index, column) {16 $.each(dataset.columns, function (index, column) {
15 html += "<th>" + column.name + "</th>";17 if (column.name.indexOf("test run") >= 0) {
18 if (column.name.indexOf("Boot") >= 0) {
19 boot_test_run_index = index;
20 } else {
21 build_test_run_index = index;
22 }
23 } else {
24 html += "<th>" + column.name + "</th>";
25 }
16 });26 });
17 html += "</tr></thead><tbody>";27 html += "</tr></thead><tbody>";
18 $.each(dataset.rows, function (index, row) {28 $.each(dataset.rows, function (index, row) {
@@ -20,10 +30,14 @@
20 $.each(row, function (index, cell) {30 $.each(row, function (index, cell) {
21 var column = dataset.columns[index];31 var column = dataset.columns[index];
22 var cell_link = null;32 var cell_link = null;
23 if (column.name.indexOf("UUID") > 0) {33 if (column.name == "Build result") {
24 /* This is a bit hacky but will work for now */34 cell_html = cell;
25 cell_link = "{{ API_URL }}../permalink/test-run/" + cell + "/";35 cell_link = "{{ API_URL }}../permalink/test-run/" + row[build_test_run_index] + "/";
26 cell_html = "go to test run"36 } else if (column.name == "Boot result") {
37 cell_html = cell;
38 cell_link = "{{ API_URL }}../permalink/test-run/" + row[boot_test_run_index] + "/";
39 } else if (column.name.indexOf("test run") > 0) {
40 return;
27 } else {41 } else {
28 cell_html = cell;42 cell_html = cell;
29 }43 }
3044
=== modified file 'views/kernel-ci-data.xml'
--- views/kernel-ci-data.xml 2011-09-08 09:30:03 +0000
+++ views/kernel-ci-data.xml 2011-09-13 04:03:26 +0000
@@ -1,18 +1,15 @@
1<data-view name="CI Kernel Data">1<data-view name="CI Kernel Data">
2 <sql>2 <sql>
3 SELECT3 SELECT
4 BuildNamedAttribute_BuildID.value AS "Jenkins build ID (build)",4 BuildNamedAttribute_BuildID.value AS "Build ID",
5 BootNamedAttribute_BuildID.value AS "Jenkins build ID (boot)",5 BuildSoftwareSource.branch_url AS "Git URL",
6 BuildSoftwareSource.branch_url AS "Git URL (build)",6 BuildSoftwareSource.branch_revision AS "Git Commit ID",
7 BuildSoftwareSource.branch_revision AS "Git Commit ID (build)",7 BuildNamedAttribute_KernelConfig.value AS "Kernel Config",
8 BuildNamedAttribute_KernelConfig.value AS "Kernel Config (build)",8 (CASE WHEN BuildTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Build result",
9 BootNamedAttribute_GitURL.value AS "Git URL (boot)",
10 BootNamedAttribute_GitCommitID.value AS "Git Commit ID (boot)",
11 (CASE WHEN BootTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Boot result",9 (CASE WHEN BootTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Boot result",
12 (CASE WHEN BuildTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Build result",10 BuildTestRun.analyzer_assigned_uuid AS "Build test run",
13 BootNamedAttribute_TargetHostname.value AS "Boot target Hostname",11 BootTestRun.analyzer_assigned_uuid AS "Boot test run",
14 BootTestRun.analyzer_assigned_uuid AS "Boot test run UUID",12 BootNamedAttribute_TargetHostname.value AS "Boot target Hostname"
15 BuildTestRun.analyzer_assigned_uuid AS "Build test run UUID"
16 FROM13 FROM
17 dashboard_app_testresult AS BuildTestResult14 dashboard_app_testresult AS BuildTestResult
18 INNER JOIN dashboard_app_testrun AS BuildTestRun ON BuildTestResult.test_run_id = BuildTestRun.id15 INNER JOIN dashboard_app_testrun AS BuildTestRun ON BuildTestResult.test_run_id = BuildTestRun.id

Subscribers

People subscribed via source and target branches