Executive HTML output: More varieties of grey fruit, fewer bananas

The use of yellow for `preparing' and `running' is particularly
inappropriate in the projection summary, but is also rather misleading
when showing cancelled flights.

Use shades of grey for the different levels of in-progress-ness.
Darker shades are `more running', which seems to align better with the
shades in `Scheduled' in the flight summary.

Yellow now definitely means something is `broken', or worse.

The two places where this needs to be changed are actually
meaningfully different: report_run_getinfo works on job statuses,
whereas sg-report-flight handles only steps, which have many fewer
statuses.

Here are some samples of the ouput, from the Citrix Cambridge
instance:

 http://xenbits.xen.org/people/iwj/2015/flights-summary-2.html
 http://xenbits.xen.org/people/iwj/2015/sg-report-flight/
 http://xenbits.xen.org/people/iwj/2015/sg-report-flight/test-amd64-amd64-xl-rtds/info.html

Despite using more different shades, the result is now both somewhat
less fruity looking and IMO easier to make sense of.

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

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index 01915acdf06edf9ad6e1bbb88117f54b4860ce0c..22140847d9c73f5c993ed29612853e8076e26ba8 100644 (file)
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -205,7 +205,9 @@ our $red=    '#ff8888';
 our $yellow= '#ffff00';
 our $purple= '#ff00ff';
 our $blue=   '#0000ff';
-our $grey=   '#888888';
+our $grey_pale= '#666666';
+our $grey_mid=  '#888888';
+our $grey_dark= '#cccccc';
 
 sub report_run_getinfo ($) {
     # $f is a joined flight/job row, must contain at least
@@ -258,7 +260,11 @@ END
     } elsif ($status eq 'blocked') {
         return $single->("blocked", $purple),
     } elsif ($status eq 'queued') {
-        return $single->("($status)", $grey),
+        return $single->("($status)", $grey_dark),
+    } elsif ($status eq 'preparing') {
+        return $single->("($status)", $grey_mid),
+    } elsif ($status eq 'running') {
+        return $single->("($status)", $grey_pale),
     } else {
         return $single->("($status)", $yellow);
     }

diff --git a/sg-report-flight b/sg-report-flight
index 3d0bf64de4791f7df6a084037dc542402c4e165f..bbe03fe5593f05105063bc0d2a67bf06cc0fbe85 100755 (executable)
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -1068,6 +1068,7 @@ sub html_status2_colour_priority ($) {
     my ($st) = @_;
     return ($st eq 'pass' ? ('#008800',100) :
             $st eq 'fail' ? ('#ff8888',200) :
+            $st eq 'running' ? ('#666666',250) :
             ('#ffff00',300));
 }