From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 10 Aug 2012 11:11:52 +0000 (+0200)
Subject: Support minor and major upgrades.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3ba06b99c5c55a50aab4c4e6a69fd13e732ef9eb;p=meta-dashboard.git

Support minor and major upgrades.
---

diff --git a/dashboard.pl b/dashboard.pl
index 5903166..6b19c1a 100755
--- a/dashboard.pl
+++ b/dashboard.pl
@@ -32,8 +32,10 @@ foreach my $i (0..$#list) {
 		close FH;
 		chomp;
 		if (/perf/i) { $scen = $_; }
-		elsif (/upgrade/i) { $scen = 'upgrade'; }
-		elsif (/build/i) { $scen = 'build'; }
+                elsif (/^upgrade/i or /major upgrade/i) { $scen = 'distupgrade'; }
+                elsif (/^minor upgrade/i) { $scen = 'upgrade'; }
+                elsif (/build/i) { $scen = 'build'; }
+
 	}
 	
 	$plat = "$item[1]-$item[2]";
@@ -150,7 +152,9 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
 		.scen {font-size:small; font-style:italic; background-color: #eeeeee; }
 		.prod {font-family:sans-serif; font-size:large; font-weight:bold; background-color: #eeeeee}
 		.OK {border:1px solid black; text-align:center;background-color: #90f3a5;}
+		.DistOK {border:1px solid black; text-align:center;background-color: #a4f584;}
 		.FAIL {border:1px solid black; text-align:center;background-color: #ff4c4c;}
+		.DistFAIL {border:1px solid black; text-align:center;background-color: #fd6f3c;}
 		.NA {border:1px solid black; text-align:center;background-color: #ffffff;}
 		.date {font-size:xx-small; color: #404040;}
 		.platf{font-family:sans-serif; font-size:smaller; border:1px solid black; text-align:center;background-color: #eeeeee;}
@@ -185,6 +189,7 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
 
 {
 	my $class;
+	my $pout;
 	my ($classi, $classu);
 
 
@@ -193,7 +198,7 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
 		<th class="prod"></th>
 );
 	foreach my $c (sort keys %components) {
-		print "		<th class=\"prod\" colspan=\"2\">$fancy{$c}</th>\n";
+		print "		<th class=\"prod\" colspan=\"3\">$fancy{$c}</th>\n";
 	}
 	print "	</tr>\n";
 	print "	<tr>\n";
@@ -201,10 +206,13 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
 	foreach my $c (sort keys %components) {
 		print "		<th class=\"scen\">Install</th>\n";
 		print "		<th class=\"scen\">Upgrade</th>\n";
+		print "		<th class=\"scen\">Dist<BR>Upgrade</th>\n";
 	}
 	print "	</tr>\n";
 	foreach my $p (sort keys %platforms) {
-		print "	<tr class=\"platf\">\n		<th class=\"cert\">$p</th>\n";
+		$pout=$p;
+		$pout =~ s/-/<BR>/;
+		print "	<tr class=\"platf\">\n		<th class=\"cert\">$pout</th>\n";
 		foreach my $c (sort keys %components) {
 			$item = $list{install}{$c}{$p};
 			if (defined $item) {
@@ -239,6 +247,23 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
 			} else {
 				print "		<td class=\"NA\"><span class=\"date\">&nbsp;</span><br/>&nbsp;</td>\n"
 			}
+
+			$item = $list{distupgrade}{$c}{$p};
+			if (defined $item) {
+				if ($item->{result} eq '0') {
+					$class='DistOK';
+					$result="<b>OK</b>"; }
+				else {
+					$class='DistFAIL';
+					if ( $item->{result} eq '1' ) { $result="<b>$item->{result} error</b>"; }
+					elsif ($item->{result} =~ /^[0-9]+$/) { $result="<b>$item->{result}&nbsp;tests failed</b>"; }
+					else { $result = "<b>$item->{result}</b>"; }
+				}
+
+				print "		<td class=\"$class\"><span class=\"date\">$item->{date}</span><br/><a href=\"$item->{dir}/\">$result</a></td>\n";
+			} else {
+				print "		<td class=\"NA\"><span class=\"date\">&nbsp;</span><br/>&nbsp;</td>\n"
+			}
 		}
 		print "	</tr>\n";
 	}
diff --git a/matrixgen.pl b/matrixgen.pl
index 04e7918..0b6bf10 100755
--- a/matrixgen.pl
+++ b/matrixgen.pl
@@ -2,7 +2,7 @@
 use strict;
 use POSIX qw(strftime);
 
-my ($list, @list, %list, $item, @item, %item, $result, $done, %platforms, %components, $now, $n_platforms, $width);
+my ($list, @list, %list, $item, @item, %item, $result, $done, $skipped, %platforms, %components, $now, $n_platforms, $width);
 my (%list_perf);
 
 
@@ -29,7 +29,7 @@ sub table2($$$) {
 					$result = $item->{result2};
 					#$result =~ s/ /<br\/>/g;
 				} else {
-					$result = $item->{result};
+					$result = "$item->{result} / $item->{done} $item->{skipped}";
 					if ($item->{result} eq '0') { $class='OK'; }
 					else { $class='FAIL'; }
 				}
@@ -128,7 +128,9 @@ foreach my $s (keys %list) {
 					$result=`grep -- '-TEST FAILED-' $item->{dir}/report.twiki 2>/dev/null| wc -l | sed 's/ *//g'`;
 					chomp $result;
 					$done=`grep -- '<font color="green">done</font>' $item->{dir}/report.twiki 2>/dev/null| wc -l | sed 's/ *//g'`;
+					$skipped=`grep -- '<font color="orange">skipped</font>' $item->{dir}/report.twiki 2>/dev/null| wc -l | sed 's/ *//g'`;
 					chomp $done;
+					chomp $skipped;
 				} else {
 					if ($section == 0) { $result = 'Error'; }
 					else { $result = 'Failed'; }
@@ -136,6 +138,7 @@ foreach my $s (keys %list) {
 			}
 			$item->{result} = defined $result ? $result : '-';
 			$item->{done} = defined $done ? $done : '-';
+			$item->{skipped} = defined $skipped ? $skipped : '-';
 			if ($item->{result} ne '-' and $item->{done} ne '-') {
 				$item->{done} += $item->{result};
 			}