X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=ef3582e5d308c3ffdcff82437f78c5323a4a19a2;hb=a4b947e028e97c9750485795fc0a98309e8f6d6d;hp=b71f82ea5cea5a6e45657d14d77f286f758b81b4;hpb=063d5519bac63b11cf423ed5a54ed156c1d75cd1;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index b71f82ea..ef3582e5 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -10,9 +10,8 @@ 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/"
-DEFAULT_TESTCONFIG32="main 1vnodes 1testbox32"
-DEFAULT_TESTCONFIG64="main 1vnodes 1testbox64"
+# TESTSVNPATH to be computed from the -tags.mk file - no default anymore
+DEFAULT_TESTCONFIG="default"
 DEFAULT_IFNAME=eth0
 
 # web publishing results
@@ -99,9 +98,9 @@ function failure() {
     mkdir -p ${WEBPATH}
     cp $LOG ${WEBLOG}
     summary $LOG >> ${WEBLOG}
-    (echo -n "============================== $COMMAND: failure at " ; date ; tail -c 20k $WEBLOG) > ${WEBLOG}.ko
+    (echo -n "============================== $COMMAND: failure at " ; date ; tail -c 30k $WEBLOG) > ${WEBLOG}.ko
     if [ -n "$MAILTO" ] ; then
-	tail -c 20k ${WEBLOG} | mail -s "Failures for build ${BASE}" $MAILTO
+	tail -c 30k ${WEBLOG} | mail -s "Failures for build ${BASE}" $MAILTO
     fi
     exit 1
 }
@@ -112,7 +111,7 @@ function success () {
     mkdir -p ${WEBPATH}
     cp $LOG ${WEBLOG}
     summary $LOG >> ${WEBLOG}
-    if [ -n "DO_TEST" ] ; then
+    if [ -n "$DO_TEST" ] ; then
 	echo "Successfully built and tested - see testlogs for details" > ${WEBLOG}.pass
 	rm -f ${WEBLOG}.ok
     else
@@ -152,6 +151,8 @@ function build () {
     make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true 
     # versions
     make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
+    # store testsvnpath
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true testsvnpath
     # actual stuff
     make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
 
@@ -166,23 +167,39 @@ function runtest () {
 
     echo -n "============================== Starting $COMMAND:runtest on $(date)"
 
-    ### the URL to the myplc package
-    rpm=$( find /vservers/$BASE/build/RPMS -name 'myplc-[0-9]*' )
-    if [ ${#rpm[@]} != 1 ] ; then
-	echo "$COMMAND: Cannot locate rpm for testing"
+    # where to find TESTSVNPATH
+    stamp=/vservers/$BASE/build/testsvnpath
+    if [ ! -f $stamp ] ; then
+	echo "$COMMAND: Cannot figure TESTSVNPATH from missing $stamp"
+	failure
+	exit 1
+    fi
+    TESTSVNPATH=$(cat $stamp)
+    # use only this pat of the tests right now
+    TESTSVNPATH=${TESTSVNPATH}/system
+
+    ### the URL to the RPMS/<arch> location
+    url=""
+    for a in i386 x86_64; do
+	archdir=/vservers/$BASE/build/RPMS/$a
+	if [ -d $archdir ] ; then
+	    url=$(echo $archdir | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
+	    break
+	fi
+    done
+
+    if [ -z "$url" ] ; then
+	echo "$COMMAND: Cannot locate arch URL for testing"
 	failure
 	exit 1
     fi
-    url=$(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
 
-    # compute test directory name on test box
-    testdir=chroot-${BASE}
-    # use another name if any config contains vserver
-    echo $TESTCONFIG | grep vserver &> /dev/null && testdir=vserver-${BASE}
+    # test directory name on test box
+    testdir=${BASE}
     # clean it
-    ssh ${TESTBOXSSH} rm -rf ${testdir}
+    ssh -n ${TESTBOXSSH} rm -rf ${testdir}
     # check it out
-    ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
+    ssh -n ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
     # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
     configs=""
     for config in ${TESTCONFIG} ; do
@@ -191,11 +208,11 @@ function runtest () {
     
     # need to proceed despite of set -e
     success=true
-    ssh 2>&1 ${TESTBOXSSH} ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs --all || success=
+    ssh 2>&1 -n ${TESTBOXSSH} ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs --all || success=
 
     # gather logs in the vserver
     mkdir -p /vservers/$BASE/build/testlogs
-    ssh 2>&1 ${TESTBOXSSH} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || true
+    ssh 2>&1 -n ${TESTBOXSSH} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || true
     # push them to the build web
     rsync --archive --delete /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/
     chmod -R a+r $WEBPATH/$BASE/testlogs/
@@ -241,8 +258,7 @@ function usage () {
     echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk"
     echo " -r tagsrelease - a release number that refers to PLDISTROTAGS - defaults to HEAD"
     echo " -s svnpath - where to fetch the build module"
-    echo " -x testsvnpath - defaults to $DEFAULT_TESTSVNPATH"
-    echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG32 or $DEFAULT_TESTCONFIG64"
+    echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
     echo " -w webpath - defaults to $DEFAULT_WEBPATH"
     echo " -m mailto - no default"
     echo " -O : overwrite - re-run in base directory, do not re-create vserver"
@@ -274,7 +290,6 @@ function main () {
 	    t) PLDISTROTAGS=$OPTARG ;;
 	    r) TAGSRELEASE=$OPTARG ;;
 	    s) SVNPATH=$OPTARG ;;
-	    x) TESTSVNPATH=$OPTARG ;;
 	    c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
 	    w) WEBPATH=$OPTARG ;;
 	    m) MAILTO=$OPTARG ;;
@@ -306,9 +321,7 @@ function main () {
     [ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
     [ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
     [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
-    [ -z "$TESTSVNPATH" ] && TESTSVNPATH="$DEFAULT_TESTSVNPATH"
-    [ "$PERSONALITY" == linux32 ] && [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG32"
-    [ "$PERSONALITY" == linux64 ] && [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG64"
+    [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
 
     [ -n "$DRY_RUN" ] && MAILTO=""
 	
@@ -343,6 +356,8 @@ function main () {
 	    set -x
 	    echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date)
 	    show_env
+	    # start in case e.g. we just rebooted
+	    vserver ${BASE} start || :
 	    # update build
 	    vserver ${BASE} exec svn update /build
 	else
@@ -406,6 +421,8 @@ function main () {
 	rm -rf $WEBPATH/$BASE ; mkdir -p $WEBPATH/$BASE/{RPMS,SRPMS}
 	rsync --archive --delete --verbose /vservers/$BASE/build/RPMS/ $WEBPATH/$BASE/RPMS/
 	rsync --archive --delete --verbose /vservers/$BASE/build/SRPMS/ $WEBPATH/$BASE/SRPMS/
+	# publish myplc-release
+	rsync --verbose /vservers/$BASE/build/myplc-release $WEBPATH/$BASE
 	
 	if [ -n "$DO_TEST" ] ; then 
 	    runtest