git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run test on the right box
[build.git]
/
vbuild-nightly.sh
diff --git
a/vbuild-nightly.sh
b/vbuild-nightly.sh
index
436d037
..
6ac03a3
100755
(executable)
--- a/
vbuild-nightly.sh
+++ b/
vbuild-nightly.sh
@@
-10,15
+10,17
@@
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
DEFAULT_PERSONALITY=linux32
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="onelab onelab_testbox32"
+DEFAULT_TESTCONFIG64="onelab onelab_testbox64"
+DEFAULT_IFNAME=eth0
# web publishing results
DEFAULT_WEBPATH="/build/@PLDISTRO@/"
# for the test part
TESTBUILDURL="http://build.one-lab.org/"
# web publishing results
DEFAULT_WEBPATH="/build/@PLDISTRO@/"
# for the test part
TESTBUILDURL="http://build.one-lab.org/"
-TESTBOX=onelab-test.inria.fr
-TESTBOXSSH=root@onelab-test.inria.fr
-TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
+TESTBOXSSH=root@testbox1.one-lab.org
####################
# assuming vserver runs in UTC
DATE=$(date +'%Y.%m.%d')
####################
# assuming vserver runs in UTC
DATE=$(date +'%Y.%m.%d')
@@
-94,6
+96,7
@@
EOF
function failure() {
set -x
WEBLOG=${WEBPATH}/${BASE}.log.txt
function failure() {
set -x
WEBLOG=${WEBPATH}/${BASE}.log.txt
+ mkdir -p ${WEBPATH}
cp $LOG ${WEBLOG}
summary $LOG >> ${WEBLOG}
(echo -n "============================== $COMMAND: failure at " ; date ; tail -c 20k $WEBLOG) > ${WEBLOG}.ko
cp $LOG ${WEBLOG}
summary $LOG >> ${WEBLOG}
(echo -n "============================== $COMMAND: failure at " ; date ; tail -c 20k $WEBLOG) > ${WEBLOG}.ko
@@
-106,6
+109,7
@@
function failure() {
function success () {
set -x
WEBLOG=${WEBPATH}/${BASE}.log.txt
function success () {
set -x
WEBLOG=${WEBPATH}/${BASE}.log.txt
+ mkdir -p ${WEBPATH}
cp $LOG ${WEBLOG}
summary $LOG >> ${WEBLOG}
touch ${WEBLOG}.ok
cp $LOG ${WEBLOG}
summary $LOG >> ${WEBLOG}
touch ${WEBLOG}.ok
@@
-158,13
+162,13
@@
function runtest () {
echo -n "============================== Starting $COMMAND:runtest on $(date)"
### the URL to the myplc package
echo -n "============================== Starting $COMMAND:runtest on $(date)"
### the URL to the myplc package
- rpm=$(
(cd /vservers/$BASE/build/RPMS/i386 ; ls myplc-[0-9]*.rpm)
)
+ rpm=$(
find /vservers/$BASE/build/RPMS -name 'myplc-[0-9]*'
)
if [ ${#rpm[@]} != 1 ] ; then
echo "$COMMAND: Cannot locate rpm for testing"
failure
exit 1
fi
if [ ${#rpm[@]} != 1 ] ; then
echo "$COMMAND: Cannot locate rpm for testing"
failure
exit 1
fi
- url=$
{TESTBUILDURL}${PLDISTRO}/${BASE}/RPMS/i386/${rpm}
+ url=$
(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
# compute test directory name on test box
testdir=test-${BASE}
# compute test directory name on test box
testdir=test-${BASE}
@@
-173,8
+177,7
@@
function runtest () {
# check it out
ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
# invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
# check it out
ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
# invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
- ssh 2>&1 ${TESTBOXSSH} python -u ${testdir}/runtest --build ${SVNPATH} --url ${url} --all
- # still missing - need to populate /var/www/html/install-rpms on the myplc
+ ssh 2>&1 ${TESTBOXSSH} python -u ${testdir}/runtest --build ${SVNPATH} --url ${url} --config "%{TESTCONFIG}" --all
if [ "$?" != 0 ] ; then
failure
if [ "$?" != 0 ] ; then
failure
@@
-209,7
+212,6
@@
function usage () {
echo "Usage: $COMMAND [option] make-targets"
echo "This is $REVISION"
echo "Supported options"
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 " -f fcdistro - defaults to $DEFAULT_FCDISTRO"
echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
echo " -p personality - defaults to $DEFAULT_PERSONALITY"
@@
-218,14
+220,18
@@
function usage () {
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 " -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 " -x testsvnpath - defaults to $DEFAULT_TESTSVNPATH"
+ echo " -c testconfig - defaults to $DEFAULT_TESTCONFIG32 or $DEFAULT_TESTCONFIG64"
echo " -w webpath - defaults to $DEFAULT_WEBPATH"
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"
echo " -B : run build only"
echo " -T : run test only"
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 " -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
}
exit 1
}
@@
-233,18
+239,13
@@
function main () {
set -e
set -e
- # preserve arguments for passing them again later
- declare -a argv
- for arg in "$@"; do argv=(${argv[@]} "$arg") ; done
-
# parse arguments
MAKEVARS=()
DRY_RUN=
DO_BUILD=true
DO_TEST=true
# parse arguments
MAKEVARS=()
DRY_RUN=
DO_BUILD=true
DO_TEST=true
- while getopts "
nf:d:b:p:t:r:s:om:a:w:BTvh7
" opt ; do
+ while getopts "
f:d:p:b:t:r:s:x:c:w:m:OBTnv7a:i:
" opt ; do
case $opt in
case $opt in
- n) DRY_RUN="-n" ;;
f) FCDISTRO=$OPTARG ;;
d) PLDISTRO=$OPTARG ;;
p) PERSONALITY=$OPTARG ;;
f) FCDISTRO=$OPTARG ;;
d) PLDISTRO=$OPTARG ;;
p) PERSONALITY=$OPTARG ;;
@@
-252,19
+253,27
@@
function main () {
t) PLDISTROTAGS=$OPTARG ;;
r) TAGSRELEASE=$OPTARG ;;
s) SVNPATH=$OPTARG ;;
t) PLDISTROTAGS=$OPTARG ;;
r) TAGSRELEASE=$OPTARG ;;
s) SVNPATH=$OPTARG ;;
- o) OVERWRITEMODE=true ;;
- m) MAILTO=$OPTARG ;;
- a) MAKEVARS=(${MAKEVARS[@]} "$OPTARG") ;;
+ x) TESTSVNPATH=$OPTARG ;;
+ c) TESTCONFIG="$TESTCONFIG $OPTARG" ;;
w) WEBPATH=$OPTARG ;;
w) WEBPATH=$OPTARG ;;
+ m) MAILTO=$OPTARG ;;
+ O) OVERWRITEMODE=true ;;
B) DO_TEST= ;;
T) DO_BUILD= ; OVERWRITEMODE=true ;;
B) DO_TEST= ;;
T) DO_BUILD= ; OVERWRITEMODE=true ;;
+ n) DRY_RUN="-n" ;;
v) set -x ;;
7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
v) set -x ;;
7) BASE="$(date +%a|tr A-Z a-z)-@FCDISTRO@" ;;
+ a) MAKEVARS=(${MAKEVARS[@]} "$OPTARG") ;;
+ i) IFNAME=$OPTARG ;;
h|*) usage ;;
esac
done
h|*) usage ;;
esac
done
- shift $(($OPTIND - 1))
+ # preserve options for passing them again later, together with expanded base
+ declare -a options
+ toshift=$(($OPTIND - 1))
+ arg=1; while [ $arg -le $toshift ] ; do options=(${options[@]} "$1") ; shift; arg=$(($arg+1)) ; done
+
MAKETARGETS="$@"
# set defaults
MAKETARGETS="$@"
# set defaults
@@
-274,7
+283,11
@@
function main () {
[ -z "$PLDISTROTAGS" ] && PLDISTROTAGS="${PLDISTRO}-tags.mk"
[ -z "$BASE" ] && BASE="$DEFAULT_BASE"
[ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
[ -z "$PLDISTROTAGS" ] && PLDISTROTAGS="${PLDISTRO}-tags.mk"
[ -z "$BASE" ] && BASE="$DEFAULT_BASE"
[ -z "$WEBPATH" ] && WEBPATH="$DEFAULT_WEBPATH"
+ [ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME"
[ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
[ -z "$SVNPATH" ] && SVNPATH="$DEFAULT_SVNPATH"
+ [ -z "$TESTSVNPATH" ] && TESTSVNPATH="$DEFAULT_TESTSVNPATH"
+ [ "$PERSONALITY" == linux32] && [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG32"
+ [ "$PERSONALITY" == linux64] && [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG64"
[ -n "$DRY_RUN" ] && MAILTO=""
[ -n "$DRY_RUN" ] && MAILTO=""
@@
-338,7
+351,7
@@
function main () {
svn export $SVNPATH $tmpdir
# Create vserver
cd $tmpdir
svn export $SVNPATH $tmpdir
# Create vserver
cd $tmpdir
- ./vbuild-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY}
${BASE}
+ ./vbuild-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY}
-i ${IFNAME} ${BASE}
# cleanup
cd -
rm -rf $tmpdir
# cleanup
cd -
rm -rf $tmpdir
@@
-365,7
+378,7
@@
function main () {
# invoke this command in the vserver for building (-T)
vserver ${BASE} exec chmod +x /build/$COMMAND
# invoke this command in the vserver for building (-T)
vserver ${BASE} exec chmod +x /build/$COMMAND
- vserver ${BASE} exec /build/$COMMAND "${
argv[@]}" -b "${BASE}"
+ vserver ${BASE} exec /build/$COMMAND "${
options[@]}" -b "${BASE}" $MAKETARGETS
fi
# publish to the web so runtest can find them
fi
# publish to the web so runtest can find them