X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=0516c1b420404c0e473892945c98c0bf425cbcaa;hb=63a4f22ce2eb45f22cb27f35ccff7026284d8351;hp=c8f91dea9ccf252919095b4f9896deee20a96b2c;hpb=bede6a7333a9681d312aa87a8a91288da0ffb0ae;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index c8f91dea..0516c1b4 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -5,20 +5,25 @@ COMMANDPATH=$0
 COMMAND=$(basename $0)
 
 # default values, tunable with command-line options
-DEFAULT_FCDISTRO=f8
+DEFAULT_FCDISTRO=centos5
 DEFAULT_PLDISTRO=planetlab
 DEFAULT_PERSONALITY=linux32
 DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
-DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
+DEFAULT_build_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
+DEFAULT_TESTCONFIG="default"
+DEFAULT_IFNAME=eth0
 
 # web publishing results
 DEFAULT_WEBPATH="/build/@PLDISTRO@/"
 
+# default gpg path used in signing yum repo
+DEFAULT_GPGPATH="/etc/planetlab"
+# default email to use in gpg secring
+DEFAULT_GPGUID="root@$( /bin/hostname )"
+
 # for the test part
-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/tags/2008-02-11-last-vmware-support/system/"
+DEFAULT_TESTBUILDURL="http://build.onelab.eu/"
+TESTBOXSSH=root@testbox.onelab.eu
 ####################
 # assuming vserver runs in UTC
 DATE=$(date +'%Y.%m.%d')
