Index: /issm/trunk/cron/nightlyrun.sh =================================================================== --- /issm/trunk/cron/nightlyrun.sh (revision 1573) +++ /issm/trunk/cron/nightlyrun.sh (revision 1574) @@ -44,4 +44,5 @@ export HOST_NAME=`hostname`; export ISSM_RELEASE="issm" +export OS #create ISSM variables Index: /issm/trunk/cron/report.sh =================================================================== --- /issm/trunk/cron/report.sh (revision 1573) +++ /issm/trunk/cron/report.sh (revision 1574) @@ -26,7 +26,8 @@ fi - #build report.html -cat < report.html + +#first: header +cat << END > header.html ISSM - Nightly run Report @@ -93,4 +94,8 @@
ISSM Nightly run report

+END + +#then: summary +cat << END > summary.html
date: $TODAY
@@ -105,29 +110,26 @@ then #installation failed, end of report - echo "installation failed" + echo "installation failed
" + rm check.log errors.log success.log tests.log +else + if [ $IS_END==0 ]; + then + echo "stopped before the end" + else + echo "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 "" - echo "
" - echo "
" - echo "
ISSM nightly run report
" - echo "" - echo "" - exit 1 -else - if [ $IS_END==0 ]; - then - echo "stopped before the end" - else - echo "all test desks have been run" - fi -fi -rm check.log) -
-number of errors: $(wc -l errors.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}'; rm errors.log)
-number of success: $(wc -l success.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}';rm success.log tests.log) -
-
- + rm check.log +fi) +END + +#report content +if [ $IS_END != 0 ]; +then + cat << END > content.html $(for package in "macayeal" "ice" "cielo_serial" "cielo_parallel"; do @@ -189,6 +191,14 @@ done) - -
+
+END +else + for package in "macayeal" "ice" "cielo_serial" "cielo_parallel"; do + rm $package.log + done +fi + +#last footer +cat << END > footer.html
ISSM nightly run report
@@ -196,2 +206,12 @@ END + +#concatenate files +if [ $IS_END != 0 ]; +then + cat header.html summary.html content.html footer.html > report.html + rm header.html summary.html content.html footer.html +else + cat header.html summary.html footer.html > report.html + rm header.html summary.html footer.html +fi