# 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
####################
# 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:.*')
echo "******************** END SUMMARY"
}
+### 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 () { 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 ; }
+function webpublish_cp_stdin_to_file () { ssh root@${WEBHOST} cat \> $1; }
+function webpublish_append_stdin_to_file () { ssh root@${WEBHOST} cat \>\> $1; }
# Notify recipient of failure or success, manage various stamps
function failure() {
set -x
# early stage ? - let's not create /build/@PLDISTRO@
- if [ ! -d ${WEBPATH} ] ; then
+ if webpublish_misses_dir $WEBPATH ; 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
- cp $LOG ${WEBLOG}
- summary $LOG >> ${WEBLOG}
- (echo -n "============================== $COMMAND: failure at " ; date ; tail -c 30k $WEBLOG) > ${WEBLOG}.ko
+ 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 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}" ; \
- tail -c 30k ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT}" $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
}
function success () {
set -x
# early stage ? - let's not create /build/@PLDISTRO@
- if [ ! -d ${WEBPATH} ] ; then
+ if webpublish_misses_dir ${WEBPATH} ; then
+ WEBHOST=localhost
WEBPATH=/tmp
WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
fi
- cp $LOG ${WEBLOG}
- summary $LOG >> ${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}" ; \
- ) > ${WEBLOG}.pass
- 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}" ; \
- ) > ${WEBLOG}.pkg-ok
- 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}" $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.
+ sleep 5
exit 0
}
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[@]}")
# 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
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/<arch> location
+ # f12 now has everything in i686; try i386 first as older fedoras have both
url=""
- for a in i386 x86_64; do
+ for a in i386 i686 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
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
# 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
- ssh 2>&1 -n ${testmaster_ssh} 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 - || :
# push them to the build web
chmod -R a+r /vservers/$BASE/build/testlogs/
- rsync --archive --delete /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/
+ webpublish_rsync_dir /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/
if [ -z "$success" ] ; then
+ echo "Tests have failed - bailing out"
failure
fi
- echo -n "============================== End $COMMAND:runtest on $(date)"
+ echo -n "============================== End $COMMAND:run_log on $(date)"
}
function in_root_context () {
rpm -q util-vserver > /dev/null
}
-# this part won't work with a remote(rsync) WEBPATH
+# this part won't work if WEBHOST does not match the local host
+# would need to be made webpublish_* compliant
+# but do we really need this feature anyway ?
function sign_node_packages () {
echo "Signing node packages"
# this does not help, it's not yet set when we run show_env
#echo WEBPATH="$WEBPATH"
echo TESTBUILDURL="$TESTBUILDURL"
+ echo WEBHOST="$WEBHOST"
if in_root_context ; then
echo PLDISTROTAGS="$PLDISTROTAGS"
else
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"
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 " -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 " -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
}
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 ;;
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 ;;
[ -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"
else
MAIL_SUBJECT="$MAIL_SUBJECT fresh build"
fi
- MAIL_SUBJECT="$MAIL_SUBJECT ${BASE}"
+
+ ### compute WEBHOST from TESTBUILDURL
+ # this is to avoid having to change the builds configs everywhere
+ # simplistic way to extract hostname from a URL
+ WEBHOST=$(echo "$TESTBUILDURL" | cut -d/ -f 3)
if ! in_root_context ; then
# in the vserver
# 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
+ # make sure we refresh the tests place in case it has changed
+ rm -f /build/tests_svnpath
# get environment from the first run
FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh)
-
- PLDISTRO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTRO)
- PLDISTROTAGS=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTROTAGS)
- 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)
+ # retrieve all in one 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)
+ [ -n "$PERSONALITY" ] && options=(${options[@]} -p $PERSONALITY)
+ [ -n "$MAILTO" ] && options=(${options[@]} -m $MAILTO)
+ [ -n "$WEBPATH" ] && options=(${options[@]} -w $WEBPATH)
+ [ -n "$TESTBUILDURL" ] && options=(${options[@]} -W $TESTBUILDURL)
+ [ -n "$WEBROOT" ] && options=(${options[@]} -r $WEBROOT)
show_env
else
# create vserver: check it does not exist yet
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
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)
- 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,/build/,${TESTBUILDURL},")
- TESTLOGS_URL=$(echo ${WEBPATH}/${BASE}/testlogs | sed -e "s,//,/,g" -e "s,/build/,${TESTBUILDURL},")
+ WEBBASE_URL=$(echo $WEBBASE | 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)
vserver ${BASE} exec /build/$COMMAND "${options[@]}" -b "${BASE}" "${MAKEVARS[@]}" "${MAKETARGETS[@]}"
fi
- # publish to the web so runtest 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
+ # publish to the web so run_log can find them
+ 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
- sign_node_packages
+ # this script does not yet support signing on a remote (webhost) repo
+ sign_here=$(hostname) ; sign_web=$(webpublish hostname)
+ if [ "$hostname" = "$sign_here" ] ; then
+ sign_node_packages
+ else
+ echo "$COMMAND does not support signing on a remote yum repo"
+ echo "you might want to turn off the -y option, or run this on the web server box itself"
+ exit 1
+ fi
fi
if [ -n "$DO_TEST" ] ; then
- runtest
+ run_log
fi
success
git://git.onelab.eu / build.git / blobdiff