COMMAND=$(basename $0)
# default values, tunable with command-line options
-DEFAULT_FCDISTRO=f8
+DEFAULT_FCDISTRO=centos5
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
-DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
+DEFAULT_build_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
DEFAULT_TESTCONFIG="default"
DEFAULT_IFNAME=eth0
# 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.*")
+m_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*|.*is not installed.*|.*PROPFIND.*|.*Starting.*:runtest.*")
m_installing_any=re.compile('\r (Installing:[^\]]*]) ')
m_installing_err=re.compile('\r (Installing:[^\]]*])(..+)')
m_installing_end=re.compile('Installed:.*')
# stuff our own variable settings
MAKEVARS=("PLDISTRO=${PLDISTRO}" "${MAKEVARS[@]}")
MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}")
- MAKEVARS=("NIGHTLY_BASE=${BASE}" "${MAKEVARS[@]}")
- MAKEVARS=("NIGHTLY_PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
- MAKEVARS=("build-SVNPATH=${SVNPATH}" "${MAKEVARS[@]}")
+ MAKEVARS=("build-SVNPATH=${build_SVNPATH}" "${MAKEVARS[@]}")
+ MAKEVARS=("PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
+ MAKEVARS=("MAILTO=${MAILTO}" "${MAKEVARS[@]}")
+
+ MAKEVARS=("BASE=${BASE}" "${MAKEVARS[@]}")
# stage1
make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true
- # versions
- make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
# store tests_svnpath
make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true tests_svnpath
+ # versions
+ make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
# actual stuff
- make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
+ make -C /build $DRY_RUN "${MAKEVARS[@]}" "${MAKETARGETS[@]}"
}
# 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
- SYSTEM_SVNPATH=${TESTS_SVNPATH}/system
+ TESTS_SYSTEM_SVNPATH=${TESTS_SVNPATH}/system
### the URL to the RPMS/<arch> location
url=""
# clean it
ssh -n ${TESTBOXSSH} rm -rf ${testdir}
# check it out
- ssh -n ${TESTBOXSSH} svn co ${SYSTEM_SVNPATH} ${testdir}
+ 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
# invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
# need to proceed despite of set -e
success=true
- ssh 2>&1 -n ${TESTBOXSSH} ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs $test_env --all || success=
+ ssh 2>&1 -n ${TESTBOXSSH} ${testdir}/runtest --build ${build_SVNPATH} --url ${url} $configs $test_env --all || success=
# gather logs in the vserver
mkdir -p /vservers/$BASE/build/testlogs
rpm -q util-vserver > /dev/null
}
-function sign_and_index_node_packages () {
- echo "Signing & indexing node packages"
+function sign_node_packages () {
+
+ echo "Signing node packages"
need_createrepo=""
# Update repository index / yum metadata.
if [ -n "$need_createrepo" ] ; then
+ echo "Indexing node packages after signing"
if [ -f $repository/yumgroups.xml ] ; then
createrepo --quiet -g yumgroups.xml $repository
else
set +x
echo FCDISTRO=$FCDISTRO
echo PLDISTRO=$PLDISTRO
+ echo PERSONALITY=$PERSONALITY
echo BASE=$BASE
- echo SVNPATH=$SVNPATH
+ echo build_SVNPATH=$build_SVNPATH
echo MAKEVARS="${MAKEVARS[@]}"
echo DRY_RUN="$DRY_RUN"
echo PLDISTROTAGS="$PLDISTROTAGS"
echo TAGSRELEASE="$TAGSRELEASE"
- echo -n "(might be unexpanded)"
- echo WEBPATH="$WEBPATH"
+ # this does not help, it's not yet set when we run show_env
+ #echo WEBPATH="$WEBPATH"
echo TESTBUILDURL="$TESTBUILDURL"
if in_root_context ; then
echo PLDISTROTAGS="$PLDISTROTAGS"
}
function usage () {
- echo "Usage: $COMMAND [option] make-targets"
+ echo "Usage: $COMMAND [option] [var=value...] make-targets"
echo "This is $REVISION"
echo "Supported options"
echo " -f fcdistro - defaults to $DEFAULT_FCDISTRO"
echo " -p personality - defaults to $DEFAULT_PERSONALITY"
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"
+ echo " -s svnpath - where to fetch the build module - defaults to $DEFAULT_build_SVNPATH"
echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
echo " -w webpath - defaults to $DEFAULT_WEBPATH"
echo " -W testbuildurl - defaults to $DEFAULT_TESTBUILDURL"
- echo " -y create (and sign) yum repo in webpath"
+ 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 " -O : overwrite - re-run in base directory, do not re-create vserver"
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 " -a makevar=value - space in values are not supported"
echo " -i ifname - defaults to $DEFAULT_IFNAME - used to determine local IP"
exit 1
}
# parse arguments
MAKEVARS=()
+ MAKETARGETS=()
DRY_RUN=
DO_BUILD=true
DO_TEST=true
- while getopts "f:d:p:b:t:r:s:x:c:w:W:g:u:m:OBTnyv7a:i:" opt ; do
+ SIGNYUMREPO=""
+ while getopts "f:d:p:b:o:t:r:s:x:c:w:W:g:u:m:BTnyv7i:" opt ; do
case $opt in
f) FCDISTRO=$OPTARG ;;
d) PLDISTRO=$OPTARG ;;
p) PERSONALITY=$OPTARG ;;
b) BASE=$OPTARG ;;
+ o) OVERBASE=$OPTARG ;;
t) PLDISTROTAGS=$OPTARG ;;
r) TAGSRELEASE=$OPTARG ;;
- s) SVNPATH=$OPTARG ;;
+ s) build_SVNPATH=$OPTARG ;;
c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
w) WEBPATH=$OPTARG ;;
W) TESTBUILDURL=$OPTARG ;;
- y) MKYUMREPO=$OPTARG ;;
+ y) SIGNYUMREPO=true ;;
g) GPGPATH=$OPTARG ;;
u) GPGUID=$OPTARG ;;
m) MAILTO=$OPTARG ;;
- O) OVERWRITEMODE=true ;;
B) DO_TEST= ;;
- T) DO_BUILD= ; OVERWRITEMODE=true ;;
+ T) DO_BUILD= ;;
n) DRY_RUN="-n" ;;
v) set -x ;;
7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
- a) MAKEVARS=(${MAKEVARS[@]} "$OPTARG") ;;
i) IFNAME=$OPTARG ;;
h|*) usage ;;
esac
toshift=$(($OPTIND - 1))
arg=1; while [ $arg -le $toshift ] ; do options=(${options[@]} "$1") ; shift; arg=$(($arg+1)) ; done
- MAKETARGETS="$@"
+ # allow var=value stuff;
+ for target in "$@" ; do
+ # check if contains '='
+ target1=$(echo $target | sed -e s,=,,)
+ if [ "$target" = "$target1" ] ; then
+ MAKETARGETS=(${MAKETARGETS[@]} "$target")
+ else
+ MAKEVARS=(${MAKEVARS[@]} "$target")
+ fi
+ done
# set defaults
[ -z "$FCDISTRO" ] && FCDISTRO=$DEFAULT_FCDISTRO
[ -z "$GPGPATH" ] && GPGPATH="$DEFAULT_GPGPATH"
[ -z "$GPGUID" ] && GPGUID="$DEFAULT_GPGUID"
[ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
- [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
+ [ -z "$build_SVNPATH" ] && build_SVNPATH="$DEFAULT_build_SVNPATH"
[ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
[ -n "$DRY_RUN" ] && MAILTO=""
- ### set BASE from DISTRO, if unspecified
- sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g -e s,@PERSONALITY@,${PERSONALITY},g"
- BASE=$(echo ${BASE} | sed $sedargs)
- WEBPATH=$(echo ${WEBPATH} | sed $sedargs)
-
- # 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},")
-
+ if [ -n "$OVERBASE" ] ; then
+ sedargs="-e s,@DATE@,${DATE},g"
+ BASE=$(echo ${OVERBASE} | sed $sedargs)
+ else
+ sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g -e s,@PERSONALITY@,${PERSONALITY},g"
+ BASE=$(echo ${BASE} | sed $sedargs)
+ fi
+
if ! in_root_context ; then
# in the vserver
echo "==================== Within vserver BEG $(date)"
# (*) copy this command in the vserver
# (*) invoke it
- if [ -n "$OVERWRITEMODE" ] ; then
+ if [ -n "$OVERBASE" ] ; then
### Re-use a vserver (finish an unfinished build..)
if [ ! -d /vservers/${BASE} ] ; then
echo $COMMAND : cannot find vserver $BASE
exec > $LOG 2>&1
set -x
echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date)
- show_env
# start in case e.g. we just rebooted
vserver ${BASE} start || :
# update build
vserver ${BASE} exec svn update /build
+ # get environment from the first run
+ FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh)
+
+ PLDISTRO=$(vserver ${BASE} exec make --no-print-directory -C /build +PLDISTRO)
+ PLDISTROTAGS=$(vserver ${BASE} exec make --no-print-directory -C /build +PLDISTROTAGS)
+ build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build +build-SVNPATH)
+ PERSONALITY=$(vserver ${BASE} exec make --no-print-directory -C /build +PERSONALITY)
+ MAILTO=$(vserver ${BASE} exec make --no-print-directory -C /build +MAILTO)
+ show_env
else
# create vserver: check it does not exist yet
i=
### extract the whole build - much simpler
tmpdir=/tmp/$COMMAND-$$
- svn export $SVNPATH $tmpdir
+ svn export $build_SVNPATH $tmpdir
# Create vserver
cd $tmpdir
./vbuild-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${BASE}
cd -
rm -rf $tmpdir
# Extract build again - in the vserver
- vserver ${BASE} exec svn checkout ${SVNPATH} /build
+ vserver ${BASE} exec svn checkout ${build_SVNPATH} /build
fi
echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date)
# redirect log again
exec >> $LOG 2>&1
+ 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)
+
+ # 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},")
+
if [ -n "$DO_BUILD" ] ; then
cp $COMMANDPATH /vservers/${BASE}/build/
# invoke this command in the vserver for building (-T)
vserver ${BASE} exec chmod +x /build/$COMMAND
- vserver ${BASE} exec /build/$COMMAND "${options[@]}" -b "${BASE}" $MAKETARGETS
+ vserver ${BASE} exec /build/$COMMAND "${options[@]}" -b "${BASE}" "${MAKEVARS[@]}" "${MAKETARGETS[@]}"
fi
# publish to the web so runtest can find them
rsync --verbose /vservers/$BASE/build/myplc-release $WEBPATH/$BASE
# create yum repo and sign packages.
- if [ -n $MKYUMREPO ] ; then
- sign_and_index_node_packages
+ if [ -n "$SIGNYUMREPO" ] ; then
+ sign_node_packages
fi
if [ -n "$DO_TEST" ] ; then