Reporting: Make HTML reports for bisection flights too

Provide an appropriate --html-dir option to sg-report-flight.
(Bisection flights still do not run sg-report-host-history and
sg-report-job-history, which are fairly expensive.)

Make references to jobs from sg-report-job-history and
sg-report-host-history go to the /info.html page, not the webserver
directory listing.  (sg-report-flight's references already do.)

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/cri-bisect b/cri-bisect
index 03b2e29244142195641b730ff16188d27b271cac..2ce99455a6c24b9c814ef16a7ba5fc0ac2831fe3 100644 (file)
--- a/cri-bisect
+++ b/cri-bisect
@@ -110,7 +110,10 @@ END
         cat >&3 $reportfile
         if $flight_executed; then
                 echo >&3 ----------------------------------------
-                ./sg-report-flight >&3 $flight
+               if [ "x$OSSTEST_HTMLPUB_DIR" != x ]; then
+                       sgr_args+="$OSSTEST_HTMLPUB_DIR/$flight/"
+               fi
+                ./sg-report-flight $sgr_args >&3 $flight
                 ./cr-publish-flight-logs --push-harness $flight
         fi
         exec 3>&-

diff --git a/sg-report-host-history b/sg-report-host-history
index f33fafaf0ec2b78ad90018fa20265a1cf3a80521..8e0e2aa6472c7729954ca97f7a121eaf8ad14fc0 100755 (executable)
--- a/sg-report-host-history
+++ b/sg-report-host-history
@@ -238,7 +238,7 @@ END
        my $url= "$c{ReportHtmlPubBaseUrl}/$jr->{flight}";
        print H "<td><a href=\"$url\">$jr->{flight}</a></td>\n";
        $url= "$c{ReportHtmlPubBaseUrl}/$jr->{flight}/".
-           encode_entities($jr->{job})."/";
+           encode_entities($jr->{job})."/info.html";
        print H "<td>$ir->{branch}</td>";
        print H "<td>$ir->{intended}</td>";
        print H "<td>";

diff --git a/sg-report-job-history b/sg-report-job-history
index 031bd4aaa67586bba39a784971db07502b6de8d2..e20c376c361100e4e4b9a8f7e676a71267d5f696 100755 (executable)
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -244,7 +244,8 @@ END
             $url= "$c{ReportHtmlPubBaseUrl}/$flt";
             print H "<td><a href=\"$url\">$flt</a></td>\n";
             print H "<td>".encode_entities($r->{Flight}{branch})."</td>\n";
-            $url= "$c{ReportHtmlPubBaseUrl}/$flt/".encode_entities($j)."/";
+            $url= "$c{ReportHtmlPubBaseUrl}/$flt/".encode_entities($j).
+               "/info.html";
             print H "<td $r->{ColourAttr}><a href=\"$url\">".
                 $r->{Content}."</a></td>\n";
             my $lastrev;