@@ -34,7 +39,7 @@ function summary () {
 # 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_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*|.*is not installed.*|.*PROPFIND.*|.*Starting.*:runtest.*")
 m_installing_any=re.compile('\r  (Installing:[^\]]*]) ')
 m_installing_err=re.compile('\r  (Installing:[^\]]*])(..+)')
 m_installing_end=re.compile('Installed:.*')
@@ -93,24 +98,53 @@ EOF
 # Notify recipient of failure or success, manage various stamps 
 function failure() {
     set -x
-    WEBLOG=${WEBPATH}/${BASE}.log.txt
+    # early stage ? - let's not create /build/@PLDISTRO@
+    if [ ! -d ${WEBPATH} ] ; then
+	WEBPATH=/tmp
+	WEBLOG=/tmp/vbuild-early.log.txt
+    fi
     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
+	( \
+	    echo "See full build log at ${LOG_URL}" ; \
+	    echo "and tail version at ${LOG_URL}.ko" ; \
+	    echo "See complete set of testlogs at ${TESTLOGS_URL}" ; \
+	    tail -c 30k ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT}" $MAILTO
     fi
     exit 1
 }
 
 function success () {
     set -x
-    WEBLOG=${WEBPATH}/${BASE}.log.txt
+    # early stage ? - let's not create /build/@PLDISTRO@
+    if [ ! -d ${WEBPATH} ] ; then
+	WEBPATH=/tmp
+	WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
+    fi
     cp $LOG ${WEBLOG}
     summary $LOG >> ${WEBLOG}
-    touch ${WEBLOG}.ok
+    if [ -n "$DO_TEST" ] ; then
+	( \
+	    echo "Successfully built and tested" ; \
+	    echo "See full build log at ${LOG_URL}" ; \
+	    echo "See complete set of testlogs at ${TESTLOGS_URL}" ; \
+	    ) > ${WEBLOG}.pass
+	rm -f ${WEBLOG}.pkg-ok ${WEBLOG}.ko
+    else
+	( \
+	    echo "Successful package-only build, no test requested" ; \
+	    echo "See full build log at ${LOG_URL}" ; \
+	    ) > ${WEBLOG}.pkg-ok
+	rm -f ${WEBLOG}.ko
+    fi
     if [ -n "$MAILTO" ] ; then
-	(echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ) | mail -s "Successful build for ${BASE}" $MAILTO
+	( \
+	    echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
+	    echo "See full build log at ${LOG_URL}" ; \
+            [ -n "$DO_TEST" ] && echo "See complete set of testlogs at ${TESTLOGS_URL}" ) \
+	    | mail -s "Success with ${MAIL_SUBJECT}" $MAILTO
     fi
     exit 0
 }
@@ -124,11 +158,6 @@ function build () {
     date
 
     cd /build
-  # if TAGSRELEASE specified : update PLDISTROTAGS with this tag
-    if [ -n "$TAGSRELEASE" ] ; then
-	svn up -r $TAGSRELEASE $PLDISTROTAGS
-    fi
-
     show_env
     
     echo "Running make IN $(pwd)"
@@ -136,15 +165,20 @@ function build () {
     # stuff our own variable settings
     MAKEVARS=("PLDISTRO=${PLDISTRO}" "${MAKEVARS[@]}")
     MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}")
-    MAKEVARS=("NIGHTLY_BASE=${BASE}" "${MAKEVARS[@]}")
-    MAKEVARS=("NIGHTLY_PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
+    MAKEVARS=("build-SVNPATH=${build_SVNPATH}" "${MAKEVARS[@]}")
+    MAKEVARS=("PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
+    MAKEVARS=("MAILTO=${MAILTO}" "${MAKEVARS[@]}")
+
+    MAKEVARS=("BASE=${BASE}" "${MAKEVARS[@]}")
 
     # stage1
     make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true 
+    # store tests_svnpath
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true tests_svnpath
     # versions
     make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
     # actual stuff
-    make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" "${MAKETARGETS[@]}"
 
 }
 
@@ -157,75 +191,174 @@ function runtest () {
 
     echo -n "============================== Starting $COMMAND:runtest on $(date)"
 
-    ### the URL to the myplc package
-    rpm=$( (cd /vservers/$BASE/build/RPMS/i386 ; ls myplc-[0-9]*.rpm) )
-    if [ ${#rpm[@]} != 1 ] ; then
-	echo "$COMMAND: Cannot locate rpm for testing"
+    # where to find TESTS_SVNPATH
+    stamp=/vservers/$BASE/build/tests_svnpath
+    if [ ! -f $stamp ] ; then
+	echo "$COMMAND: Cannot figure TESTS_SVNPATH from missing $stamp"
 	failure
 	exit 1
     fi
-    url=${TESTBUILDURL}${PLDISTRO}/${BASE}/RPMS/i386/${rpm}
+    TESTS_SVNPATH=$(cat $stamp)
+    # xxx - Thierry - need to rework the test framework in tests/system so it can work
+    # with the entire tests/ module checked out, rather than only tests/system/ 
+    # ugly workaround for now
+    TESTS_SYSTEM_SVNPATH=${TESTS_SVNPATH}/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
 
-    # compute test directory name on test box
-    testdir=test-${BASE}
+    if [ -z "$url" ] ; then
+	echo "$COMMAND: Cannot locate arch URL for testing"
+	failure
+	exit 1
+    fi
+
+    # test directory name on test box
+    testdir=${BASE}
     # clean it
-    ssh ${TESTBOXSSH} rm -rf ${testdir}
-    # check it out
-    ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
+    ssh -n ${TESTBOXSSH} rm -rf ${testdir}
+    # check it out 
+    ssh -n ${TESTBOXSSH} svn co ${TESTS_SYSTEM_SVNPATH} ${testdir}
+    # check out the entire tests/ module (with system/ duplicated) as a subdir - see xxx above
+    ssh -n ${TESTBOXSSH} svn co ${TESTS_SVNPATH} ${testdir}/tests
     # 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
+    configs=""
+    for config in ${TESTCONFIG} ; do
+	configs="$configs --config $config"
+    done
+    test_env="-p $PERSONALITY -d $PLDISTRO -f $FCDISTRO"
+
+    # need to proceed despite of set -e
+    success=true
+    ssh 2>&1 -n ${TESTBOXSSH} ${testdir}/runtest --build ${build_SVNPATH} --url ${url} $configs $test_env --all || success=
+
+    # gather logs in the vserver
+    mkdir -p /vservers/$BASE/build/testlogs
+    ssh 2>&1 -n ${TESTBOXSSH} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || true
+    # push them to the build web
+    chmod -R a+r /vservers/$BASE/build/testlogs/
+    rsync --archive --delete /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/
+
+    if [ -z "$success" ] ; then
 	failure
     fi
     
     echo -n "============================== End $COMMAND:runtest on $(date)"
 }
 
+function in_root_context () {
+    rpm -q util-vserver > /dev/null 
+}
+
+# this part won't work with a remote(rsync) WEBPATH
+function sign_node_packages () {
+
+    echo "Signing node packages"
+    
+    need_createrepo=""
+
+    repository=$WEBPATH/$BASE/RPMS/
+    # the rpms that need signing
+    new_rpms=
+    # and the corresponding stamps
+    new_stamps=
+
+    for package in $(find $repository/ -name '*.rpm') ; do
+        stamp=$repository/signed-stamps/$(basename $package).signed
+        # If package is newer than signature stamp
+        if [ $package -nt $stamp ] ; then
+            new_rpms="$new_rpms $package"
+            new_stamps="$new_stamps $stamp"
+        fi
+        # Or than createrepo database
+        [ $package -nt $repository/repodata/repomd.xml ] && need_createrepo=true
+    done
+
+    if [ -n "$new_rpms" ] ; then
+        # Create a stamp once the package gets signed
+        mkdir $repository/signed-stamps 2> /dev/null
+	
+        # Sign RPMS. setsid detaches rpm from the terminal,
+        # allowing the (hopefully blank) GPG password to be
+        # entered from stdin instead of /dev/tty.
+        echo | setsid rpm \
+            --define "_signature gpg" \
+            --define "_gpg_path $GPGPATH" \
+            --define "_gpg_name $GPGUID" \
+            --resign $new_rpms && touch $new_stamps
+    fi
+
+     # Update repository index / yum metadata. 
+    if [ -n "$need_createrepo" ] ; then
+	echo "Indexing node packages after signing"
+        if [ -f $repository/yumgroups.xml ] ; then
+            createrepo --quiet -g yumgroups.xml $repository
+        else
+            createrepo --quiet $repository
+        fi
+    fi
+}
+
 function show_env () {
     set +x
     echo FCDISTRO=$FCDISTRO
     echo PLDISTRO=$PLDISTRO
+    echo PERSONALITY=$PERSONALITY
     echo BASE=$BASE
-    echo SVNPATH=$SVNPATH
+    echo build_SVNPATH=$build_SVNPATH
     echo MAKEVARS="${MAKEVARS[@]}"
     echo DRY_RUN="$DRY_RUN"
     echo PLDISTROTAGS="$PLDISTROTAGS"
-    echo TAGSRELEASE="$TAGSRELEASE"
-    echo -n "(might be unexpanded)"
-    echo WEBPATH="$WEBPATH"
-    if [ -d /vservers ] ; then
+    # this does not help, it's not yet set when we run show_env
+    #echo WEBPATH="$WEBPATH"
+    echo TESTBUILDURL="$TESTBUILDURL"
+    if in_root_context ; then
 	echo PLDISTROTAGS="$PLDISTROTAGS"
     else
-	echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file /build/$PLDISTROTAGS"
-	cat /build/$PLDISTROTAGS
-	echo "XXXXXXXXXXXXXXXXXXXX end tags definition"
+	if [ -f /build/$PLDISTROTAGS ] ; then
+	    echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file /build/$PLDISTROTAGS"
+	    cat /build/$PLDISTROTAGS
+	    echo "XXXXXXXXXXXXXXXXXXXX end tags definition"
+	else
+	    echo "XXXXXXXXXXXXXXXXXXXX Cannot find tags definition file /build/$PLDISTROTAGS, assuming remote pldistro"
+	fi
     fi
     set -x
 }
 
 function usage () {
-    echo "Usage: $COMMAND [option] make-targets"
+    echo "Usage: $COMMAND [option] [var=value...] make-targets"
     echo "This is $REVISION"
     echo "Supported options"
-    echo " -n dry-run : -n passed to make - vserver gets created though - no mail sent"
     echo " -f fcdistro - defaults to $DEFAULT_FCDISTRO"
     echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
     echo " -p personality - defaults to $DEFAULT_PERSONALITY"
     echo " -b base - defaults to $DEFAULT_BASE"
     echo "    @NAME@ replaced as appropriate"
+    echo " -o base: (overwrite) do not re-create vserver, re-use base instead"
+    echo "    the -f/-d/-t/-s/-p/-m options are uneffective in this case"
     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 " -o : overwrite - re-run in base directory, do not create vserver"
-    echo " -m mailto"
-    echo " -a makevar=value - space in values are not supported"
+    echo " -s svnpath - where to fetch the build module - defaults to $DEFAULT_build_SVNPATH"
+    echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
     echo " -w webpath - defaults to $DEFAULT_WEBPATH"
+    echo " -W testbuildurl - defaults to $DEFAULT_TESTBUILDURL"
+    echo " -y sign yum repo in webpath"
+    echo " -g path to gpg secring used to sign rpms.  Defaults to $DEFAULT_GPGPATH" 
+    echo " -u gpg email used in secring. Defaults to $DEFAULT_GPGUID"
+    echo " -m mailto - no default"
     echo " -B : run build only"
     echo " -T : run test only"
+    echo " -n dry-run : -n passed to make - vserver gets created though - no mail sent"
     echo " -v : be verbose"
     echo " -7 : uses weekday-@FCDISTRO@ as base"
+    echo " -i ifname - defaults to $DEFAULT_IFNAME - used to determine local IP"
     exit 1
 }
 
@@ -233,39 +366,54 @@ function main () {
 
     set -e
 
-    # preserve arguments for passing them again later
-    declare -a argv
-    for arg in "$@"; do argv=(${argv[@]} "$arg") ; done
-    
     # parse arguments
     MAKEVARS=()
+    MAKETARGETS=()
     DRY_RUN=
     DO_BUILD=true
     DO_TEST=true
-    while getopts "nf:d:b:p:t:r:s:om:a:w:BTvh7" opt ; do
+    SIGNYUMREPO=""
+    while getopts "f:d:p:b:o:t:s:x:c:w:W:g:u:m:BTnyv7i:" opt ; do
 	case $opt in
-	    n) DRY_RUN="-n" ;;
 	    f) FCDISTRO=$OPTARG ;;
 	    d) PLDISTRO=$OPTARG ;;
 	    p) PERSONALITY=$OPTARG ;;
 	    b) BASE=$OPTARG ;;
+	    o) OVERBASE=$OPTARG ;;
 	    t) PLDISTROTAGS=$OPTARG ;;
