DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
DEFAULT_TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
-DEFAULT_TESTCONFIG32="main 1vnodes 1testbox32"
-DEFAULT_TESTCONFIG64="main 1vnodes 1testbox64"
+DEFAULT_TESTCONFIG="default"
DEFAULT_IFNAME=eth0
# web publishing results
echo -n "============================== Starting $COMMAND:runtest on $(date)"
- ### the URL to the myplc package
- rpm=$( find /vservers/$BASE/build/RPMS -name 'myplc-[0-9]*' )
- if [ ${#rpm[@]} != 1 ] ; then
- echo "$COMMAND: Cannot locate rpm for testing"
+ ### the URL to the RPMS/<arch> location
+ url=""
+ 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},")
+ break
+ fi
+ done
+
+ if [ -z "$url" ] ; then
+ echo "$COMMAND: Cannot locate arch URL for testing"
failure
exit 1
fi
- url=$(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
- # compute test directory name on test box
- testdir=chroot-${BASE}
- # use another name if any config contains vserver
- echo $TESTCONFIG | grep vserver &> /dev/null && testdir=vserver-${BASE}
+ # test directory name on test box
+ testdir=${BASE}
# clean it
ssh ${TESTBOXSSH} rm -rf ${testdir}
# check it out
echo " -r tagsrelease - a release number that refers to PLDISTROTAGS - defaults to HEAD"
echo " -s svnpath - where to fetch the build module"
echo " -x testsvnpath - defaults to $DEFAULT_TESTSVNPATH"
- echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG32 or $DEFAULT_TESTCONFIG64"
+ echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG"
echo " -w webpath - defaults to $DEFAULT_WEBPATH"
echo " -m mailto - no default"
echo " -O : overwrite - re-run in base directory, do not re-create vserver"
[ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
[ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
[ -z "$TESTSVNPATH" ] && TESTSVNPATH="$DEFAULT_TESTSVNPATH"
- [ "$PERSONALITY" == linux32 ] && [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG32"
- [ "$PERSONALITY" == linux64 ] && [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG64"
+ [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG"
[ -n "$DRY_RUN" ] && MAILTO=""
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
else
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
if [ -n "$DO_TEST" ] ; then
runtest