X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=101b340377ee7bc2aa3c305bc32508777728bfa5;hb=c8a3f10636549604a41534a6a4348db8a03534c7;hp=ac240ea2806101b7a8d95a3b30cf559bf5575ce2;hpb=52dfdcb29710e7c1282a79ebabac1e4619979931;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index ac240ea2..101b3403 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -5,11 +5,12 @@ COMMANDPATH=$0
 COMMAND=$(basename $0)
 
 # default values, tunable with command-line options
-DEFAULT_FCDISTRO=f7
+DEFAULT_FCDISTRO=f8
 DEFAULT_PLDISTRO=planetlab
 DEFAULT_PERSONALITY=linux32
 DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
 DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
+DEFAULT_TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
 
 # web publishing results
 DEFAULT_WEBPATH="/build/@PLDISTRO@/"
@@ -18,7 +19,6 @@ DEFAULT_WEBPATH="/build/@PLDISTRO@/"
 TESTBUILDURL="http://build.one-lab.org/"
 TESTBOX=onelab-test.inria.fr
 TESTBOXSSH=root@onelab-test.inria.fr
-TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
 ####################
 # assuming vserver runs in UTC
 DATE=$(date +'%Y.%m.%d')
@@ -38,9 +38,10 @@ m_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*|.*is not install
 m_installing_any=re.compile('\r  (Installing:[^\]]*]) ')
 m_installing_err=re.compile('\r  (Installing:[^\]]*])(..+)')
 m_installing_end=re.compile('Installed:.*')
-m_installing_doc=re.compile("(.*)install-info: No such file or directory for /usr/share/info/\S+(.*)")
+m_installing_doc1=re.compile("(.*)install-info: No such file or directory for /usr/share/info/\S+(.*)")
+m_installing_doc2=re.compile("(.*)grep: /usr/share/info/dir: No such file or directory(.*)")
 
-def scan_log (filename):
+def summary (filename):
 
     try:
         if filename=="-":
@@ -51,17 +52,20 @@ def scan_log (filename):
         echo=False
         for line in f.xreadlines():
             # first off : discard warnings related to doc
-            if m_installing_doc.match(line):
-                (begin,end)=m_installing_doc.match(line).groups()
+            if m_installing_doc1.match(line):
+                (begin,end)=m_installing_doc1.match(line).groups()
+                line=begin+end
+            if m_installing_doc2.match(line):
+                (begin,end)=m_installing_doc2.match(line).groups()
                 line=begin+end
             # unconditionnally show these lines
             if m_show_line.match(line):
-                print line,
+                print '>>>',line,
             # an 'installing' line with messages afterwards : needs to be echoed
             elif m_installing_err.match(line):
                 (installing,error)=m_installing_err.match(line).groups()
-                print installing
-                print error
+                print '>>>',installing
+                print '>>>',error
                 echo=True
             # closing an 'installing' section
             elif m_installing_end.match(line):
@@ -70,17 +74,17 @@ def scan_log (filename):
             elif m_installing_any.match(line):
                 if echo: 
                     installing=m_installing_any.match(line).group(1)
-                    print installing
+                    print '>>>',installing
                 echo=False
             # print lines when echo is true
             else:
-                if echo: print line,
+                if echo: print '>>>',line,
         f.close()
     except:
         print 'Failed to analyze',filename
 
 for arg in sys.argv[1:]:
-    scan_log(arg)
+    summary(arg)
 EOF
     echo "******************** END SUMMARY" 
 }
@@ -94,7 +98,7 @@ function failure() {
     summary $LOG >> ${WEBLOG}
     (echo -n "============================== $COMMAND: failure at " ; date ; tail -c 20k $WEBLOG) > ${WEBLOG}.ko
     if [ -n "$MAILTO" ] ; then
-	tail -c 20k ${WEBPATH}/${BASE}.log.txt | mail -s "Failures for build ${BASE}" $MAILTO
+	tail -c 20k ${WEBLOG} | mail -s "Failures for build ${BASE}" $MAILTO
     fi
     exit 1
 }