-	    r) TAGSRELEASE=$OPTARG ;;
-	    s) SVNPATH=$OPTARG ;;
-	    o) OVERWRITEMODE=true ;;
-	    m) MAILTO=$OPTARG ;;
-	    a) MAKEVARS=(${MAKEVARS[@]} "$OPTARG") ;;
+	    s) build_SVNPATH=$OPTARG ;;
+	    c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
 	    w) WEBPATH=$OPTARG ;;
+	    W) TESTBUILDURL=$OPTARG ;;
+            y) SIGNYUMREPO=true ;;
+            g) GPGPATH=$OPTARG ;;
+            u) GPGUID=$OPTARG ;;
+	    m) MAILTO=$OPTARG ;;
 	    B) DO_TEST= ;;
-	    T) DO_BUILD= ; OVERWRITEMODE=true ;;
+	    T) DO_BUILD= ;;
+	    n) DRY_RUN="-n" ;;
 	    v) set -x ;;
 	    7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
+	    i) IFNAME=$OPTARG ;;
 	    h|*) usage ;;
 	esac
     done
 	
-    shift $(($OPTIND - 1))
-    MAKETARGETS="$@"
+    # preserve options for passing them again later, together with expanded base
+    declare -a options
+    toshift=$(($OPTIND - 1))
+    arg=1; while [ $arg -le $toshift ] ; do options=(${options[@]} "$1") ; shift; arg=$(($arg+1)) ; done
+
+    # allow var=value stuff; 
+    for target in "$@" ; do
+	# check if contains '='
+	target1=$(echo $target | sed -e s,=,,)
+	if [ "$target" = "$target1" ] ; then
+	    MAKETARGETS=(${MAKETARGETS[@]} "$target")
+	else
+	    MAKEVARS=(${MAKEVARS[@]} "$target")
+	fi
+    done
     
     # set defaults
     [ -z "$FCDISTRO" ] && FCDISTRO=$DEFAULT_FCDISTRO
