X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=7ee1aefc4cf517ccb7a3cda45e338622e56d70a6;hb=refs%2Fheads%2Fcoblitz;hp=9d1175236002bcd469868586e4e6599c1ce0f17e;hpb=8800ac8db9d32e6aaf7ab34b4f3fa8e94010132b;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 9d117523..7ee1aefc 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -18,6 +18,8 @@ DEFAULT_GPGPATH="/etc/planetlab"
 DEFAULT_GPGUID="root@$( /bin/hostname )"
 
 DEFAULT_TESTCONFIG="default"
+# for passing args to run_log
+RUN_LOG_EXTRAS=""
 
 # for publishing results, and the tests settings
 x=$(hostname)
@@ -135,7 +137,7 @@ function failure() {
 	webpublish_cp_stdin_to_file $WEBBASE.ko ||:
     if [ -n "$MAILTO" ] ; then
 	( \
-	    echo "Subject: Failures with $MAIL_SUBJECT $BASE on $(hostname)" ; \
+	    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" ; \
@@ -174,7 +176,7 @@ function success () {
     fi
     if [ -n "$MAILTO" ] ; then
 	( \
-	    echo "Subject: Success with ${MAIL_SUBJECT} ${BASE} on $(hostname)" ; \
+	    echo "Subject: PASS ${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" ; \
@@ -216,6 +218,9 @@ function build () {
 
     MAKEVARS=("BASE=${BASE}" "${MAKEVARS[@]}")
 
+    # initialize latex
+    /build/latex-first-run.sh || :
+
     # stage1
     make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true 
     # versions
@@ -270,16 +275,12 @@ function run_log () {
     rsync --verbose --archive /vservers/$BASE/build/MODULES/build ${testmaster_ssh}:${BASE}/
 
     # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
-    configs=""
-    for config in ${TESTCONFIG} ; do
-	configs="$configs --config $config"
-    done
-    test_env="-p $PERSONALITY -d $PLDISTRO -f $FCDISTRO"
+    run_log_env="-p $PERSONALITY -d $PLDISTRO -f $FCDISTRO"
 
     # need to proceed despite of set -e
     success=true
     # passing the build_scm_url should not be needed anymore
-    ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${BUILD_SCM_URL} --url ${url} $configs $test_env $VERBOSE --all || success=
+    ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${BUILD_SCM_URL} --url ${url} $run_log_env $RUN_LOG_EXTRAS $VERBOSE --all || success=
 
     # gather logs in the build vserver
     mkdir -p /vservers/$BASE/build/testlogs
@@ -407,17 +408,20 @@ function usage () {
     echo " -p personality - defaults to $DEFAULT_PERSONALITY"
     echo " -m mailto - no default"
     echo " -s build_scm_url - git or svn URL where to fetch the build module - defaults to $DEFAULT_BUILD_SCM_URL"
+    echo "    define GIT tag or branch name appending @tagname to url"
     echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk"
     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/-p/-m/-s/-t options are uneffective in this case"
     echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
+    echo " -y {pl,pg} - passed to run_log"
+    echo " -x <run_log_args> - a hook to pass arguments to run_log"
     echo " -w webpath - defaults to $DEFAULT_WEBPATH"
     echo " -W testbuildurl - defaults to $DEFAULT_TESTBUILDURL; this is also used to get the hostname where to publish builds"
     echo " -r webroot - defaults to $DEFAULT_WEBROOT - the fs point where testbuildurl actually sits"
     echo " -M testmaster - defaults to $DEFAULT_TESTMASTER"
-    echo " -y - sign yum repo in webpath"
+    echo " -Y - sign yum repo in webpath"
     echo " -g gpg_path - to the gpg secring used to sign rpms.  Defaults to $DEFAULT_GPGPATH" 
     echo " -u gpg_uid - email used in secring. Defaults to $DEFAULT_GPGUID"
     echo " -K svnsshkey - specify key to use when svn+ssh:// URLs are used for SVNPATH"
@@ -428,6 +432,7 @@ function usage () {
     echo " -v - be verbose"
     echo " -7 - uses weekday-@FCDISTRO@ as base"
     echo " -i ifname - defaults to $DEFAULT_IFNAME - used to determine local IP"
+    echo " --build-branch branch - build using the branch from build module"
     exit 1
 }
 
@@ -444,40 +449,49 @@ function main () {
     PUBLISH_SRPMS=true
     SSH_KEY=""
     SIGNYUMREPO=""
-    while getopts "f:d:p:m:s:t:b:o:c:w:W:r:M:yg:u:K:SBTnv7i:" opt ; do
-	case $opt in
-	    f) FCDISTRO=$OPTARG ;;
-	    d) PLDISTRO=$OPTARG ;;
-	    p) PERSONALITY=$OPTARG ;;
-	    m) MAILTO=$OPTARG ;;
-	    s) BUILD_SCM_URL=$OPTARG ;;
-	    t) PLDISTROTAGS=$OPTARG ;;
-	    b) BASE=$OPTARG ;;
-	    o) OVERBASE=$OPTARG ;;
-	    c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
-	    w) WEBPATH=$OPTARG ;;
-	    W) TESTBUILDURL=$OPTARG ;;
-	    r) WEBROOT=$OPTARG ;;
-	    M) TESTMASTER=$OPTARG ;;
-            y) SIGNYUMREPO=true ;;
-            g) GPGPATH=$OPTARG ;;
-            u) GPGUID=$OPTARG ;;
-	    K) SSH_KEY=$OPTARG ;;
-	    S) PUBLISH_SRPMS="" ;;
-	    B) DO_TEST= ;;
-	    T) DO_BUILD= ;;
-	    n) DRY_RUN="-n" ;;
-	    v) set -x ; VERBOSE="-v" ;;
-	    7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
-	    i) IFNAME=$OPTARG ;;
-	    h|*) usage ;;
+
+    OPTS_ORIG=$@
+    OPTS=$(getopt -o "f:d:p:m:s:t:b:o:c:y:x:w:W:r:M:Yg:u:K:SBTnv7i:h" -l "build-branch:" -- $@)
+    if [ $? != 0 ]
+    then
+        usage
+    fi
+    eval set -- "$OPTS"
+    while true; do
+	case $1 in
+	    -f) FCDISTRO=$2; shift 2 ;;
+	    -d) PLDISTRO=$2; shift 2 ;;
+	    -p) PERSONALITY=$2; shift 2 ;;
+	    -m) MAILTO=$2; shift 2 ;;
+	    -s) BUILD_SCM_URL=$2; shift 2 ;;
+	    -t) PLDISTROTAGS=$2; shift 2 ;;
+	    -b) BASE=$2; shift 2 ;;
+	    -o) OVERBASE=$2; shift 2 ;;
+	    -c) TESTCONFIG="$TESTCONFIG $2"; shift 2 ;;
+	    -y) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS -y $2"; shift 2 ;;
+	    -x) RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS $2"; shift 2;;
+	    -w) WEBPATH=$2; shift 2 ;;
+	    -W) TESTBUILDURL=$2; shift 2 ;;
+	    -r) WEBROOT=$2; shift 2 ;;
+	    -M) TESTMASTER=$2; shift 2 ;;
+            -Y) SIGNYUMREPO=true; shift ;;
+            -g) GPGPATH=$2; shift 2 ;;
+            -u) GPGUID=$2; shift 2 ;;
+	    -K) SSH_KEY=$2; shift 2 ;;
+	    -S) PUBLISH_SRPMS="" ; shift ;;
+	    -B) DO_TEST= ; shift ;;
+	    -T) DO_BUILD= ; shift;;
+	    -n) DRY_RUN="-n" ; shift ;;
+	    -v) set -x ; VERBOSE="-v" ; shift ;;
+	    -7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ; shift ;;
+	    -i) IFNAME=$2; shift 2 ;;
+	    -h) usage ; shift ;;
+            --) shift; break ;;
 	esac
     done
