X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=642fea8efc7c443fe0bc619b2bfb436e3e7bde6d;hb=6d797cad3398801f590e8343f2d3690f76d70d98;hp=d9e8710cf9f34b86dacda1869cb334230ff089f1;hpb=1e127f524176c5f00209390d4fda7daffae22def;p=build.git diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh index d9e8710c..642fea8e 100755 --- a/vbuild-nightly.sh +++ b/vbuild-nightly.sh @@ -10,20 +10,33 @@ DEFAULT_PLDISTRO=planetlab DEFAULT_PERSONALITY=linux32 DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@" DEFAULT_build_SVNPATH="http://svn.planet-lab.org/svn/build/trunk" -DEFAULT_TESTCONFIG="default" DEFAULT_IFNAME=eth0 -# web publishing results -DEFAULT_WEBPATH="/build/@PLDISTRO@/" - # default gpg path used in signing yum repo DEFAULT_GPGPATH="/etc/planetlab" # default email to use in gpg secring DEFAULT_GPGUID="root@$( /bin/hostname )" -# for the test part -DEFAULT_TESTBUILDURL="http://build.onelab.eu/" -TESTBOXSSH=root@testbox.onelab.eu +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/" + # this is where the buildurl is pointing towards + DEFAULT_WEBROOT="/build/" + DEFAULT_TESTMASTER="manager.test.planet-lab.org" +fi + #################### # assuming vserver runs in UTC DATE=$(date +'%Y.%m.%d') @@ -39,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:.*') @@ -111,7 +124,7 @@ function failure() { 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 -c 30k ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT} ${BASE}" $MAILTO fi exit 1 } @@ -121,7 +134,7 @@ function success () { # early stage ? - let's not create /build/@PLDISTRO@ if [ ! -d ${WEBPATH} ] ; then WEBPATH=/tmp - WEBLOG=/tmp/vbuild-early.log.txt + WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt fi cp $LOG ${WEBLOG} summary $LOG >> ${WEBLOG} @@ -131,19 +144,20 @@ function success () { echo "See full build log at ${LOG_URL}" ; \ echo "See complete set of testlogs at ${TESTLOGS_URL}" ; \ ) > ${WEBLOG}.pass - rm -f ${WEBLOG}.ok ${WEBLOG}.ko + rm -f ${WEBLOG}.pkg-ok ${WEBLOG}.ko else ( \ - echo "Successfully built, no test requested" ; \ + echo "Successful package-only build, no test requested" ; \ echo "See full build log at ${LOG_URL}" ; \ - ) > ${WEBLOG}.ok + ) > ${WEBLOG}.pkg-ok + rm -f ${WEBLOG}.ko fi if [ -n "$MAILTO" ] ; then ( \ 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}" $MAILTO fi exit 0 } @@ -157,11 +171,6 @@ function build () { date cd /build - # if TAGSRELEASE specified : update PLDISTROTAGS with this tag - if [ -n "$TAGSRELEASE" ] ; then - svn up -r $TAGSRELEASE $PLDISTROTAGS - fi - show_env echo "Running make IN $(pwd)" @@ -172,6 +181,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[@]}") @@ -188,12 +200,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 @@ -203,9 +215,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 @@ -213,7 +223,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 @@ -224,14 +236,16 @@ function runtest () { exit 1 fi + testmaster_ssh="root@${TESTMASTER}" + # test directory name on test box testdir=${BASE} # clean it - ssh -n ${TESTBOXSSH} rm -rf ${testdir} + ssh -n ${testmaster_ssh} rm -rf ${testdir} # check it out - ssh -n ${TESTBOXSSH} svn co ${TESTS_SYSTEM_SVNPATH} ${testdir} - # check out the entire tests/ module (with system/ duplicated) as a subdir - see xxx above - ssh -n ${TESTBOXSSH} svn co ${TESTS_SVNPATH} ${testdir}/tests + 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 # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh configs="" for config in ${TESTCONFIG} ; do @@ -241,11 +255,11 @@ function runtest () { # need to proceed despite of set -e success=true - ssh 2>&1 -n ${TESTBOXSSH} ${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 - ssh 2>&1 -n ${TESTBOXSSH} 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 - || true # push them to the build web chmod -R a+r /vservers/$BASE/build/testlogs/ rsync --archive --delete /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/ @@ -254,7 +268,7 @@ function runtest () { failure fi - echo -n "============================== End $COMMAND:runtest on $(date)" + echo -n "============================== End $COMMAND:run_log on $(date)" } function in_root_context () { @@ -320,7 +334,6 @@ function show_env () { echo MAKEVARS="${MAKEVARS[@]}" echo DRY_RUN="$DRY_RUN" echo PLDISTROTAGS="$PLDISTROTAGS" - echo TAGSRELEASE="$TAGSRELEASE" # this does not help, it's not yet set when we run show_env #echo WEBPATH="$WEBPATH" echo TESTBUILDURL="$TESTBUILDURL" @@ -338,6 +351,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" @@ -345,25 +376,28 @@ function usage () { echo " -f fcdistro - defaults to $DEFAULT_FCDISTRO" 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 " -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/-t/-s/-p/-m options are uneffective in this case" - echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk" - echo " -r tagsrelease - a release number that refers to PLDISTROTAGS - defaults to HEAD" - echo " -s svnpath - where to fetch the build module - defaults to $DEFAULT_build_SVNPATH" + echo " the -f/-d/-p/-m/-s/-t options are uneffective in this case" echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG" echo " -w webpath - defaults to $DEFAULT_WEBPATH" echo " -W testbuildurl - defaults to $DEFAULT_TESTBUILDURL" - 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 " -m mailto - no default" - 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 " -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 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 } @@ -378,24 +412,29 @@ function main () { DRY_RUN= DO_BUILD=true DO_TEST=true + PUBLISH_SRPMS=true + SSH_KEY="" SIGNYUMREPO="" - while getopts "f:d:p:b:o:t:r:s:x:c:w:W:g:u:m:BTnyv7i:" 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 ;; p) PERSONALITY=$OPTARG ;; + m) MAILTO=$OPTARG ;; + s) build_SVNPATH=$OPTARG ;; + t) PLDISTROTAGS=$OPTARG ;; b) BASE=$OPTARG ;; o) OVERBASE=$OPTARG ;; - t) PLDISTROTAGS=$OPTARG ;; - r) TAGSRELEASE=$OPTARG ;; - s) build_SVNPATH=$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 ;; - m) MAILTO=$OPTARG ;; + K) SSH_KEY=$OPTARG ;; + S) PUBLISH_SRPMS="" ;; B) DO_TEST= ;; T) DO_BUILD= ;; n) DRY_RUN="-n" ;; @@ -430,11 +469,13 @@ 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" [ -z "$build_SVNPATH" ] && build_SVNPATH="$DEFAULT_build_SVNPATH" [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG" + [ -z "$TESTMASTER" ] && TESTMASTER="$DEFAULT_TESTMASTER" [ -n "$DRY_RUN" ] && MAILTO="" @@ -459,7 +500,6 @@ function main () { else MAIL_SUBJECT="$MAIL_SUBJECT fresh build" fi - MAIL_SUBJECT="$MAIL_SUBJECT ${BASE}" if ! in_root_context ; then # in the vserver @@ -489,6 +529,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) @@ -498,6 +539,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 @@ -531,8 +575,10 @@ function main () { 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 @@ -554,11 +600,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) @@ -566,12 +613,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 + [[ -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 @@ -579,7 +627,7 @@ function main () { fi if [ -n "$DO_TEST" ] ; then - runtest + run_log fi success