@@ -274,16 +422,39 @@ function main () {
     [ -z "$PLDISTROTAGS" ] && PLDISTROTAGS="${PLDISTRO}-tags.mk"
     [ -z "$BASE" ] && BASE="$DEFAULT_BASE"
     [ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
-    [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
+    [ -z "$TESTBUILDURL" ] && TESTBUILDURL="$DEFAULT_TESTBUILDURL"
+    [ -z "$GPGPATH" ] && GPGPATH="$DEFAULT_GPGPATH"
+    [ -z "$GPGUID" ] && GPGUID="$DEFAULT_GPGUID"
+    [ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
+    [ -z "$build_SVNPATH" ] && build_SVNPATH="$DEFAULT_build_SVNPATH"
+    [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
 
     [ -n "$DRY_RUN" ] && MAILTO=""
 	
-    ### set BASE from DISTRO, if unspecified
-    sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g -e s,@PERSONALITY@,${PERSONALITY},g"
-    BASE=$(echo ${BASE} | sed $sedargs)
-    WEBPATH=$(echo ${WEBPATH} | sed $sedargs)
+    if [ -n "$OVERBASE" ] ; then
+	sedargs="-e s,@DATE@,${DATE},g"
+	BASE=$(echo ${OVERBASE} | sed $sedargs)
+    else
+	sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g -e s,@PERSONALITY@,${PERSONALITY},g"
+	BASE=$(echo ${BASE} | sed $sedargs)
+    fi
 
-    if [ ! -d /vservers ] ; then
+    ### elaborate mail subject
+    if [ -n "$DO_BUILD" -a -n "$DO_TEST" ] ; then
+	MAIL_SUBJECT="complete"
+    elif [ -n "$DO_BUILD" ] ; then
+	MAIL_SUBJECT="package-only"
+    elif [ -n "$DO_TEST" ] ; then
+	MAIL_SUBJECT="test-only"
+    fi
+    if [ -n "$OVERBASE" ] ; then
+	MAIL_SUBJECT="$MAIL_SUBJECT incremental run on"
+    else
+	MAIL_SUBJECT="$MAIL_SUBJECT fresh build"
+    fi
+    MAIL_SUBJECT="$MAIL_SUBJECT ${BASE}"
+
+    if ! in_root_context ; then
         # in the vserver
 	echo "==================== Within vserver BEG $(date)"
 	build
@@ -296,7 +467,7 @@ function main () {
         # (*) copy this command in the vserver
         # (*) invoke it
 	
-	if [ -n "$OVERWRITEMODE" ] ; then
+	if [ -n "$OVERBASE" ] ; then
             ### Re-use a vserver (finish an unfinished build..)
 	    if [ ! -d /vservers/${BASE} ] ; then
 		echo $COMMAND : cannot find vserver $BASE
@@ -308,9 +479,19 @@ function main () {
 	    exec > $LOG 2>&1
 	    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
+	    # get environment from the first run 
+	    FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh)
+
+	    PLDISTRO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTRO)
+	    PLDISTROTAGS=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTROTAGS)
+	    build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH)
+	    PERSONALITY=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PERSONALITY)
+	    MAILTO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +MAILTO)
+	    show_env
 	else
 	    # create vserver: check it does not exist yet
 	    i=
@@ -335,15 +516,15 @@ function main () {
 
 	    ### extract the whole build - much simpler
 	    tmpdir=/tmp/$COMMAND-$$
-	    svn export $SVNPATH $tmpdir
+	    svn export $build_SVNPATH $tmpdir
             # Create vserver
 	    cd $tmpdir
-	    ./vbuild-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} ${BASE}
+	    ./vbuild-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${BASE} 
 	    # cleanup
 	    cd -
 	    rm -rf $tmpdir
 	    # Extract build again - in the vserver
-	    vserver ${BASE} exec svn checkout ${SVNPATH} /build
+	    vserver ${BASE} exec svn checkout ${build_SVNPATH} /build
 	fi
 	echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date)
 
