]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
sg-report-job-history: Show osstest version too
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 1 Jul 2015 10:36:06 +0000 (11:36 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 1 Jul 2015 12:38:39 +0000 (13:38 +0100)
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
sg-report-job-history

index 95ae4092b317cb02f1feefc11ad16fc22728afde..031bd4aaa67586bba39a784971db07502b6de8d2 100755 (executable)
@@ -199,6 +199,12 @@ END
         push @test_rows, $ri;
     }
 
+    my $osstestverq= db_prepare(<<END);
+        SELECT DISTINCT harness
+          FROM flights_harness_touched
+         WHERE flight=?
+END
+
     if (defined $htmlout) {
         my ($title,$html_file,$url);
        ensuredir "$htmlout/history";
@@ -219,6 +225,7 @@ END
         print H "<tr><th>started</th><th>flight</th>",
                "<th>branch</th><th>failure</th>\n";
         print H "<th>", (join ", ", @hostvarcols), "</th>\n";
+        print H "<th>osstest</th>";
         foreach my $c (@rev_grid_cols) {
             print H "<th>".encode_entities($c)."</th>\n";
         }
@@ -243,6 +250,17 @@ END
             my $lastrev;
             my $hosts = join ", ", map { $_ // "-" } @{ $r->{Hosts} };
             print H "<td>".encode_entities($hosts)."</td>\n";
+            $osstestverq->execute($r->{Flight}{flight});
+            print H
+                "<td>",
+                (join ' ',
+                 map {
+                    $_ = $_->{harness};
+                    s/^([0-9a-f]{12})[0-9a-f]+\b/$1/;
+                    "<kbd>".encode_entities($_)."</kbd>";
+                 }
+                 @{ $osstestverq->fetchall_arrayref({}) }),
+                "</td>\n";
             foreach my $i (0..$#rev_grid_cols) {
                 my $v= $r->{Revisions}[$i];
                 my $same=