From: František Dvořák Date: Fri, 9 Mar 2012 19:08:12 +0000 (+0100) Subject: New version of dashboard (fancy stuff). X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=7aad814e6546a0d459c4ece6dd213b8cc4698a94;p=meta-dashboard.git New version of dashboard (fancy stuff). --- diff --git a/dashboard.pl b/dashboard.pl index e567078..0b2f688 100755 --- a/dashboard.pl +++ b/dashboard.pl @@ -117,9 +117,11 @@ foreach my $s (keys %list) { if ($section == 0 && ($yaim_used != 0 || $yaim_finished == 0)) { $result=`grep -- '-TEST FAILED-' $item->{dir}/report.twiki 2>/dev/null| wc -l | sed 's/ *//g'`; chomp $result; + if ( "$result" == "1" ) { $result="$result error"; } + else { $result="$result errors"; } } else { - if ($section == 0) { $result = 'Error'; } - else { $result = 'Failed'; } + if ($section == 0) { $result = 'Error'; } + else { $result = 'Failed'; } } } else { undef $result; } $item->{result} = defined $result ? $result : '-'; @@ -166,6 +168,11 @@ foreach my $c (sort keys %components) { # ==== matrix ==== +my %fancy = ("lb", "L&B", + "px", "PX", + "gridsite", "GridSite", + "canl-c", "caNl-c", + "canl", "caNl"); $n_platforms = 0; for my $i (keys %platforms) { $n_platforms++; } $width = " width:".(100/(1+$n_platforms))."%;"; @@ -176,20 +183,29 @@ print qq( - Reports by platform table + Continuous Test Dashboard @@ -200,12 +216,8 @@ print qq( - - + +
); -foreach my $c (sort keys %components) { - print "report-$c.twiki "; -} -print qq(Modified: $nowContinuous Test DashboardMetaCentrum
@@ -215,49 +227,61 @@ print qq( ); -if (exists $list{install}) { - print "

Install

\n"; - table($list{install}); - print "\n"; - if (-f 'install.html.in') { - system 'cat install.html.in'; - } -} +{ + my $class; + my ($classi, $classu); -if (exists $list{upgrade}) { - print "

Upgrade

\n"; - table($list{upgrade}); - print "\n"; - if (-f 'upgrade.html.in') { - system 'cat upgrade.html.in'; - } -} -if (exists $list{build}) { - print "

Local build

\n"; - table($list{build}); - print "\n"; - if (-f 'build.html.in') { - system 'cat build.html.in'; + print qq( + + +); + foreach my $c (sort keys %components) { + print " \n"; } -} - -if (exists $list{perf}) { - my @keys = keys %{$list{perf}}; - my %keys; - map { $keys{$_} = 1; } @keys; + print " \n"; + print " \n"; + foreach my $c (sort keys %components) { + print " \n"; + print " \n"; + } + print " \n"; + foreach my $p (sort keys %platforms) { + print " \n \n"; + foreach my $c (sort keys %components) { + $item = $list{install}{$c}{$p}; + if (defined $item) { + $result = $item->{result}; + if ($item->{result} eq '0') { $class='OK'; } + else { $class='FAIL'; } + print " \n"; + } else { + print " \n" + } - print "

L&B performance tests

\n"; - table2(1, $list{perf}, \%keys); - print "\n"; - if (-f 'perf.html.in') { - system 'cat perf.html.in'; + $item = $list{upgrade}{$c}{$p}; + if (defined $item) { + $result = $item->{result}; + if ($item->{result} eq '0') { $class='OK'; } + else { $class='FAIL'; } + print " \n"; + } else { + print " \n" + } + } + print " \n"; } + print "
$fancy{$c}
PlatformInstallUpgrade
$p$item->{date}
{dir}/\">$result		$item->{date}
{dir}/\">$result
\n\n"; } print qq{ + + + + +
Last Modified: $now