X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=101b340377ee7bc2aa3c305bc32508777728bfa5;hb=609197895d9d77a009fc6c24b0c920cb27fe0b48;hp=3ebcab0f66bce1f22844d76da0a068be5f332f5f;hpb=b23fb6d1e9467b6613cac53a592f747ae5e86b42;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 3ebcab0f..101b3403 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -5,15 +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"
-
-# NOTE: do not think we want to put email addresses into scripts
-# that can be harvested by spambots. --mef
-DEFAULT_MAILTO="onelab-build@one-lab.org"
+DEFAULT_TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
 
 # web publishing results
 DEFAULT_WEBPATH="/build/@PLDISTRO@/"
@@ -22,8 +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/"
-TESTSCRIPT=TestMain.py
 ####################
 # assuming vserver runs in UTC
 DATE=$(date +'%Y.%m.%d')
@@ -34,7 +29,63 @@ DATE=$(date +'%Y.%m.%d')
 function summary () {
     from=$1; shift
     echo "******************** BEG SUMMARY" 
-    tr -d '\r' < $from | egrep 'BEG RPM|not installed|Installing:.*([eE]rror|[wW]arning)' 
+    python - $from <<EOF
+#!/usr/bin/env python
+# read a full log and tries to extract the interesting stuff
+
+import sys,re
+m_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*|.*is not installed.*")
+m_installing_any=re.compile('\r  (Installing:[^\]]*]) ')
+m_installing_err=re.compile('\r  (Installing:[^\]]*])(..+)')
+m_installing_end=re.compile('Installed:.*')
+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 summary (filename):
+
+    try:
+        if filename=="-":
+            filename="stdin"
+            f=sys.stdin
+        else:
+            f=open(filename)
+        echo=False
+        for line in f.xreadlines():
+            # first off : discard warnings related to doc
+            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,
+            # 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
+                echo=True
+            # closing an 'installing' section
+            elif m_installing_end.match(line):
+                echo=False
+            # any 'installing' line
+            elif m_installing_any.match(line):
+                if echo: 
+                    installing=m_installing_any.match(line).group(1)
+                    print '>>>',installing
+                echo=False
+            # print lines when echo is true
+            else:
+                if echo: print '>>>',line,
+        f.close()
+    except:
+        print 'Failed to analyze',filename
+
+for arg in sys.argv[1:]:
+    summary(arg)
+EOF
     echo "******************** END SUMMARY" 
 }
 
@@ -47,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
 }
@@ -59,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
 }
@@ -72,24 +123,28 @@ function build () {
     echo -n "============================== Starting $COMMAND:build on "
     date
 
-    cd /
-
+    cd /build
   # if TAGSRELEASE specified : update PLDISTROTAGS with this tag
     if [ -n "$TAGSRELEASE" ] ; then
-	cd build
 	svn up -r $TAGSRELEASE $PLDISTROTAGS
-	cd - 
     fi
 
     show_env
     
     echo "Running make IN $(pwd)"
-    make stage1=true "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" -C /build
-    # in case we use an older build that does not know about versions
-    set +e
-    make "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" -C /build versions
-    set -e
-    make "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" -C /build $MAKETARGETS
+    
+    # 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 $DRY_RUN "${MAKEVARS[@]}" stage1=true 
+    # versions
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
+    # actual stuff
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
 
 }
 
@@ -101,11 +156,9 @@ function runtest () {
     trap failure ERR INT
 
     echo -n "============================== Starting $COMMAND:runtest on $(date)"
-    here=$(pwd)
 
     ### the URL to the myplc package
-    cd /vservers/$BASE/build/RPMS/i386
-    rpm=$(ls myplc-[0-9]*.rpm)
+    rpm=$( (cd /vservers/$BASE/build/RPMS/i386 ; ls myplc-[0-9]*.rpm) )
     if [ ${#rpm[@]} != 1 ] ; then
 	echo "$COMMAND: Cannot locate rpm for testing"
 	failure
@@ -113,34 +166,20 @@ function runtest () {
     fi
     url=${TESTBUILDURL}${PLDISTRO}/${BASE}/RPMS/i386/${rpm}
 
-    # checkout the system test (formerly known as plctest)
-    cd /vservers/${BASE}/build
-    rm -rf TESTS
-    svn export $TESTSVNPATH TESTS
-    # dont trust retcod
-    if [ ! -d TESTS ] ; then 
-	echo "$COMMAND: could not svn export $SVNPATH - check url"
-	exit 1
-    fi
-
-  # compute test directory name on test box
-    testdir=plctest-${BASE}
-  # rsync/push test material onto the test box - clean first
+    # compute test directory name on test box
+    testdir=test-${BASE}
+    # clean it
     ssh ${TESTBOXSSH} rm -rf ${testdir}
-    ssh ${TESTBOXSSH} mkdir -p ${testdir}
-    rsync -a -v TESTS/ ${TESTBOXSSH}:${testdir}/
-  # invoke test on testbox
-    ssh ${TESTBOXSSH} python -u ${testdir}/${TESTSCRIPT} ${url} 
-  #invoke make install from build to the testbox
-  # looks suspicious : we'd need this *during* myplc run, not at the end
-  # in addition we are not in the vserver here so running make can have weird effects
-  # make install PLCHOST=${TESTBOX}
+    # check it out
+    ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
+    # 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
 	
     if [ "$?" != 0 ] ; then
 	failure
     fi
     
-    cd $here
     echo -n "============================== End $COMMAND:runtest on $(date)"
 }
 
@@ -151,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)"
@@ -185,7 +224,9 @@ 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
 }
 
@@ -199,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:BTvh" opt ; do
+    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 ;;
@@ -212,13 +253,15 @@ function main () {
 	    t) PLDISTROTAGS=$OPTARG ;;
 	    r) TAGSRELEASE=$OPTARG ;;
 	    s) SVNPATH=$OPTARG ;;
-	    o) USEOLD=true ;;
+	    o) OVERWRITEMODE=true ;;
 	    m) MAILTO=$OPTARG ;;
 	    a) MAKEVARS=(${MAKEVARS[@]} "$OPTARG") ;;
 	    w) WEBPATH=$OPTARG ;;
 	    B) DO_TEST= ;;
-	    T) DO_BUILD= ; USEOLD=true ;;
+	    T) DO_BUILD= ; OVERWRITEMODE=true ;;
+	    x) TESTSVNPATH=$OPTARG ;;
 	    v) set -x ;;
+	    7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
 	    h|*) usage ;;
 	esac
     done
@@ -234,13 +277,8 @@ function main () {
     [ -z "$BASE" ] && BASE="$DEFAULT_BASE"
     [ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
     [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
+    [ -z "$TESTSVNPATH" ] && TESTSVNPATH="$DEFAULT_TESTSVNPATH"
 
-    # NOTE: suggest that by default no email is sent and that the user
-    # should explicitly invoke this script with the -m arg to pass in
-    # the appropriate email address. --mef
-    if [ "$PLDISTRO" = "onelab" ] ; then
-	[ -z "$MAILTO" ] && MAILTO="$DEFAULT_MAILTO"
-    fi
     [ -n "$DRY_RUN" ] && MAILTO=""
 	
     ### set BASE from DISTRO, if unspecified
@@ -261,7 +299,7 @@ function main () {
         # (*) copy this command in the vserver
         # (*) invoke it
 	
-	if [ -n "$USEOLD" ] ; then
+	if [ -n "$OVERWRITEMODE" ] ; then
             ### Re-use a vserver (finish an unfinished build..)
 	    if [ ! -d /vservers/${BASE} ] ; then
 		echo $COMMAND : cannot find vserver $BASE