# HG changeset patch # User Shabe Razvi # Date 1254421941 -3600 # Node ID 6f2b69218788f3d638f1dd92eb5666115c210515 # Parent e103dd5a90d5a3230c1b13debfd99e2c9660a959# Parent c6145fb2403d2fccdee9ae889e93acfd3b8fa189 Merge diff -r e103dd5a90d5 -r 6f2b69218788 common/tools/brag/brag.xsl --- a/common/tools/brag/brag.xsl Thu Oct 01 19:31:32 2009 +0100 +++ b/common/tools/brag/brag.xsl Thu Oct 01 19:32:21 2009 +0100 @@ -1,24 +1,52 @@ + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fn="http://www.w3.org/2005/xpath-functions"> + + + + + + - - - Build Status -

Build Status

+

Build Status

+ + + + + + +

+ Overall BRAG staus: + + BLACK + RED + AMBER + GREEN + GOLD! + +

+ +

Breakdown by severity

+ + + + + + +
Critical
Major
Minor
Unknown
Grand total
+ +

Breakdown by stage/step

- + - + @@ -31,26 +59,18 @@
Stage: Stage:
Step: Step:
- - - - - -

Total number of critical errors =

-

Total number of major errors =

-

Total number of minor errors =

-

Total number of unknown errors =

- -

- Final BRAG staus: - - BLACK - RED - AMBER - GREEN - GOLD! - -

+ + +

Breakdown by package

+ + + + + + + +
PackageTotal failures
+
diff -r e103dd5a90d5 -r 6f2b69218788 common/tools/brag/raptorToBRAG.pl --- a/common/tools/brag/raptorToBRAG.pl Thu Oct 01 19:31:32 2009 +0100 +++ b/common/tools/brag/raptorToBRAG.pl Thu Oct 01 19:32:21 2009 +0100 @@ -63,6 +63,7 @@ next; } + # Populate the hash using a hash slice my $failure = {}; @{$failure}{@keys} = @values; @@ -96,6 +97,12 @@ # First item found in this step - create step entry $step = bless { name => $failure->{config}, Kids => [ $xmlNewline ] }, "step"; push @{$buildStage->{Kids}}, $step, $xmlNewline; + # Also create empty tags with severities in a sensible order + foreach my $severity (qw{critical major minor}) + { + my $failureSet = bless { level => $severity, Kids => [ $xmlNewline ] }, "failures"; + push @{$step->{Kids}}, $failureSet, $xmlNewline; + } } # Look through the sets of failures in this step to see if we hve one which matches this severity @@ -117,7 +124,15 @@ } # Now create the failure itself, and add it to this failure set - my $failureItem = bless { href => "", Kids => [ bless { Text => $failure->{subcategory} }, "Characters" ] }, "failure"; + my $failureItem = bless { +# href => "", + Kids => [ bless { Text => $failure->{subcategory} }, "Characters" ] + }, "failure"; + if ($failure->{component}) + { + $failure->{component} =~ s{^(/sf/.*?/.*?)/.*$}{$1}; + $failureItem->{package} = $failure->{component}; + } push @{$failureSet->{Kids}}, $failureItem, $xmlNewline; } close(CSV);