X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=d33d83cbe954c58fb6393a836e010e35305c57c5;hb=835d0ec8b3f32d69b7cb8ac82a977e748236cf6e;hp=f97cad32163e3db5fd90ce6b5bf7c56b66da64b8;hpb=c59395f5ab6eb681637f18f11b7a2256a700247e;p=build.git diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh index f97cad32..d33d83cb 100755 --- a/vbuild-nightly.sh +++ b/vbuild-nightly.sh @@ -17,21 +17,24 @@ DEFAULT_GPGPATH="/etc/planetlab" # default email to use in gpg secring DEFAULT_GPGUID="root@$( /bin/hostname )" -# web publishing results -DEFAULT_WEBPATH="/build/@PLDISTRO@/" - -# for the test part DEFAULT_TESTCONFIG="default" + +# for publishing results, and the tests settings x=$(hostname) y=$(hostname|sed -e s,inria,,) # INRIA defaults if [ "$x" != "$y" ] ; then + DEFAULT_WEBPATH="/build/@PLDISTRO@/" DEFAULT_TESTBUILDURL="http://build.onelab.eu/" + # this is where the buildurl is pointing towards + DEFAULT_WEBROOT="/build/" DEFAULT_TESTMASTER="testmaster.onelab.eu" else + DEFAULT_WEBPATH="/build/@FCDISTRO@/@PLDISTRO@/" DEFAULT_TESTBUILDURL="http://build.planet-lab.org/" - ### xxx change as appropriate - DEFAULT_TESTMASTER="p-testmaster.onelab.eu" + # this is where the buildurl is pointing towards + DEFAULT_WEBROOT="/build/" + DEFAULT_TESTMASTER="manager.test.planet-lab.org" fi #################### @@ -49,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.*:runtest.*") +m_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*| \* .*|.*is not installed.*|.*PROPFIND.*|.*Starting.*:run_log.*") m_installing_any=re.compile('\r (Installing:[^\]]*]) ') m_installing_err=re.compile('\r (Installing:[^\]]*])(..+)') m_installing_end=re.compile('Installed:.*') @@ -115,13 +118,13 @@ function failure() { fi cp $LOG ${WEBLOG} summary $LOG >> ${WEBLOG} - (echo -n "============================== $COMMAND: failure at " ; date ; tail -c 30k $WEBLOG) > ${WEBLOG}.ko + (echo -n "============================== $COMMAND: failure at " ; date ; tail --lines=1000 $WEBLOG) > ${WEBLOG}.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}" ; \ - tail -c 30k ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT}" $MAILTO + tail --lines=1000 ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT} ${BASE} on $(hostname)" $MAILTO fi exit 1 } @@ -154,8 +157,11 @@ function success () { 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}" $MAILTO + | mail -s "Success with ${MAIL_SUBJECT} ${BASE} on $(hostname)" $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. + sleep 5 exit 0 } @@ -178,6 +184,9 @@ function build () { MAKEVARS=("build-SVNPATH=${build_SVNPATH}" "${MAKEVARS[@]}") MAKEVARS=("PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}") MAKEVARS=("MAILTO=${MAILTO}" "${MAKEVARS[@]}") + MAKEVARS=("WEBPATH=${WEBPATH}" "${MAKEVARS[@]}") + MAKEVARS=("TESTBUILDURL=${TESTBUILDURL}" "${MAKEVARS[@]}") + MAKEVARS=("WEBROOT=${WEBROOT}" "${MAKEVARS[@]}") MAKEVARS=("BASE=${BASE}" "${MAKEVARS[@]}") @@ -194,12 +203,12 @@ function build () { # this was formerly run in the myplc-devel chroot but now is run in the root context, # this is so that the .ssh config gets done manually, and once and for all -function runtest () { +function run_log () { set -x set -e trap failure ERR INT - echo -n "============================== Starting $COMMAND:runtest on $(date)" + echo -n "============================== Starting $COMMAND:run_log on $(date)" # where to find TESTS_SVNPATH stamp=/vservers/$BASE/build/tests_svnpath @@ -209,9 +218,7 @@ function runtest () { exit 1 fi TESTS_SVNPATH=$(cat $stamp) - # xxx - Thierry - need to rework the test framework in tests/system so it can work - # with the entire tests/ module checked out, rather than only tests/system/ - # ugly workaround for now + # don't need the tests fulltree anymore TESTS_SYSTEM_SVNPATH=${TESTS_SVNPATH}/system ### the URL to the RPMS/ location @@ -219,7 +226,9 @@ function runtest () { for a in i386 x86_64; do archdir=/vservers/$BASE/build/RPMS/$a if [ -d $archdir ] ; then - url=$(echo $archdir | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},") + # where was that installed + url=$(echo $archdir | sed -e "s,/vservers/${BASE}/build,${WEBPATH}/${BASE},") + url=$(echo $url | sed -e "s,${WEBROOT},${TESTBUILDURL},") break fi done @@ -238,8 +247,8 @@ function runtest () { 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 xxx above - ssh -n ${testmaster_ssh} svn co ${TESTS_SVNPATH} ${testdir}/tests +### # 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 # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh configs="" for config in ${TESTCONFIG} ; do @@ -249,7 +258,7 @@ function runtest () { # need to proceed despite of set -e success=true - ssh 2>&1 -n ${testmaster_ssh} ${testdir}/runtest --build ${build_SVNPATH} --url ${url} $configs $test_env --all || success= + ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${build_SVNPATH} --url ${url} $configs $test_env $VERBOSE --all || success= # gather logs in the vserver mkdir -p /vservers/$BASE/build/testlogs @@ -262,7 +271,7 @@ function runtest () { failure fi - echo -n "============================== End $COMMAND:runtest on $(date)" + echo -n "============================== End $COMMAND:run_log on $(date)" } function in_root_context () { @@ -345,6 +354,24 @@ function show_env () { set -x } +function setupssh () { + base=$1; shift + sshkey=$1; shift + + if [ -f ${sshkey} ] ; then + SSHDIR=/vservers/${base}/root/.ssh + mkdir -p ${SSHDIR} + cp $sshkey ${SSHDIR}/thekey + (echo "host *"; \ + echo " IdentityFile ~/.ssh/thekey"; \ + echo " StrictHostKeyChecking no" ) > ${SSHDIR}/config + chmod 700 ${SSHDIR} + chmod 400 ${SSHDIR}/* + else + echo "WARNING : could not find provided ssh key $sshkey - ignored" + fi +} + function usage () { echo "Usage: $COMMAND [option] [var=value...] make-targets" echo "This is $REVISION" @@ -362,15 +389,18 @@ function usage () { echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG" echo " -w webpath - defaults to $DEFAULT_WEBPATH" echo " -W testbuildurl - defaults to $DEFAULT_TESTBUILDURL" + 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 " -g path to gpg secring used to sign rpms. Defaults to $DEFAULT_GPGPATH" - echo " -u gpg email used in secring. Defaults to $DEFAULT_GPGUID" - echo " -B : run build only" - echo " -T : run test only" - echo " -n dry-run : -n passed to make - vserver gets created though - no mail sent" - echo " -v : be verbose" - echo " -7 : uses weekday-@FCDISTRO@ as base" + 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" + echo " -S - do not publish source rpms" + echo " -B - run build only" + echo " -T - run test only" + echo " -n - dry-run: -n passed to make - vserver gets created though - no mail sent" + echo " -v - be verbose" + echo " -7 - uses weekday-@FCDISTRO@ as base" echo " -i ifname - defaults to $DEFAULT_IFNAME - used to determine local IP" exit 1 } @@ -385,8 +415,10 @@ function main () { DRY_RUN= DO_BUILD=true DO_TEST=true + PUBLISH_SRPMS=true + SSH_KEY="" SIGNYUMREPO="" - while getopts "f:d:p:m:s:t:b:o:c:w:W:M:yg:u:BTnv7i:" opt ; do + 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 ;; @@ -399,14 +431,17 @@ function main () { 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 ;; + v) set -x ; VERBOSE="-v" ;; 7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;; i) IFNAME=$OPTARG ;; h|*) usage ;; @@ -437,6 +472,7 @@ function main () { [ -z "$BASE" ] && BASE="$DEFAULT_BASE" [ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH" [ -z "$TESTBUILDURL" ] && TESTBUILDURL="$DEFAULT_TESTBUILDURL" + [ -z "$WEBROOT" ] && WEBROOT="$DEFAULT_WEBROOT" [ -z "$GPGPATH" ] && GPGPATH="$DEFAULT_GPGPATH" [ -z "$GPGUID" ] && GPGUID="$DEFAULT_GPGUID" [ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME" @@ -467,7 +503,6 @@ function main () { else MAIL_SUBJECT="$MAIL_SUBJECT fresh build" fi - MAIL_SUBJECT="$MAIL_SUBJECT ${BASE}" if ! in_root_context ; then # in the vserver @@ -497,6 +532,7 @@ function main () { # 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 FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh) @@ -506,6 +542,9 @@ function main () { build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH) PERSONALITY=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PERSONALITY) MAILTO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +MAILTO) + WEBPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +WEBPATH) + TESTBUILDURL=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +TESTBUILDURL) + WEBROOT=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +WEBROOT) show_env else # create vserver: check it does not exist yet @@ -534,13 +573,15 @@ function main () { svn export $build_SVNPATH $tmpdir # Create vserver cd $tmpdir - ./vbuild-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${BASE} + ./vbuild-init-vserver.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${BASE} # cleanup cd - rm -rf $tmpdir # Extract build again - in the vserver + [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY} vserver ${BASE} exec svn checkout ${build_SVNPATH} /build fi + # install ssh key in vserver echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date) # The log inside the vserver contains everything @@ -562,11 +603,12 @@ function main () { # where to store the log for web access 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,/build/,${TESTBUILDURL},") - TESTLOGS_URL=$(echo ${WEBPATH}/${BASE}/testlogs | sed -e "s,//,/,g" -e "s,/build/,${TESTBUILDURL},") + 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},") if [ -n "$DO_BUILD" ] ; then + # invoke this command into the build directory of the vserver cp $COMMANDPATH /vservers/${BASE}/build/ # invoke this command in the vserver for building (-T) @@ -574,12 +616,13 @@ function main () { vserver ${BASE} exec /build/$COMMAND "${options[@]}" -b "${BASE}" "${MAKEVARS[@]}" "${MAKETARGETS[@]}" fi - # publish to the web so runtest can find them + # publish to the web so run_log can find them rm -rf $WEBPATH/$BASE ; mkdir -p $WEBPATH/$BASE/{RPMS,SRPMS} - rsync --archive --delete --verbose /vservers/$BASE/build/RPMS/ $WEBPATH/$BASE/RPMS/ - rsync --archive --delete --verbose /vservers/$BASE/build/SRPMS/ $WEBPATH/$BASE/SRPMS/ - # publish myplc-release - rsync --verbose /vservers/$BASE/build/myplc-release $WEBPATH/$BASE + rsync --archive --delete $VERBOSE /vservers/$BASE/build/RPMS/ $WEBPATH/$BASE/RPMS/ + [[ -n "$PUBLISH_SRPMS" ]] && rsync --archive --delete $VERBOSE /vservers/$BASE/build/SRPMS/ $WEBPATH/$BASE/SRPMS/ + # publish myplc-release if this exists + release=/vservers/$BASE/build/myplc-release + [ -f $release ] && rsync $VERBOSE $release $WEBPATH/$BASE # create yum repo and sign packages. if [ -n "$SIGNYUMREPO" ] ; then @@ -587,7 +630,7 @@ function main () { fi if [ -n "$DO_TEST" ] ; then - runtest + run_log fi success