X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=22c90ae95aa916e3aae38c12ea1d529531127f58;hb=30c6b37639292d9aa46aeedf208c8e57dc39f1b4;hp=997ce64206b81322cf6bfe5a92a4c82caa575768;hpb=3206f52df51291a95a6c55989adbc86bf3891a0c;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 997ce642..22c90ae9 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -109,10 +109,8 @@ EOF
 
 ### we might build on a box other than the actual web server
 # utilities for handling the pushed material (rpms, logfiles, ...)
-function webpublish_misses_dir () { ssh root@${WEBHOST} bash -c "test ! -d $1" ; }
-function webpublish_remote () { ssh root@${WEBHOST} "$@" ; }
-function webpublish_mkdir () { webpublish_remote mkdir "$@" ; }
-function webpublish_rm () { webpublish_remote rm "$@" ; }
+function webpublish_misses_dir () { ssh root@${WEBHOST}  "bash -c \"test \! -d $1\"" ; }
+function webpublish () { ssh root@${WEBHOST} "$@" ; }
 function webpublish_rsync_dir () { rsync --archive --delete $VERBOSE $1 root@${WEBHOST}:$2 ; }
 function webpublish_rsync_file () { rsync $VERBOSE $1 root@${WEBHOST}:$2 ; }
 function webpublish_cp_local_to_remote () { scp $1 root@${WEBHOST}:$2 ; }
@@ -123,23 +121,27 @@ function webpublish_append_stdin_to_file () { ssh root@${WEBHOST} cat \>\> $1; }
 function failure() {
     set -x
     # early stage ? - let's not create /build/@PLDISTRO@
-    if webpublish_misses_dir ${WEBPATH} ; then
+    if webpublish_misses_dir $WEBPATH ; then
 	WEBHOST=localhost
 	WEBPATH=/tmp
-	WEBLOG=/tmp/vbuild-early.log.txt
+	WEBBASE=/tmp/vbuild-early-$(date +%Y-%m-%d)
+	WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
     fi
-    webpublish_cp_local_to_remote $LOG ${WEBLOG}
-    summary $LOG | webpublish_append_stdin_to_file ${WEBLOG}
+    webpublish mkdir -p $WEBBASE ||:
+    webpublish_cp_local_to_remote $LOG $WEBLOG ||:
+    summary $LOG | webpublish_append_stdin_to_file $WEBLOG ||:
     (echo -n "============================== $COMMAND: failure at " ; date ; \
-	webpublish_remote tail --lines=1000 $WEBLOG) | \
-	webpublish_cp_stdin_to_file ${WEBLOG}.ko
+	webpublish tail --lines=1000 $WEBLOG) | \
+	webpublish_cp_stdin_to_file $WEBBASE.ko ||:
     if [ -n "$MAILTO" ] ; then
 	( \
-	    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}" ; \
-	    webpublish_remote tail --lines=1000 ${WEBLOG} ) | \
-	    mail -s "Failures with ${MAIL_SUBJECT} ${BASE} on $(hostname)" $MAILTO
+	    echo "Subject: Failures with $MAIL_SUBJECT $BASE on $(hostname)" ; \
+	    echo "See full build log at $WEBBASE_URL/log.txt" ; \
+	    echo "and tail version at $WEBBASE_URL.ko" ; \
+	    echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ; \
+	    echo "........................................" ; \
+	    webpublish tail --lines=1000 $WEBLOG ) | \
+	    sendmail $MAILTO
     fi
     exit 1
 }
