COMMANDPATH=$0
COMMAND=$(basename $0)
-#ROOT=/build
# default values, tunable with command-line options
-DEFAULT_FC_DISTRO=fc6
-SVNPATH="http://svn.one-lab.org/build/trunk"
-DISTRO=onelab
-MAILTO="onelab-build@one-lab.org"
-DISTROMAKETAGS=onelab-tags.mk
-PLEBOX=root@planet-lab.eu
+DEFAULT_FCDISTRO=fc6
+DEFAULT_PLDISTRO=onelab
+DEFAULT_BASE="@--=-%"
+DEFAULT_SVNPATH="http://svn.one-lab.org/build/trunk"
+
+DEFAULT_MAILTO_planetlab="devel@planet-lab.org"
+DEFAULT_MAILTO_onelab="onelab-build@one-lab.org"
+
+# web publishing results
+WEBPATH=/build/@PLDISTRO@/@BASE@
+
+# for the test part
TESTBUILDURL="http://build.one-lab.org/"
TESTBOX=onelab-test.inria.fr
TESTBOXSSH=root@onelab-test.inria.fr
TESTSVNPATH="http://svn.one-lab.org/new_plc_api/trunk/plctest"
TESTSCRIPT=TestMain.py
-TESTSEND=TestSendMail
####################
-# plc chroot runs in UTC
+# assuming vserver runs in UTC
DATE=$(date -u +'%Y.%m.%d')
# Notify recipient of failure or success, manage various stamps
function failure() {
set -x
- (echo -n "============================== $COMMAND: failure at" ; date ; tail -c 20k /log-build.txt) >> /build.broken
+ (echo -n "============================== $COMMAND: failure at" ; date ; tail -c 20k $LOG) >> $(dirname $LOG)/build-broken.txt
if [ -n "$MAILTO" ] ; then
- tail -c 8k /log-build.txt | mail -s "Failures for ${BASE}" $MAILTO
+ tail -c 8k $LOG | mail -s "Failures for ${BASE}" $MAILTO
fi
exit 1
}
function success () {
set -x
- touch /build.ok
+ touch $(dirname $LOG)/build-ok.txt
if [ -n "$MAILTO" ] ; then
- (echo "http://build.one-lab.org/$DISTRO/$BASE" ; echo "Completed on $(date)" ) | mail -s "Successfull build for ${BASE}" $MAILTO
+ (echo "http://build.one-lab.org/$PLDISTRO/$BASE" ; echo "Completed on $(date)" ) | mail -s "Successfull build for ${BASE}" $MAILTO
fi
-# cd ${ROOT}
-# rm -f latest
-# ln -s $BASE latest
exit 0
}
cd /
# svn checkout $SVNPATH $BASE
- # if TAGSRELEASE specified : update DISTROMAKETAGS with this tag
+ # if TAGSRELEASE specified : update PLDISTROTAGS with this tag
if [ -n "$TAGSRELEASE" ] ; then
cd build
- svn up -r $TAGSRELEASE $DISTROMAKETAGS
+ svn up -r $TAGSRELEASE $PLDISTROTAGS
cd - > /dev/null
fi
show_env
- echo "Running make IN build $(pwd)"
- make stage1=true ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C /build
+ echo "Running make IN $(pwd)"
+ make stage1=true "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" -C /build
# in case we use an older build
set +e
- make ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C /build versions
+ make "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" -C /build versions
set -e
- make ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C /build $MAKETARGETS
+ make "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" -C /build $MAKETARGETS
# restore silent mode - otherwise cron gets it
set +x
set -e
trap failure ERR INT
- echo -n"==============================> testing the sendmail service on PLE"
- ssh ${PLEBOX} python -u /root/${TESTSEND}
-
echo -n "============================== Starting $COMMAND:runtest on "
date
-
- ### compute URL to the myplc package
- build=$1; shift
- buildname=$(basename $build)
- cd $build
- rpm=$(find RPMS -name myplc\*.rpm )
- url=${TESTBUILDURL}${DISTRO}/${buildname}/${rpm}
+ ### the URL to the myplc package
+ cd /build/RPMS/i386
+ rpm=$(ls myplc-[0-9]*.rpm)
+ if [ ${#rpm[@]} != 1 ] ; then
+ echo "Cannot locate rpm for testing"
+ exit 1
+ fi
+ url=${TESTBUILDURL}${PLDISTRO}/${BASE}/${rpm}
+
+ cd /build
### checkout the test material
svn co ${TESTSVNPATH} plctest
# compute test directory name on test box
function show_env () {
# echo ROOT=$ROOT
- echo FC_DISTRO=$FC_DISTRO
- echo DISTRO=$DISTRO
+ echo FCDISTRO=$FCDISTRO
+ echo PLDISTRO=$PLDISTRO
echo BASE=$BASE
echo SVNPATH=$SVNPATH
echo MAKEVARS="${MAKEVARS[@]}"
echo MAKEOPTS="${MAKEOPTS[@]}"
- echo DISTROMAKETAGS="$DISTROMAKETAGS"
+ echo PLDISTROTAGS="$PLDISTROTAGS"
echo TAGSRELEASE="$TAGSRELEASE"
- if [ -f /build/$DISTROMAKETAGS ] ; then
- echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file $DISTROMAKETAGS"
- cat /build/$DISTROMAKETAGS
+ if [ -f /build/$PLDISTROTAGS ] ; then
+ echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file $PLDISTROTAGS"
+ cat /build/$PLDISTROTAGS
else
- echo "no tags definition yet - probably out of vserver"
+ echo "no tags definition - normal if outside of the vserver"
fi
echo "XXXXXXXXXXXXXXXXXXXX end tags definition"
}
function usage () {
echo "Usage: $COMMAND [option] make-targets"
- echo "This is revision $REVISION"
+ echo "This is $REVISION"
echo "Supported options"
- echo " -f FC_DISTRO - defaults to $DEFAULT_FC_DISTRO"
- echo " -b BASE - may include @, then replaced with current date"
- echo " -u : uses directory given as BASE as is, even if already exists"
- echo " -d PLDISTRO"
- echo " -t PLDISTROMAKETAGS"
- echo " -r TAGSRELEASE - a release number that refers to PLDISTROMAKETAGS - defaults to HEAD"
- echo " -s MAKEVAR=value - spaces in value are not supported"
- echo " -n dry-run : -n passed to make - no mail sent"
+ 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 " -b BASE - defaults to $DEFAULT_BASE"
+ echo " may include @ (replaced with date), % (fcdistro) or = (pldistro)"
+ 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 " -s SVNPATH"
+ echo " -a MAKEVAR=value - space in values are not supported"
echo " -B : run build only"
echo " -T : run test only"
exit 1
function main () {
- set -x
+ set -e
+
+ # preserve arguments for passing them again later
+ declare -a argv
+ for arg in "$@"; do argv=(${argv[@]} "$arg") ; done
+
# parse arguments
MAKEVARS=()
MAKEOPTS=()
DO_BUILD=true
DO_TEST=true
- while getopts "f:b:ud:t:r:s:nm:s:BTh" opt ; do
+ while getopts "nf:d:b:t:r:s:om:a:BTh" opt ; do
case $opt in
- f) FC_DISTRO=$OPTARG ;;
+ n) DRY_RUN="true" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;
+ f) FCDISTRO=$OPTARG ;;
+ d) PLDISTRO=$OPTARG ;;
b) BASE=$OPTARG ;;
- u) USEOLD=true ;;
- d) DISTRO=$OPTARG ;;
- t) DISTROMAKETAGS=$OPTARG ;;
+ t) PLDISTROTAGS=$OPTARG ;;
r) TAGSRELEASE=$OPTARG ;;
- s) MAKEVARS=(${MAKEVARS[@]} $OPTARG) ;;
- n) MAILTO="" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;
- m) MAILTO=$OPTARG ;;
s) SVNPATH=$OPTARG ;;
+ o) USEOLD=true ;;
+ m) MAILTO=$OPTARG ;;
+ a) MAKEVARS=(${MAKEVARS[@]} "$OPTARG") ;;
B) DO_TEST= ;;
T) DO_BUILD= ; USEOLD=true ;;
h|*) usage ;;
done
shift $(($OPTIND - 1))
-
- [ -z "$FC_DISTRO" ] && FC_DISTRO=$DEFAULT_FC_DISTRO
MAKETARGETS="$@"
+
+ # set defaults
+ [ -z "$FCDISTRO" ] && FCDISTRO=$DEFAULT_FCDISTRO
+ [ -z "$PLDISTRO" ] && PLDISTRO=$DEFAULT_PLDISTRO
+ [ -z "$PLDISTROTAGS" ] && PLDISTROTAGS="${PLDISTRO}-tags.mk"
+ [ -z "$BASE" ] && BASE="$DEFAULT_BASE"
+ [ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
+ #
+ if [ "$PLDISTRO" = "onelab" ] ; then
+ [ -z "$MAILTO" ] && MAILTO="$DEFAULT_MAILTO_onelab"
+ else
+ [ -z "$MAILTO" ] && MAILTO="$DEFAULT_MAILTO_planetlab"
+ fi
+ [ -n "$DRY_RUN" ] && MAILTO=""
### set BASE from DISTRO, if unspecified
- [ -z "$BASE" ] && BASE=${DISTRO}-${FC_DISTRO}
- BASE=$(echo ${BASE} | sed -e "s,@,${DATE},g")
-
+ BASE=$(echo ${BASE} | sed -e "s,@,${DATE},g" -e "s,%,${FCDISTRO},g" -e "s,=,${PLDISTRO},g")
+
if [ -d /vservers ] ; then
# we run in the root context :
# (*) create or check for the vserver to use
echo $COMMAND : cannot find vserver $BASE
exit 1
fi
+ # manage LOG
+ LOG=/vservers/${BASE}-log.txt
+ exec > $LOG 2>&1
+ echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date)
+ show_env
# update build
- LOG=/vservers/${BASE}.log
- echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date) >> $LOG 2>&1
- vserver ${BASE} exec svn update /build >> $LOG 2>&1
+ vserver ${BASE} exec svn update /build
else
# create vserver: check it does not exist yet
i=
fi
done
BASE=${BASE}${i}
- LOG=/vservers/${BASE}.log
- echo "XXXXXXXXXX $COMMAND: creating vserver $BASE" $(date) >> $LOG 2>&1
- show_env >> $LOG 2>&1
- ### extract vbuild.setup and run it
- svn cat $SVNPATH/vbuild.setup > /tmp/vbuild-$$ 2>> $LOG
- svn cat $SVNPATH/${DISTRO}-devel.lst > /tmp/${DISTRO}-devel.lst 2>> $LOG
+ # manage LOG
+ LOG=/vservers/${BASE}-log.txt
+ exec > $LOG 2>&1
+ echo "XXXXXXXXXX $COMMAND: creating vserver $BASE" $(date)
+ show_env
+
+ ### extract vbuild-init-vserver.sh and run it
+ svn cat $SVNPATH/vbuild-init-vserver.sh > /tmp/vbuild-$$.sh
+ # get -devel.lst
+ set +e
+ svn cat $SVNPATH/${PLDISTRO}-devel-${FCDISTRO}.lst > /tmp/vbuild-devel-$$.lst
+ if [ "$?" = 0 ] ; then
+ mv /tmp/vbuild-devel-$$.lst /tmp/${PLDISTRO}-devel-${FCDISTRO}.lst
+ else
+ svn cat $SVNPATH/${PLDISTRO}-devel.lst > /tmp/vbuild-devel-$$.lst
+ if [ "$?" = 0 ] ; then
+ mv /tmp/vbuild-devel-$$.lst /tmp/${PLDISTRO}-devel.lst
+ else
+ echo "$COMMAND: Cannot locate ${PLDISTRO}-devel.lst"
+ failure
+ fi
+ fi
+ set -e
+
# Create vserver
cd /tmp
- chmod +x vbuild-$$
- /tmp/vbuild-$$ ${BASE} ${FC_DISTRO} ${DISTRO} >> $LOG 2>&1
- cd - > /dev/null
+ chmod +x vbuild-$$.sh
+ /tmp/vbuild-$$.sh ${BASE} ${FCDISTRO} ${PLDISTRO}
+ # cleanup
+ rm -f /tmp/vbuild-$$*
+ cd -
# Extract build
- vserver ${BASE} exec svn checkout ${SVNPATH} /build >> $LOG 2>&1
+ vserver ${BASE} exec svn checkout ${SVNPATH} /build
fi
+ # The log inside the vserver contains everything
+ LOG2=/vservers/${BASE}/build/build-log.txt
+ (echo "==================== Transcript of vserver creation" ; cat $LOG ; echo "==================== End of vserver creation") >> $LOG2
+ echo "==================== See next stages in $LOG2" >> $LOG
+ # redirect log again
+ exec >> $LOG2 2>&1
+ LOG=$LOG2
+
+ echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date)
+ cp $COMMANDPATH /vservers/${BASE}/build/
- echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date) >> $LOG 2>&1
- cp $COMMANDPATH /vservers/${BASE}/
- # invoke this command in the vserver
- vserver ${BASE} exec /$COMMAND "$@" >> $LOG 2>&1
+ # invoke this command in the vserver for building (-T)
+ vserver ${BASE} exec /build/$COMMAND -T "${argv[@]}"
+ # if successful (we run in set -e), publish
+ webpath=$(echo $WEBPATH | sed -e s,@PLDISTRO@,"$PLDISTRO",g -e s,@BASE@,"$BASE",g)
+ weblog=${webpath}.txt
+ rm -rf $webpath $weblog
+ myplcs=$(find /vservers/$BASE/build/RPMS -name myplc\*rpm)
+ mkdir $webpath
+ cp $myplcs $webpath
+
+ # invoke this command again for invoking tests
+ vserver ${BASE} exec /build/$COMMAND -B "${argv[@]}"
+
+ success
else
- echo "In vserver : got args" "$@"
+ LOG=/build/build-log.txt
if [ -n "$DO_BUILD" ] ; then
build
- touch /build-ok
fi
- # xxx - need to gather builds under the build index before we can re-enable this
- #if [ -n "$DO_TEST" ] ; then
- #runtest ${BUILD}
- #fi
-
- success
+ # need ssh in the vserver
+ if [ -n "$DO_TEST" ] ; then
+ runtest
+ fi
+
fi
- # todo : gather results from various vservers into a single build index
- #ROOT=$ROOT/$DISTRO
- #BUILD=$ROOT/$BASE
-
}
##########
git://git.onelab.eu / infrastructure.git / blobdiff