@@ -106,7 +110,7 @@ function success () {
     summary $LOG >> ${WEBLOG}
     touch ${WEBLOG}.ok
     if [ -n "$MAILTO" ] ; then
-	(echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ) | mail -s "Successfull build for ${BASE}" $MAILTO
+	(echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ) | mail -s "Successful build for ${BASE}" $MAILTO
     fi
     exit 0
 }
@@ -128,12 +132,19 @@ function build () {
     show_env
     
     echo "Running make IN $(pwd)"
+    
+    # stuff our own variable settings
+    MAKEVARS=("PLDISTRO=${PLDISTRO}" "${MAKEVARS[@]}")
+    MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}")
+    MAKEVARS=("NIGHTLY_BASE=${BASE}" "${MAKEVARS[@]}")
+    MAKEVARS=("NIGHTLY_PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
+
     # stage1
-    make -C /build "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" stage1=true 
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true 
     # versions
-    make -C /build "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" NIGHTLY_BASE=${BASE} versions
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
     # actual stuff
-    make -C /build "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" $MAKETARGETS
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
 
 }
 
@@ -161,7 +172,7 @@ function runtest () {
     ssh ${TESTBOXSSH} rm -rf ${testdir}
     # check it out
     ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
-    # invoke test on testbox - pass url and build url - so the tests can use myplc-init-vserver.sh
+    # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
     ssh 2>&1 ${TESTBOXSSH} python -u ${testdir}/runtest --build ${SVNPATH} --url ${url} --all
     # still missing - need to populate /var/www/html/install-rpms on the myplc
 	
@@ -179,7 +190,7 @@ function show_env () {
     echo BASE=$BASE
     echo SVNPATH=$SVNPATH
     echo MAKEVARS="${MAKEVARS[@]}"
-    echo MAKEOPTS="${MAKEOPTS[@]}"
+    echo DRY_RUN="$DRY_RUN"
     echo PLDISTROTAGS="$PLDISTROTAGS"
     echo TAGSRELEASE="$TAGSRELEASE"
     echo -n "(might be unexpanded)"
@@ -213,6 +224,7 @@ function usage () {
     echo " -w webpath - defaults to $DEFAULT_WEBPATH"
     echo " -B : run build only"
     echo " -T : run test only"
+    echo " -x testsvnpath - defaults to $DEFAULT_TESTSVNPATH"
     echo " -v : be verbose"
     echo " -7 : uses weekday-@FCDISTRO@ as base"
     exit 1
@@ -228,12 +240,12 @@ function main () {
     
     # parse arguments
     MAKEVARS=()
-    MAKEOPTS=()
+    DRY_RUN=
     DO_BUILD=true
     DO_TEST=true
     while getopts "nf:d:b:p:t:r:s:om:a:w:BTvh7" opt ; do
 	case $opt in
-	    n) DRY_RUN="true" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;
+	    n) DRY_RUN="-n" ;;
 	    f) FCDISTRO=$OPTARG ;;
 	    d) PLDISTRO=$OPTARG ;;
 	    p) PERSONALITY=$OPTARG ;;
@@ -247,6 +259,7 @@ function main () {
 	    w) WEBPATH=$OPTARG ;;
 	    B) DO_TEST= ;;
 	    T) DO_BUILD= ; OVERWRITEMODE=true ;;
+	    x) TESTSVNPATH=$OPTARG ;;
 	    v) set -x ;;
 	    7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
 	    h|*) usage ;;
@@ -264,6 +277,7 @@ function main () {
     [ -z "$BASE" ] && BASE="$DEFAULT_BASE"
     [ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
     [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
+    [ -z "$TESTSVNPATH" ] && TESTSVNPATH="$DEFAULT_TESTSVNPATH"
 
     [ -n "$DRY_RUN" ] && MAILTO=""