Update of /var/cvs/speeltuin/nightly
In directory james.mmbase.org:/home/nightly/bin

Modified Files:
        build.sh copy-artifacts.sh 
Added Files:
        env.sh filterlog 
Log Message:
something went wrong with check for success of build and copying to 'latest'


See also: http://cvs.mmbase.org/viewcvs/speeltuin/nightly


env.sh is new



filterlog is new



Index: build.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/build.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- build.sh    25 Sep 2008 19:48:49 -0000      1.24
+++ build.sh    27 Sep 2008 19:29:40 -0000      1.25
@@ -1,32 +1,11 @@
 #!/bin/bash
 
-
-echo setting PATH, JAVA HOME
-export 
PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/ccs/bin:/home/nightly/bin
-
-echo $HOME
-
-export BUILD_HOME="/home/nightly"
-
-export JAVA_HOME=/home/nightly/jdk
-export JAVAC=${JAVA_HOME}/bin/javac
-
-export MAVEN_OPTS=-Xmx512m
-export MAVEN="/home/nightly/maven/bin/maven --nobanner --quiet"
-export CVS="/usr/bin/cvs -d :pserver:[EMAIL PROTECTED]:/var/cvs"
-export ANT_HOME=/usr/ant
-antcommand="/usr/bin/ant"
-
-export FILTER="/home/nightly/bin/filterlog"
-
+source env.sh
 
 export MAILADDRESS="[EMAIL PROTECTED]"
 #export MAILADDRESS="[EMAIL PROTECTED]"
 export BUILD_MAILADDRESS=$MAILADDRESS
 
-echo generating version, and some directories
-
-
 source version.sh
 
 # UNSTABLE branch
@@ -38,8 +17,8 @@
 
     echo Cleaning
     echo >  ${builddir}/messages.log 2> ${builddir}/errors.log
-# removes all 'target' directories
-# the same as ${MAVEN} multiproject:clean >>  ${builddir}/messages.log 2>> 
${builddir}/errors.log
+    # removes all 'target' directories
+    # the same as ${MAVEN} multiproject:clean >>  ${builddir}/messages.log 2>> 
${builddir}/errors.log
     find . -type d -name target -print | xargs rm -rf  >> 
${builddir}/messages.log
 
     pwd
@@ -56,6 +35,8 @@
     echo all:install
     ((${MAVEN} all:install | tee -a ${builddir}/messages.log) 3>&1 1>&2 2>&3 | 
tee -a ${builddir}/errors.log) 3>&1 1>&2 2>&3
 
+    echo 
====================================================================== |  tee 
-a ${builddir}/messages.log
+    echo creating RECENTCHANGES |  tee -a ${builddir}/messages.log
     ${CVS} log -N -d"last week<now" 2> /dev/null | ${FILTER} > 
${builddir}/RECENTCHANGES.txt
 fi
 
@@ -66,14 +47,12 @@
 fi
 
 
-copy-artifacts.sh
+$HOME/bin/copy-artifacts.sh
 
 
 if [ 1 == 1 ] ; then
     echo Now executing tests. Results in ${builder}/test-results. | tee -a 
${builddir}/messages.log
     cd ${BUILD_HOME}/nightly-build/cvs/mmbase/tests
-    # Ant sucks incredibly. This classapth should not be necessary, but 
really, it is.
-    export 
CLASSPATH=${BUILD_HOME}/.ant/lib/ant-apache-log4j.jar:${BUILD_HOME}/.ant/lib/log4j-1.2.13.jar
     ${antcommand} -quiet -listener org.apache.tools.ant.listener.Log4jListener 
-lib lib:.  run.all  2>&1 | tee  ${builddir}/tests-results.log
 fi
 
@@ -81,7 +60,12 @@
 echo Creating symlink for latest build | tee -a ${builddir}/messages.log
 rm /home/nightly/builds/latest
 cd /home/nightly/builds
-ln -s ${dir} latest
+ln -s ${builddir} latest
+
+ # Using one thread for all mail about failures
+parent="<[EMAIL PROTECTED]>";
+mutthdr="my_hdr In-Reply-To: $parent";
+
 
 showtests=1
 if [ 1 == 1 ] ; then
@@ -90,14 +74,14 @@
                  echo Build failed, sending mail to ${BUILD_MAILADDRESS} | tee 
-a ${builddir}/messages.log
                  echo -e "Build on ${version} failed:\n\n" | \
                            cat latest/messages.log latest/errors.log | grep -B 
10 "\[javac\]" | \
-                           mutt -s "Build failed ${version}" 
${BUILD_MAILADDRESS}
+               mutt -e $mutthdr -s "Build failed ${version}" 
${BUILD_MAILADDRESS}
                  showtests=0;
         fi
     else
         echo Build failed, sending mail to ${BUILD_MAILADDRESS} | tee -a 
${builddir}/messages.log
         echo -e "No build created on ${version}\n\n" | \
             tail -q -n 20 - latest/errors.log | \
-            mutt -s "Build failed ${version}" ${BUILD_MAILADDRESS}
+            mutt -e $mutthdr -s "Build failed ${version}" ${BUILD_MAILADDRESS}
        showtests=0;
     fi
 fi
@@ -109,14 +93,11 @@
     echo Test results | tee -a ${builddir}/messages.log
 
     if [ -f latest/tests-results.log ] ; then
-             # Using one thread for all test-case failures
-             parent="<[EMAIL PROTECTED]>";
-
              if (( `cat latest/tests-results.log  | grep 'FAILURES' | wc -l` > 
0 )) ; then
                  echo Failures, sending mail to ${MAILADDRESS}  | tee -a 
${builddir}/messages.log
                  (echo "Failures on build ${version}" ; echo "See also 
http://www.mmbase.org/download/builds/latest/tests-results.log"; ; \
                 cat latest/tests-results.log  | grep -P  '(^Tests 
run:|^[0-9]+\)|^\tat org\.mmbase|FAILURES|========================|OK)' ) | \
-                           mutt -e "my_hdr In-Reply-To: $parent" -s "Test 
cases failures" ${MAILADDRESS}
+               mutt -e $mutthdr -s "Test cases failures" ${MAILADDRESS}
              fi
     fi
 fi


Index: copy-artifacts.sh
===================================================================
RCS file: /var/cvs/speeltuin/nightly/copy-artifacts.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- copy-artifacts.sh   25 Sep 2008 19:48:49 -0000      1.2
+++ copy-artifacts.sh   27 Sep 2008 19:29:40 -0000      1.3
@@ -1,8 +1,9 @@
 #!/bin/bash
 echo $HOME
-source version.sh
 
-echo Copying todays artifacts | tee -a ${builddir}/messages.log
+source $HOME/bin/version.sh
+
+echo Copying todays artifacts to ${builddir} | tee -a ${builddir}/messages.log
 
 # only files which name ends in these:
 jar=-$mmbaseversion.jar
@@ -10,9 +11,8 @@
 mm=-$mmbaseversion.mmbase-module
 
 for i in `/usr/bin/find $HOME/.maven/repository/mmbase -mtime -1` ; do
-    #echo copy $i to ${builddir} | tee -a ${builddir}/messages.log
     if [ ${i%$jar} != $i -o ${i%$war} != $i -o ${i%$mm} != $i ]; then
-        #echo $i
+       echo copy $i to ${builddir} | tee -a ${builddir}/messages.log
         cp $i ${builddir}
     fi
 done
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to