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

[Michael Hudson-Doyle]

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

[Paul Larson (pwlars)]

+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

=== 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 @@
         var dataset = response.result;
         var html = "<table class='demo_jui display' id='kernel_ci_results'>";
         html += "<thead><tr>";
+        var build_test_run_index;
+        var boot_test_run_index;
         $.each(dataset.columns, function (index, column) {
-          html += "<th>" + column.name + "</th>";
+          if (column.name.indexOf("test run") >= 0) {
+            if (column.name.indexOf("Boot") >= 0) {
+              boot_test_run_index = index;
+            } else {
+              build_test_run_index = index;
+            }
+          } else {
+            html += "<th>" + column.name + "</th>";
+          }
         });
         html += "</tr></thead><tbody>";
         $.each(dataset.rows, function (index, row) {
@@ -20,10 +30,14 @@
           $.each(row, function (index, cell) {
             var column = dataset.columns[index];
             var cell_link = null;
-            if (column.name.indexOf("UUID") > 0) {
-              /* This is a bit hacky but will work for now */
-              cell_link = "{{ API_URL }}../permalink/test-run/" + cell + "/";
-              cell_html = "go to test run"
+            if (column.name == "Build result") {
+              cell_html = cell;
+              cell_link = "{{ API_URL }}../permalink/test-run/" + row[build_test_run_index] + "/";
+            } else if (column.name == "Boot result") {
+              cell_html = cell;
+              cell_link = "{{ API_URL }}../permalink/test-run/" + row[boot_test_run_index] + "/";
+            } else if (column.name.indexOf("test run") > 0) {
+              return;
             } else {
               cell_html = cell;
             }

=== 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 @@
 <data-view name="CI Kernel Data">
     <sql>
        SELECT
-            BuildNamedAttribute_BuildID.value AS "Jenkins build ID (build)",
-            BootNamedAttribute_BuildID.value AS "Jenkins build ID (boot)",
-            BuildSoftwareSource.branch_url AS "Git URL (build)",
-            BuildSoftwareSource.branch_revision AS "Git Commit ID (build)",
-            BuildNamedAttribute_KernelConfig.value AS "Kernel Config (build)",
-            BootNamedAttribute_GitURL.value AS "Git URL (boot)", 
-            BootNamedAttribute_GitCommitID.value AS "Git Commit ID (boot)",
+            BuildNamedAttribute_BuildID.value AS "Build ID",
+            BuildSoftwareSource.branch_url AS "Git URL",
+            BuildSoftwareSource.branch_revision AS "Git Commit ID",
+            BuildNamedAttribute_KernelConfig.value AS "Kernel Config",
+            (CASE WHEN BuildTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Build result",
             (CASE WHEN BootTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Boot result",
-            (CASE WHEN BuildTestResult.result=0 THEN 'pass' ELSE 'fail' END) AS "Build result",
-            BootNamedAttribute_TargetHostname.value AS "Boot target Hostname",
-            BootTestRun.analyzer_assigned_uuid AS "Boot test run UUID",
-            BuildTestRun.analyzer_assigned_uuid AS "Build test run UUID"
+            BuildTestRun.analyzer_assigned_uuid AS "Build test run",
+            BootTestRun.analyzer_assigned_uuid AS "Boot test run",
+            BootNamedAttribute_TargetHostname.value AS "Boot target Hostname"
         FROM
             dashboard_app_testresult AS BuildTestResult
             INNER JOIN dashboard_app_testrun AS BuildTestRun ON BuildTestResult.test_run_id = BuildTestRun.id