@@ -152,28 +154,30 @@ function success () {
 	WEBPATH=/tmp
 	WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
     fi
-    webpublish_cp_local_to_remote $LOG ${WEBLOG}
-    summary $LOG | webpublish_append_stdin_to_file ${WEBLOG}
+    webpublish mkdir -p $WEBBASE
+    webpublish_cp_local_to_remote $LOG $WEBLOG
+    summary $LOG | webpublish_append_stdin_to_file $WEBLOG
     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}" ; \
-	    ) | webpublish_cp_stdin_to_file ${WEBLOG}.pass
-	webpublish_rm -f ${WEBLOG}.pkg-ok ${WEBLOG}.ko
+	    echo "See full build log at $WEBBASE_URL/log.txt" ; \
+	    echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ; \
+	    ) | webpublish_cp_stdin_to_file $WEBBASE.pass
+	webpublish rm -f $WEBBASE.pkg-ok $WEBBASE.ko
     else
 	( \
 	    echo "Successful package-only build, no test requested" ; \
-	    echo "See full build log at ${LOG_URL}" ; \
-	    ) | webpublish_cp_stdin_to_file ${WEBLOG}.pkg-ok
-	webpublish_rm -f ${WEBLOG}.ko
+	    echo "See full build log at $WEBBASE_URL/log.txt" ; \
+	    ) | webpublish_cp_stdin_to_file $WEBBASE.pkg-ok
+	webpublish rm -f $WEBBASE.ko
     fi
     if [ -n "$MAILTO" ] ; then
 	( \
+	    echo "Subject: Success with ${MAIL_SUBJECT} ${BASE} on $(hostname)" ; \
 	    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} ${BASE} on $(hostname)" $MAILTO
+	    echo "See full build log at $WEBBASE_URL/log.txt" ; \
+            [ -n "$DO_TEST" ] && echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ) \
+	    | sendmail $MAILTO
     fi
     # XXX For some reason, we haven't been getting this email for successful builds. If this sleep
     # doesn't fix the problem, I'll remove it -- Sapan.
@@ -279,12 +283,13 @@ function run_log () {
 
     # gather logs in the vserver
     mkdir -p /vservers/$BASE/build/testlogs
-    ssh 2>&1 -n ${testmaster_ssh} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || true
+    ssh 2>&1 -n ${testmaster_ssh} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || :
     # push them to the build web
     chmod -R a+r /vservers/$BASE/build/testlogs/
     webpublish_rsync_dir /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/
 
     if [ -z "$success" ] ; then
+	echo "Tests have failed - bailing out"
 	failure
     fi
     
@@ -559,6 +564,8 @@ function main () {
 	    # update build
 	    [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY}
 	    vserver ${BASE} exec svn update /build
+	    # make sure we refresh the tests place in case it has changed
+	    rm -f /build/tests_svnpath
 	    # get environment from the first run 
 	    FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh)
 	    # retrieve all in one run
@@ -628,13 +635,13 @@ function main () {
 
 	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)
-	webpublish_mkdir -p ${WEBPATH}
+	webpublish mkdir -p ${WEBPATH}
 
         # where to store the log for web access
-	WEBLOG=${WEBPATH}/${BASE}.log.txt
+	WEBBASE=${WEBPATH}/${BASE}
+	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,${WEBROOT},${TESTBUILDURL},")
-	TESTLOGS_URL=$(echo ${WEBPATH}/${BASE}/testlogs | sed -e "s,//,/,g" -e "s,${WEBROOT},${TESTBUILDURL},")
+	WEBBASE_URL=$(echo $WEBBASE | sed -e "s,//,/,g" -e "s,${WEBROOT},${TESTBUILDURL},")
     
 	if [ -n "$DO_BUILD" ] ; then 
 
@@ -647,17 +654,20 @@ function main () {
 	fi
 
 	# publish to the web so run_log can find them
-	webpublish_rm -rf $WEBPATH/$BASE ; webpublish_mkdir -p $WEBPATH/$BASE/{RPMS,SRPMS}
+	set +e
+	webpublish rm -rf $WEBPATH/$BASE 
+	webpublish mkdir -p $WEBPATH/$BASE/{RPMS,SRPMS}
 	webpublish_rsync_dir /vservers/$BASE/build/RPMS/ $WEBPATH/$BASE/RPMS/
 	[[ -n "$PUBLISH_SRPMS" ]] && webpublish_rsync_dir /vservers/$BASE/build/SRPMS/ $WEBPATH/$BASE/SRPMS/
 	# publish myplc-release if this exists
 	release=/vservers/$BASE/build/myplc-release
 	[ -f $release ] && webpublish_rsync_file $release $WEBPATH/$BASE
+	set -e
 
         # create yum repo and sign packages.
 	if [ -n "$SIGNYUMREPO" ] ; then
 	    # this script does not yet support signing on a remote (webhost) repo
-	    sign_here=$(hostname) ; sign_web=$(webpublish_remote hostname)
+	    sign_here=$(hostname) ; sign_web=$(webpublish hostname)
 	    if [ "$hostname" = "$sign_here" ] ; then
 		sign_node_packages
 	    else