COMMANDPATH=$0
COMMAND=$(basename $0)
+# close stdin, as with ubuntu and debian VMs this script tends to hang and wait for input ..
+0<&-
+
# old guests have e.g. mount in /bin but this is no longer part of
# the standard PATH in recent hosts after usrmove, so let's keep it simple
export PATH=$PATH:/bin:/sbin
# default values, tunable with command-line options
DEFAULT_FCDISTRO=f20
-DEFAULT_PLDISTRO=planetlab
+DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
-DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
+DEFAULT_MAILTO="build at onelab.eu"
DEFAULT_BUILD_SCM_URL="git://git.onelab.eu/build"
+DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
# default gpg path used in signing yum repo
DEFAULT_GPGPATH="/etc/planetlab"
RUN_LOG_EXTRAS=""
# 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/"
- # this is where the buildurl is pointing towards
- DEFAULT_WEBROOT="/build/"
- DEFAULT_TESTMASTER="manager.test.planet-lab.org"
-fi
+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"
####################
# assuming vm runs in UTC
rsync --archive $VERBOSE "$@" root@${WEBHOST}:"$remote" ;
}
+function pretty_duration () {
+ total_seconds=$1; shift
+
+ seconds=$(($total_seconds%60))
+ total_minutes=$(($total_seconds/60))
+ minutes=$(($total_minutes%60))
+ hours=$(($total_minutes/60))
+
+ printf "%02d:%02d:%02d" $hours $minutes $seconds
+}
+
# Notify recipient of failure or success, manage various stamps
function failure() {
set -x
# early stage ? - let's not create /build/@PLDISTRO@
- if test -z "$WEBLOG" ; then
- WEBHOST=$(hostname)
+ if [ -z "$WEBLOG" ] ; then
+ WEBHOST=localhost
WEBPATH=/tmp
WEBBASE=/tmp/lbuild-early-$(date +%Y-%m-%d)
WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
function success () {
set -x
# early stage ? - let's not create /build/@PLDISTRO@
- if test -z "$WEBLOG" ; then
- WEBHOST=$(hostname)
+ if [ -z "$WEBLOG" ] ; then
+ WEBHOST=localhost
WEBPATH=/tmp
WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
fi
echo "including full build log at $WEBBASE_URL/log.txt" ; \
[ -n "$DO_TEST" ] && echo "and complete test logs at $WEBBASE_URL/testlogs" ; \
[ -n "$IGNORED" ] && echo "WARNING: some tests steps failed but were ignored - see trace file" ; \
- echo "BUILD TIME: begin $BUILD_BEG -- end $BUILD_END -- duration $(($BUILD_END_S-$BUILD_BEG_S))" ; \
+ echo "BUILD TIME: begin $BUILD_BEG -- end $BUILD_END -- duration $(pretty_duration $(($BUILD_END_S-$BUILD_BEG_S)))" ; \
) | sendmail $MAILTO
fi
# XXX For some reason, we haven't been getting this email for successful builds. If this sleep
# toss the build in the bargain, so the tests don't need to mess with extracting it
rsync --verbose --archive $(rootdir $BASE)/build/MODULES/build ${testmaster_ssh}:${BASE}/
- # invoke test on testbox - pass url and build url - so the tests can use vtest-init-lxc.sh
+ # invoke test on testbox - pass url and build url - so the tests can use lbuild-initvm.sh
run_log_env="-p $PERSONALITY -d $PLDISTRO -f $FCDISTRO"
# temporarily turn off set -e
set +e
- ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${BUILD_SCM_URL} --url ${url} $run_log_env $RUN_LOG_EXTRAS $VERBOSE --all; retcod=$?
+ trap - ERR INT
+ ssh 2>&1 ${testmaster_ssh} ${testdir}/run_log --build ${BUILD_SCM_URL} --url ${url} $run_log_env $RUN_LOG_EXTRAS $VERBOSE --all; retcod=$?
+
set -e
-
+ trap failure ERR INT
# interpret retcod of TestMain.py; 2 means there were ignored steps that failed
- echo "received from run_log" $retcod
+ echo "retcod from run_log" $retcod
case $retcod in
0) success=true; IGNORED="" ;;
- 1) success=true; IGNORED=true ;;
- *) success="" ;;
+ 2) success=true; IGNORED=true ;;
+ *) success=""; IGNORED="" ;;
esac
# gather logs in the build vm
echo " -f fcdistro - defaults to $DEFAULT_FCDISTRO"
echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
echo " -p personality - defaults to $DEFAULT_PERSONALITY"
- echo " -m mailto - no default"
+ echo " -m mailto - defaults to $DEFAULT_MAILTO"
echo " -s build_scm_url - git URL where to fetch the build module - defaults to $DEFAULT_BUILD_SCM_URL"
echo " define GIT tag or branch name appending @tagname to url"
echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk"
function main () {
set -e
+ trap failure ERR INT
# parse arguments
MAKEVARS=()
[ -z "$FCDISTRO" ] && FCDISTRO=$DEFAULT_FCDISTRO
[ -z "$PLDISTRO" ] && PLDISTRO=$DEFAULT_PLDISTRO
[ -z "$PERSONALITY" ] && PERSONALITY=$DEFAULT_PERSONALITY
+ [ -z "$MAILTO" ]] && MAILTO=$(echo $DEFAULT_MAILTO | sed -e 's, at ,@,')
[ -z "$PLDISTROTAGS" ] && PLDISTROTAGS="${PLDISTRO}-tags.mk"
[ -z "$BASE" ] && BASE="$DEFAULT_BASE"
[ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
GIT_REPO=$(echo $BUILD_SCM_URL | cut -d@ -f1)
GIT_TAG=$(echo $BUILD_SCM_URL | cut -s -d@ -f2)
GIT_TAG=${GIT_TAG:-master}
- mkdir -p $tmpdir; git archive --remote=$GIT_REPO $GIT_TAG | tar -C $tmpdir -xf -
+ mkdir -p $tmpdir
+ ( git archive --remote=$GIT_REPO $GIT_TAG | tar -C $tmpdir -xf -) || \
+ ( echo "==================== git archive FAILED, trying git clone instead" ; \
+ git clone $GIT_REPO $tmpdir && cd $tmpdir && git checkout $GIT_TAG && rm -rf .git)
# Create lxc vm
cd $tmpdir
rm -rf $tmpdir
# Extract build again - in the vm
[ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY}
- # xxx not working as of now - waiting for Sapan to look into this
virsh -c lxc:/// lxc-enter-namespace $BASE /bin/bash -c "git clone $GIT_REPO /build; cd /build; git checkout $GIT_TAG"
fi
echo "XXXXXXXXXX $COMMAND: preparation of vm $BASE done" $(date)
# publish to the web so run_log can find them
set +e
+ trap - ERR INT
webpublish rm -rf $WEBPATH/$BASE
# guess if we've been doing any debian-related build
if [ ! -f $(rootdir $BASE)/etc/debian_version ] ; then
release=$(rootdir $BASE)/build/myplc-release
[ -f $release ] && webpublish_rsync_files $WEBPATH/$BASE $release
set -e
+ trap failure ERR INT
# create yum repo and sign packages.
if [ -n "$SIGNYUMREPO" ] ; then
git://git.onelab.eu / build.git / blobdiff