X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=5ee38d9a3f386f46d7548218c493168f74b2722f;hb=f5cab4881fdf442e53eca4b697753f440e937e00;hp=997ce64206b81322cf6bfe5a92a4c82caa575768;hpb=3206f52df51291a95a6c55989adbc86bf3891a0c;p=build.git diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh index 997ce642..5ee38d9a 100755 --- a/vbuild-nightly.sh +++ b/vbuild-nightly.sh @@ -1,5 +1,5 @@ #!/bin/bash -REVISION=$(echo '$Revision$' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' ) +REVISION=$(echo '$Revision: 18120 $' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' ) COMMANDPATH=$0 COMMAND=$(basename $0) @@ -9,7 +9,7 @@ DEFAULT_FCDISTRO=centos5 DEFAULT_PLDISTRO=planetlab DEFAULT_PERSONALITY=linux32 DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@" -DEFAULT_build_SVNPATH="http://svn.planet-lab.org/svn/build/trunk" +DEFAULT_BUILD_SCM_URL="git://git.onelab.eu/build" DEFAULT_IFNAME=eth0 # default gpg path used in signing yum repo @@ -52,7 +52,7 @@ function summary () { # read a full log and tries to extract the interesting stuff import sys,re -m_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*| \* .*|.*is not installed.*|.*PROPFIND.*|.*Starting.*:run_log.*") +m_show_line=re.compile(".* (BEG|END) (RPM|VSERVER).*|.*'boot'.*|\* .*| \* .*|.*is not installed.*|.*PROPFIND.*|.* (BEG|END).*:run_log.*|.* Within vserver (BEG|END) .*|.* MAIN (BEG|END).*") m_installing_any=re.compile('\r (Installing:[^\]]*]) ') m_installing_err=re.compile('\r (Installing:[^\]]*])(..+)') m_installing_end=re.compile('Installed:.*') @@ -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 test -z "$WEBLOG" ; 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 } @@ -147,33 +149,35 @@ function failure() { function success () { set -x # early stage ? - let's not create /build/@PLDISTRO@ - if webpublish_misses_dir ${WEBPATH} ; then + if test -z "$WEBLOG" ; then WEBHOST=localhost 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. @@ -195,9 +199,13 @@ function build () { echo "Running make IN $(pwd)" # stuff our own variable settings + if echo $BUILD_SCM_URL | grep -q git ; then + MAKEVARS=("build-GITPATH=${BUILD_SCM_URL}" "${MAKEVARS[@]}") + else + MAKEVARS=("build-SVNPATH=${BUILD_SCM_URL}" "${MAKEVARS[@]}") + fi MAKEVARS=("PLDISTRO=${PLDISTRO}" "${MAKEVARS[@]}") MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}") - MAKEVARS=("build-SVNPATH=${build_SVNPATH}" "${MAKEVARS[@]}") MAKEVARS=("PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}") MAKEVARS=("MAILTO=${MAILTO}" "${MAKEVARS[@]}") MAKEVARS=("WEBPATH=${WEBPATH}" "${MAKEVARS[@]}") @@ -208,8 +216,6 @@ function build () { # stage1 make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true - # store tests_svnpath - make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true tests_svnpath # versions make -C /build $DRY_RUN "${MAKEVARS[@]}" versions # actual stuff @@ -224,18 +230,7 @@ function run_log () { set -e trap failure ERR INT - echo -n "============================== Starting $COMMAND:run_log on $(date)" - - # where to find TESTS_SVNPATH - stamp=/vservers/$BASE/build/tests_svnpath - if [ ! -f $stamp ] ; then - echo "$COMMAND: Cannot figure TESTS_SVNPATH from missing $stamp" - failure - exit 1 - fi - TESTS_SVNPATH=$(cat $stamp) - # don't need the tests fulltree anymore - TESTS_SYSTEM_SVNPATH=${TESTS_SVNPATH}/system + echo "============================== BEG $COMMAND:run_log on $(date)" ### the URL to the RPMS/ location # f12 now has everything in i686; try i386 first as older fedoras have both @@ -260,12 +255,18 @@ function run_log () { # test directory name on test box testdir=${BASE} + # clean it - ssh -n ${testmaster_ssh} rm -rf ${testdir} - # check it out - ssh -n ${testmaster_ssh} svn co ${TESTS_SYSTEM_SVNPATH} ${testdir} -### # check out the entire tests/ module (with system/ duplicated) as a subdir - see fulltree above -### ssh -n ${testmaster_ssh} svn co ${TESTS_SVNPATH} ${testdir}/tests + ssh -n ${testmaster_ssh} rm -rf ${testdir} ${testdir}.git + + # check it out in the build + vserver $BASE exec make -C /build tests-module + + # push it onto the testmaster - just the 'system' subdir is enough + rsync --verbose --archive /vservers/$BASE/build/MODULES/tests/system/ ${testmaster_ssh}:${BASE} + # toss the build in the bargain, so the tests don't need to mess with extracting it + 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 @@ -275,20 +276,23 @@ function run_log () { # need to proceed despite of set -e success=true - ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${build_SVNPATH} --url ${url} $configs $test_env $VERBOSE --all || success= + # 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= - # gather logs in the vserver + # gather logs in the build 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 + rsync --verbose --archive ${testmaster_ssh}:$BASE/logs/ /vservers/$BASE/build/testlogs # push them to the build web chmod -R a+r /vservers/$BASE/build/testlogs/ webpublish_rsync_dir /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/ + echo "============================== END $COMMAND:run_log on $(date)" + if [ -z "$success" ] ; then + echo "Tests have failed - bailing out" failure fi - echo -n "============================== End $COMMAND:run_log on $(date)" } function in_root_context () { @@ -352,7 +356,7 @@ function show_env () { echo PLDISTRO=$PLDISTRO echo PERSONALITY=$PERSONALITY echo BASE=$BASE - echo build_SVNPATH=$build_SVNPATH + echo BUILD_SCM_URL=$BUILD_SCM_URL echo MAKEVARS="${MAKEVARS[@]}" echo DRY_RUN="$DRY_RUN" echo PLDISTROTAGS="$PLDISTROTAGS" @@ -400,7 +404,7 @@ function usage () { echo " -d pldistro - defaults to $DEFAULT_PLDISTRO" echo " -p personality - defaults to $DEFAULT_PERSONALITY" echo " -m mailto - no default" - echo " -s svnpath - where to fetch the build module - defaults to $DEFAULT_build_SVNPATH" + echo " -s build_scm_url - git or svn URL where to fetch the build module - defaults to $DEFAULT_BUILD_SCM_URL" echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk" echo " -b base - defaults to $DEFAULT_BASE" echo " @NAME@ replaced as appropriate" @@ -444,7 +448,7 @@ function main () { d) PLDISTRO=$OPTARG ;; p) PERSONALITY=$OPTARG ;; m) MAILTO=$OPTARG ;; - s) build_SVNPATH=$OPTARG ;; + s) BUILD_SCM_URL=$OPTARG ;; t) PLDISTROTAGS=$OPTARG ;; b) BASE=$OPTARG ;; o) OVERBASE=$OPTARG ;; @@ -496,7 +500,7 @@ function main () { [ -z "$GPGPATH" ] && GPGPATH="$DEFAULT_GPGPATH" [ -z "$GPGUID" ] && GPGUID="$DEFAULT_GPGUID" [ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME" - [ -z "$build_SVNPATH" ] && build_SVNPATH="$DEFAULT_build_SVNPATH" + [ -z "$BUILD_SCM_URL" ] && BUILD_SCM_URL="$DEFAULT_BUILD_SCM_URL" [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG" [ -z "$TESTMASTER" ] && TESTMASTER="$DEFAULT_TESTMASTER" @@ -556,20 +560,25 @@ function main () { echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date) # start in case e.g. we just rebooted vserver ${BASE} start || : - # update build - [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY} - vserver ${BASE} exec svn update /build - # get environment from the first run + # retrieve environment from the previous run FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh) - # retrieve all in one run + BUILD_SCM_URL=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH +build-GITPATH) + # for efficiency, crop everything in one make run tmp=/tmp/${BASE}-env.sh vserver ${BASE} exec make --no-print-directory -C /build stage1=skip \ ++PLDISTRO ++PLDISTROTAGS ++PERSONALITY ++MAILTO ++WEBPATH ++TESTBUILDURL ++WEBROOT > $tmp - # sh vars cannot have a minus - echo build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH) >> $tmp . $tmp rm -f $tmp - options=(${options[@]} -d $PLDISTRO -t $PLDISTROTAGS -s $build_SVNPATH) + # update build + [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY} + if echo $BUILD_SCM_URL | grep -q git ; then + vserver $BASE exec bash -c "cd /build; git pull; make tests-clean" + else + vserver $BASE exec svn update /build + fi + # make sure we refresh the tests place in case it has changed + rm -f /build/MODULES/tests + options=(${options[@]} -d $PLDISTRO -t $PLDISTROTAGS -s $BUILD_SCM_URL) [ -n "$PERSONALITY" ] && options=(${options[@]} -p $PERSONALITY) [ -n "$MAILTO" ] && options=(${options[@]} -m $MAILTO) [ -n "$WEBPATH" ] && options=(${options[@]} -w $WEBPATH) @@ -600,7 +609,14 @@ function main () { ### extract the whole build - much simpler tmpdir=/tmp/$COMMAND-$$ - svn export $build_SVNPATH $tmpdir + if echo $BUILD_SCM_URL | grep -q git ; then + GIT_REPO=$(echo $BUILD_SCM_URL | cut -d@ -f1) + GIT_TAG=$(echo $BUILD_SCM_URL | cut -s -d@ -f2) + GIT_TAG=${GIT_TAG:-master} + mkdir -p $tmpdir; git archive --remote=$GIT_REPO $GIT_TAG | tar -C $tmpdir -xf - + else + svn export $BUILD_SCM_URL $tmpdir + fi # Create vserver cd $tmpdir ./vbuild-init-vserver.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${BASE} @@ -609,7 +625,11 @@ function main () { rm -rf $tmpdir # Extract build again - in the vserver [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY} - vserver ${BASE} exec svn checkout ${build_SVNPATH} /build + if echo $BUILD_SCM_URL | grep -q git ; then + vserver $BASE exec bash -c "git clone $GIT_REPO /build; cd /build; git checkout $GIT_TAG" + else + vserver $BASE exec svn checkout ${BUILD_SCM_URL} /build + fi fi # install ssh key in vserver echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date) @@ -628,13 +648,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 +667,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 @@ -672,7 +695,8 @@ function main () { fi success - + + echo "==================== MAIN END $(date)" fi }