Tagging module MyPLC - MyPLC-4.3-9

[build.git] / vbuild-nightly.sh

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index f97cad3..cccc229 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -21,17 +21,18 @@ DEFAULT_GPGUID="root@$( /bin/hostname )"
 DEFAULT_WEBPATH="/build/@PLDISTRO@/"
 
 # for the test part
-DEFAULT_TESTCONFIG="default"
 x=$(hostname)
 y=$(hostname|sed -e s,inria,,)
 # INRIA defaults
 if [ "$x" != "$y" ] ; then
     DEFAULT_TESTBUILDURL="http://build.onelab.eu/"
     DEFAULT_TESTMASTER="testmaster.onelab.eu"
+    DEFAULT_TESTCONFIG="1default"
 else
     DEFAULT_TESTBUILDURL="http://build.planet-lab.org/"
     ### xxx change as appropriate
     DEFAULT_TESTMASTER="p-testmaster.onelab.eu"
+    DEFAULT_TESTCONFIG="pdefault"
 fi    
 
 ####################
@@ -121,7 +122,7 @@ function failure() {
            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
+           tail -c 30k ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT} ${BASE}" $MAILTO
     fi
     exit 1
 }
@@ -154,7 +155,7 @@ function success () {
            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
+           | mail -s "Success with ${MAIL_SUBJECT} ${BASE}" $MAILTO
     fi
     exit 0
 }
@@ -467,7 +468,6 @@ function main () {
     else
        MAIL_SUBJECT="$MAIL_SUBJECT fresh build"
     fi
-    MAIL_SUBJECT="$MAIL_SUBJECT ${BASE}"
 
     if ! in_root_context ; then
         # in the vserver