Index: /issm/trunk/cron/report.sh =================================================================== --- /issm/trunk/cron/report.sh (revision 1604) +++ /issm/trunk/cron/report.sh (revision 1605) @@ -7,8 +7,8 @@ cat nightly.log | grep 'package: cielo_serial' | grep -v "not supported yet" > cielo_serial.log cat nightly.log | grep 'package: cielo_parallel'| grep -v "not supported yet" > cielo_parallel.log -cat nightly.log | grep NIGHTLYRUNTERMINATEDCORRECTLY > check.log -cat nightly.log | grep ERROR | grep -v "PETSC ERROR" > errors.log -cat nightly.log | grep SUCCESS > success.log -cat errors.log success.log > tests.log +cat nightly.log | grep 'NIGHTLYRUNTERMINATEDCORRECTLY' > check.log +cat nightly.log | grep 'ERROR' | grep -v "PETSC ERROR" > errors.log +cat nightly.log | grep 'SUCCESS' > success.log +cat errors.log success.log > tests.log #create some variables @@ -26,101 +26,80 @@ fi +#style +H1_STYLE='width="800px" cellpadding="20"' +H1_FONT='style="color:#6495ed; font-family:Arial, Verdana, Tahoma; font-weight: bold; font-size:35px;" align="center"' + +H2_STYLE='width="840px" cellpadding="20"' +H2_FONT='style="color:#6495ed; font-family:Arial, Verdana, Tahoma; font-size:28px; font-weight: bold;" align="left"' + +TABLE_STYLE='width="820px" rules=none bgcolor="#ffffdd" border=1 bordercolor="#000000" cellpadding="3"' +TABLE_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14; font-weight: normal;" align="left"' + +BODY_STYLE='width="820px"' +BODY_FONT="style=\"color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14px;\"" + +NOTEST_STYLE='width="650px"' +NOTEST_FONT='style="color:#FF0000; font-family:Arial, Verdana, Tahoma; font-size:14px;" align="left"' + +FOOTER_STYLE='width="800px" cellpadding="10"' +FOOTER_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:12px; font-weight: normal;" align="center"' + #build report.html -#first: header -cat << END > header.html - -
ISSM Nightly run report
-
-END - -#then: summary -cat << END > summary.html -
-date: $TODAY
-host: $HOST_NAME
-OS: $OS
-release: $ISSM_RELEASE
-total elapsed time: $ELAPSED_TOTAL
-installation elapsed time: $ELAPSED_INSTAL
-runs elapsed time: $ELAPSED_RUN
-
-status: $(if [ $(echo $IS_INSTALL) = 0 ]; + + + + + + + + + + + + + + +$(#print status +if [ $(echo $IS_INSTALL) = 0 ]; then #installation failed, end of report - echo "installation failed" + echo "" + echo "" + echo "" + echo "
host: $HOST_NAMEdate: $TODAY
OS: $OStotal elapsed time: $ELAPSED_TOTAL
release: $ISSM_RELEASEinstallation elapsed time: $ELAPSED_INSTAL
status: installation failedexecution elapsed time: $ELAPSED_RUN
" rm check.log errors.log success.log tests.log else + #installation successful. Did we go to the end? + if [ $(echo $IS_END) = 0 ]; then - echo "stopped before the end" + echo "status: stopped before the end" else - echo "all test desks have been run" + echo "status: all test desks have been run" fi - echo "
" - echo "number of errors: $(wc -l errors.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}'; rm errors.log)
" - echo "number of success: $(wc -l success.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}';rm success.log tests.log)
" - echo "
" - echo "
" + echo "execution elapsed time: $ELAPSED_RUN" + echo "" + echo "" + echo "number of errors: $(wc -l errors.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}'; rm errors.log)" + echo " " + echo "" + echo "" + echo "number of success: $(wc -l success.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}'; rm success.log tests.log)" + echo " " + echo "" + echo "" + + #draw a line and clean up + echo "
" rm check.log fi) END + #report content @@ -131,19 +110,20 @@ #enter title - if [ $package == "macayeal" ]; then - echo "
MacAyeal package
" + if [ $package == "macayeal" ]; + then + echo "
Macayeal package
" fi - if [ $package == "ice" ]; then - echo "
Ice package
" + if [ $package == "ice" ]; + then + echo "
Ice package
" fi - if [ $package == "cielo_serial" ]; then - echo "
Cielo Serial package
" + if [ $package == "cielo_serial" ]; + then + echo "
Cielo serial package
" fi - if [ $package == "cielo_parallel" ]; then - echo "
Cielo Parallel package
" + if [ $package == "cielo_parallel" ]; + then + echo "
Cielo parallel package
" fi - - #Print division - echo "
" #check that at least one Test exists @@ -151,10 +131,10 @@ #No Test: use a table to fix entourage bug. - echo "
No test found.
" + echo "
No test found.
" else - echo "" - echo "" + echo "
Result Tolerance Test Solution Field
" + echo "" # go through the lines of $package.log @@ -173,7 +153,10 @@ color="bgcolor=#ffdddd"; fi + FONT=$(echo "$BODY_FONT $color") #build html corresponding line - cat $package.log | awk '{ printf "line%so %s\n", NR, $0 }' | awk '/line'$COUNTER'o/ {printf("",$2,$4,$5,$6,$8,$10,$14);}'; + cat $package.log | awk '{ printf "line%so %s\n", NR, $0 }' | awk -v FONT="$FONT" ' + /line'$COUNTER'o/ { printf("",FONT,$2,FONT,$4,$5,$6,FONT,$8,FONT,$10,FONT,$14);} + '; echo "" done @@ -182,6 +165,5 @@ fi - #Print end division and remove log file - echo "" + #remove log file rm $package.log @@ -198,5 +180,6 @@ cat << END > footer.html
-
ISSM nightly run report
+
Result Tolerance Test Solution Field
%s %s%s%s %s %s %s%s %s%s%s %s %s %s
ISSM nightly run report
+
END @@ -204,8 +187,8 @@ if [ $(echo $IS_INSTALL) = 1 ]; then - cat header.html summary.html content.html footer.html > report.html - rm header.html summary.html content.html footer.html + cat summary.html content.html footer.html > report.html + rm summary.html content.html footer.html else - cat header.html summary.html footer.html > report.html - rm header.html summary.html footer.html + cat summary.html footer.html > report.html + rm summary.html footer.html fi