#!/bin/bash
-REVISION=$(echo '$Revision: 7654 $' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' )
+REVISION=$(echo '$Revision$' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' )
COMMANDPATH=$0
COMMAND=$(basename $0)
DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
DEFAULT_WEBPATH="/build/@PLDISTRO@/"
+DEFAULT_BUILDREPO="http://build.planet-lab.org/install-rpms/archive/"
+DEFAULT_REPOURL="@BUILDREPO@/@PLDISTRO@/@FCDISTRO@/@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@/RPMS"
+
+# 10.1 subnet allocated for testing at Princeton
+DEFAULT_IPPREFIX16="10.1"
+
+# default to eth0
+DEFAULT_TESTVSERVER_DEV=0
+
# for the test part
TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
cp $LOG ${WEBLOG}
(echo -n "============================== $COMMAND: failure at " ; date ; tail -c 20k $WEBLOG) > ${WEBLOG}.ko
if [ -n "$MAILTO" ] ; then
- tail -c 20k ${WEBPATH}/${BASE}.log.txt | mail -s "Failures for test ${BASE}" $MAILTO
+ tail -c 20k ${WEBLOG} | mail -s "Failures for test ${BASE}" $MAILTO
fi
exit 1
}
}
function usage () {
+ ### set BASE from DISTRO, if unspecified
echo "Usage: $COMMAND [option] make-targets"
echo "This is $REVISION"
echo "Supported options"
echo " -n dry-run : -n passed to make - vserver gets created though - no mail sent"
echo " -f fcdistro - defaults to $DEFAULT_FCDISTRO"
echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
- echo " -p personality - defaults to $DEFAULT_PERSONALITY"
echo " -b base - defaults to $DEFAULT_BASE"
- echo " @NAME@ replaced as appropriate"
+ echo " @NAME@ replaced as appropriate, which currently defaults to $BASE"
+ echo " -p personality - defaults to $DEFAULT_PERSONALITY"
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 " -o : overwrite - re-run in base directory, do not create vserver"
echo " -m mailto"
echo " -a makevar=value - space in values are not supported"
+ echo " -u repourl -- defaults to $DEFAULT_REPOURL"
+ echo " @NAME@ replaced as appropriate, which currently defaults to $REPOURL"
echo " -w webpath - defaults to $DEFAULT_WEBPATH"
+ echo " @NAME@ replaced as appropriate, which currently defaults to $WEBPATH"
+ echo " -j ip address ; use this to give the vserver an explicit IP address; also see -i."
+ echo " -i /16 ip subnet for auto IP address selection within the subnet -- defaults to $DEFAULT_IPPREFIX16"
+ echo " This is only used when no explicit IP address is specified."
echo " -v : be verbose"
- echo " -7 : uses weekday-@FCDISTRO@ as base"
+ echo " -7 : uses weekday-@FCDISTRO@ as base -- defaults to $(date +%a|tr A-Z a-z)-$FCDISTRO"
exit 1
}
declare -a argv
for arg in "$@"; do argv=(${argv[@]} "$arg") ; done
+ # set defaults
+ [ -z "$FCDISTRO" ] && FCDISTRO=$DEFAULT_FCDISTRO
+ [ -z "$PLDISTRO" ] && PLDISTRO=$DEFAULT_PLDISTRO
+ [ -z "$PERSONALITY" ] && PERSONALITY=$DEFAULT_PERSONALITY
+ [ -z "$PLDISTROTAGS" ] && PLDISTROTAGS="${PLDISTRO}-tags.mk"
+ [ -z "$BASE" ] && BASE="$DEFAULT_BASE"
+ [ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
+ [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
+ [ -z "$BUILDREPO" ] && BUILDREPO="$DEFAULT_BUILDREPO"
+ [ -z "$REPOURL" ] && REPOURL="$DEFAULT_REPOURL"
+ [ -z "$IPPREFIX16" ] && IPPREFIX16="$DEFAULT_IPPREFIX16"
+ [ -z "$TESTVSERVER_DEV" ] && TESTVSERVER_DEV="$DEFAULT_TESTVSERVER_DEV"
+
# parse arguments
MAKEVARS=()
MAKEOPTS=()
- while getopts "nf:d:b:p:t:r:s:om:a:w:vh7" opt ; do
+ while getopts "nf:d:b:p:t:r:s:om:a:u:w:i:j:vh7" opt ; do
case $opt in
- n) DRY_RUN="true" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;
+ n) DRY_RUN="true" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ; MAILTO="";;
f) FCDISTRO=$OPTARG ;;
d) PLDISTRO=$OPTARG ;;
- p) PERSONALITY=$OPTARG ;;
b) BASE=$OPTARG ;;
+ p) PERSONALITY=$OPTARG ;;
t) PLDISTROTAGS=$OPTARG ;;
r) TAGSRELEASE=$OPTARG ;;
s) SVNPATH=$OPTARG ;;
o) OVERWRITEMODE=true ;;
m) MAILTO=$OPTARG ;;
a) MAKEVARS=(${MAKEVARS[@]} "$OPTARG") ;;
+ u) REPOURL=$OPTARG ;;
w) WEBPATH=$OPTARG ;;
+ i) IPPREFIX16=$OPTARG ;;
+ j) TESTVSERVER_IP=$OPTARG ;;
v) set -x ;;
7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
h|*) usage ;;
shift $(($OPTIND - 1))
MAKETARGETS="$@"
- # set defaults
- [ -z "$FCDISTRO" ] && FCDISTRO=$DEFAULT_FCDISTRO
- [ -z "$PLDISTRO" ] && PLDISTRO=$DEFAULT_PLDISTRO
- [ -z "$PERSONALITY" ] && PERSONALITY=$DEFAULT_PERSONALITY
- [ -z "$PLDISTROTAGS" ] && PLDISTROTAGS="${PLDISTRO}-tags.mk"
- [ -z "$BASE" ] && BASE="$DEFAULT_BASE"
- [ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
- [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
-
- [ -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)
-
+ REPOURL=$(echo ${REPOURL} | sed $sedargs)
+ sedargs="-e s,@BUILDREPO@,${BUILDREPO},g"
+ REPOURL=$(echo ${REPOURL} | sed $sedargs)
+
trap failure ERR INT
# create vserver: check it does not exist yet
i=
svn export $SVNPATH $tmpdir
# Create vserver
cd $tmpdir
- REPOURL="http://build.planet-lab.org/install-rpms/archive/${PLDISTRO}/${FCDISTRO}/${DATE}--${PLDISTRO}-${FCDISTRO}-${PERSONALITY}/RPMS"
- TESTVSERVERIP="10.201.197.1"
- ./myplc-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} ${BASE} ${REPOURL} -- --interface eth0:${TESTVSERVERIP}
+ ./vtest-init-vserver.sh -i eth${TESTVSERVER_DEV} -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} ${BASE} ${REPOURL}
# cleanup
cd -
rm -rf $tmpdir
+ vserver ${BASE} stop
+ rm -f /etc/vservers/${BASE}/interfaces/0/*
+ if [ -z "$TESTVSERVER_IP" ] ; then
+ xid=$(cat /etc/vservers/${BASE}/context)
+ TESTVSERVER_IP=$(python -c "context=int($xid); print '%s.%d.%d' % ($IPPREFIX16,(context&0xff00)>>8,context&0xff)")
+ fi
+ mkdir -p /etc/vservers/${BASE}/interfaces/0
+ echo "${TESTVSERVER_IP}" > /etc/vservers/${BASE}/interfaces/0/ip
+ echo "eth${TESTVSERVER_DEV}" > /etc/vservers/${BASE}/interfaces/0/dev
+ vserver ${BASE} start
echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date)
+
# The log inside the vserver contains everything
LOG2=/vservers/${BASE}/log.txt
(echo "==================== BEG VSERVER Transcript of vserver creation" ; \
# redirect log again
exec >> $LOG 2>&1
- # SVN download one or more tests and run them. Call "failure" if
- # the tests fail.
+ svn cat ${TESTSVNPATH}/selftest > /vservers/${BASE}/selftest
+ vserver ${BASE} exec chmod +x /selftest
+ vserver ${BASE} exec /selftest ${BASE}.$(hostname) ${TESTVSERVER_IP}
success
}
git://git.onelab.eu / build.git / blobdiff