@@ -359,20 +540,37 @@ function main () {
 	# redirect log again
 	exec >> $LOG 2>&1 
 
+	sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g -e s,@PERSONALITY@,${PERSONALITY},g"
+	WEBPATH=$(echo ${WEBPATH} | sed $sedargs)
+	mkdir -p ${WEBPATH}
+
+        # where to store the log for web access
+	WEBLOG=${WEBPATH}/${BASE}.log.txt
+        # compute the log URL - inserted in the mail messages for convenience
+	LOG_URL=$(echo ${WEBLOG} | sed -e "s,//,/,g" -e "s,/build/,${TESTBUILDURL},")
+	TESTLOGS_URL=$(echo ${WEBPATH}/${BASE}/testlogs | sed -e "s,//,/,g" -e "s,/build/,${TESTBUILDURL},")
+    
 	if [ -n "$DO_BUILD" ] ; then 
 
 	    cp $COMMANDPATH /vservers/${BASE}/build/
 
 	    # invoke this command in the vserver for building (-T)
 	    vserver ${BASE} exec chmod +x /build/$COMMAND
-	    vserver ${BASE} exec /build/$COMMAND "${argv[@]}" -b "${BASE}"
+	    vserver ${BASE} exec /build/$COMMAND "${options[@]}" -b "${BASE}" "${MAKEVARS[@]}" "${MAKETARGETS[@]}"
 	fi
 
 	# publish to the web so runtest can find them
 	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
+
+        # create yum repo and sign packages.
+	if [ -n "$SIGNYUMREPO" ] ; then
+	    sign_node_packages
+	fi
+
 	if [ -n "$DO_TEST" ] ; then 
 	    runtest
 	fi