-	
+
     # 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
+    options=$OPTS_ORIG
 
     # allow var=value stuff; 
     for target in "$@" ; do
@@ -507,6 +521,12 @@ function main () {
     [ -z "$TESTMASTER" ] && TESTMASTER="$DEFAULT_TESTMASTER"
 
     [ -n "$DRY_RUN" ] && MAILTO=""
+
+    # elaborate the extra args to be passed to run_log
+    for config in ${TESTCONFIG} ; do
+	RUN_LOG_EXTRAS="$RUN_LOG_EXTRAS --config $config"
+    done
+    
 	
     if [ -n "$OVERBASE" ] ; then
 	sedargs="-e s,@DATE@,${DATE},g"
@@ -518,17 +538,19 @@ function main () {
 
     ### elaborate mail subject
     if [ -n "$DO_BUILD" -a -n "$DO_TEST" ] ; then
-	MAIL_SUBJECT="complete"
+	MAIL_SUBJECT="full"
     elif [ -n "$DO_BUILD" ] ; then
-	MAIL_SUBJECT="package-only"
+	MAIL_SUBJECT="pkg-only"
     elif [ -n "$DO_TEST" ] ; then
 	MAIL_SUBJECT="test-only"
     fi
     if [ -n "$OVERBASE" ] ; then
-	MAIL_SUBJECT="$MAIL_SUBJECT incremental run on"
+	MAIL_SUBJECT="${MAIL_SUBJECT} rerun"
     else
-	MAIL_SUBJECT="$MAIL_SUBJECT fresh build"
+	MAIL_SUBJECT="${MAIL_SUBJECT} fresh"
     fi
+    short_hostname=$(hostname | cut -d. -f1)
+    MAIL_SUBJECT="on ${short_hostname} - ${MAIL_SUBJECT}"
 
     ### compute WEBHOST from TESTBUILDURL 
     # this is to avoid having to change the builds configs everywhere