X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=245dd6f6ca216efd7e1a2690c6d4d820500fa29a;hb=ba16b89d675282517dc4dec75a71a9b2c98a1f7a;hp=f1ed9641355461cff994082fea7d6d24c9c6ac5c;hpb=c9406ff2fc881788fea04c3b5204d98b4e8d138f;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index f1ed9641..245dd6f6 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -143,9 +143,9 @@ function failure() {
 	( \
 	    echo "Subject: KO ${BASE} ${MAIL_SUBJECT}" ; \
 	    echo "To: $MAILTO" ; \
-	    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 "see build results at        $WEBBASE_URL" ; \
+	    echo "including full build log at $WEBBASE_URL/log.txt" ; \
+	    echo "and complete test logs at   $WEBBASE_URL/testlogs" ; \
 	    echo "........................................" ; \
 	    webpublish tail --lines=1000 $WEBLOG ) | \
 	    sendmail $MAILTO
@@ -165,26 +165,31 @@ function success () {
     webpublish_cp_local_to_remote $LOG $WEBLOG
     summary $LOG | webpublish_append_stdin_to_file $WEBLOG
     if [ -n "$DO_TEST" ] ; then
+	short_message="PASS"
 	( \
 	    echo "Successfully built and tested" ; \
-	    echo "See full build log at $WEBBASE_URL/log.txt" ; \
-	    echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ; \
+	    echo "see build results at        $WEBBASE_URL" ; \
+	    echo "including full build log at $WEBBASE_URL/log.txt" ; \
+	    echo "and complete test logs at   $WEBBASE_URL/testlogs" ; \
 	    ) | webpublish_cp_stdin_to_file $WEBBASE.pass
 	webpublish rm -f $WEBBASE.pkg-ok $WEBBASE.ko
     else
+	short_message="PKGOK"
 	( \
 	    echo "Successful package-only build, no test requested" ; \
-	    echo "See full build log at $WEBBASE_URL/log.txt" ; \
+	    echo "see build results at        $WEBBASE_URL" ; \
+	    echo "including 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: PASS ${BASE} ${MAIL_SUBJECT}" ; \
+	    echo "Subject: $short_message ${BASE} ${MAIL_SUBJECT}" ; \
 	    echo "To: $MAILTO" ; \
 	    echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
-	    echo "See full build log at $WEBBASE_URL/log.txt" ; \
-            [ -n "$DO_TEST" ] && echo "See complete set of testlogs at $WEBBASE_URL/testlogs" ) \
+	    echo "see build results at        $WEBBASE_URL" ; \
+	    echo "including full build log at $WEBBASE_URL/log.txt" ; \
+            [ -n "$DO_TEST" ] && echo "and complete test logs at   $WEBBASE_URL/testlogs" ) \
 	    | sendmail $MAILTO
     fi
     # XXX For some reason, we haven't been getting this email for successful builds. If this sleep