deprecate never-used -r option

[build.git] / vbuild-nightly.sh

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index ca966f5..0516c1b 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -111,7 +111,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}" $MAILTO
     fi
     exit 1
 }
@@ -121,7 +121,7 @@ function success () {
     # early stage ? - let's not create /build/@PLDISTRO@
     if [ ! -d ${WEBPATH} ] ; then
        WEBPATH=/tmp
-       WEBLOG=/tmp/vbuild-early.log.txt
+       WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
     fi
     cp $LOG ${WEBLOG}
     summary $LOG >> ${WEBLOG}
@@ -131,12 +131,13 @@ function success () {
            echo "See full build log at ${LOG_URL}" ; \
            echo "See complete set of testlogs at ${TESTLOGS_URL}" ; \
            ) > ${WEBLOG}.pass
-       rm -f ${WEBLOG}.ok ${WEBLOG}.ko
+       rm -f ${WEBLOG}.pkg-ok ${WEBLOG}.ko
     else
        ( \
-           echo "Successfully built, no test requested" ; \
+           echo "Successful package-only build, no test requested" ; \
            echo "See full build log at ${LOG_URL}" ; \
-           ) > ${WEBLOG}.ok
+           ) > ${WEBLOG}.pkg-ok
+       rm -f ${WEBLOG}.ko
     fi
     if [ -n "$MAILTO" ] ; then
        ( \
@@ -157,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)"
@@ -320,7 +316,6 @@ function show_env () {
     echo MAKEVARS="${MAKEVARS[@]}"
     echo DRY_RUN="$DRY_RUN"
     echo PLDISTROTAGS="$PLDISTROTAGS"
-    echo TAGSRELEASE="$TAGSRELEASE"
     # this does not help, it's not yet set when we run show_env
     #echo WEBPATH="$WEBPATH"
     echo TESTBUILDURL="$TESTBUILDURL"
@@ -350,7 +345,6 @@ function usage () {
     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 - defaults to $DEFAULT_build_SVNPATH"
     echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
     echo " -w webpath - defaults to $DEFAULT_WEBPATH"
@@ -379,7 +373,7 @@ function main () {
     DO_BUILD=true
     DO_TEST=true
     SIGNYUMREPO=""
-    while getopts "f:d:p:b:o:t:r:s:x:c:w:W:g:u:m:BTnyv7i:" opt ; do
+    while getopts "f:d:p:b:o:t:s:x:c:w:W:g:u:m:BTnyv7i:" opt ; do
        case $opt in
            f) FCDISTRO=$OPTARG ;;
            d) PLDISTRO=$OPTARG ;;
@@ -387,7 +381,6 @@ function main () {
            b) BASE=$OPTARG ;;
            o) OVERBASE=$OPTARG ;;
            t) PLDISTROTAGS=$OPTARG ;;
-           r) TAGSRELEASE=$OPTARG ;;
            s) build_SVNPATH=$OPTARG ;;
            c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
            w) WEBPATH=$OPTARG ;;