X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=5ee38d9a3f386f46d7548218c493168f74b2722f;hb=8082297d6066b0a17d7427df2d311d1612bf31f8;hp=76b42fb5a1b25c1648619658a47c06f3b11c377c;hpb=338106480fd7a529f93cc2f973840258c6d8f29f;p=build.git diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh index 76b42fb5..5ee38d9a 100755 --- a/vbuild-nightly.sh +++ b/vbuild-nightly.sh @@ -1,5 +1,5 @@ #!/bin/bash -REVISION=$(echo '$Revision$' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' ) +REVISION=$(echo '$Revision: 18120 $' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' ) COMMANDPATH=$0 COMMAND=$(basename $0) @@ -9,7 +9,7 @@ DEFAULT_FCDISTRO=centos5 DEFAULT_PLDISTRO=planetlab DEFAULT_PERSONALITY=linux32 DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@" -DEFAULT_build_SVNPATH="http://svn.planet-lab.org/svn/build/trunk" +DEFAULT_BUILD_SCM_URL="git://git.onelab.eu/build" DEFAULT_IFNAME=eth0 # default gpg path used in signing yum repo @@ -121,7 +121,7 @@ function webpublish_append_stdin_to_file () { ssh root@${WEBHOST} cat \>\> $1; } function failure() { set -x # early stage ? - let's not create /build/@PLDISTRO@ - if webpublish_misses_dir $WEBPATH ; then + if test -z "$WEBLOG" ; then WEBHOST=localhost WEBPATH=/tmp WEBBASE=/tmp/vbuild-early-$(date +%Y-%m-%d) @@ -149,7 +149,7 @@ function failure() { function success () { set -x # early stage ? - let's not create /build/@PLDISTRO@ - if webpublish_misses_dir ${WEBPATH} ; then + if test -z "$WEBLOG" ; then WEBHOST=localhost WEBPATH=/tmp WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt @@ -199,9 +199,13 @@ function build () { echo "Running make IN $(pwd)" # stuff our own variable settings + if echo $BUILD_SCM_URL | grep -q git ; then + MAKEVARS=("build-GITPATH=${BUILD_SCM_URL}" "${MAKEVARS[@]}") + else + MAKEVARS=("build-SVNPATH=${BUILD_SCM_URL}" "${MAKEVARS[@]}") + fi MAKEVARS=("PLDISTRO=${PLDISTRO}" "${MAKEVARS[@]}") MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}") - MAKEVARS=("build-SVNPATH=${build_SVNPATH}" "${MAKEVARS[@]}") MAKEVARS=("PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}") MAKEVARS=("MAILTO=${MAILTO}" "${MAKEVARS[@]}") MAKEVARS=("WEBPATH=${WEBPATH}" "${MAKEVARS[@]}") @@ -212,8 +216,6 @@ function build () { # stage1 make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true - # store tests_gitpath - make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true tests_gitpath # versions make -C /build $DRY_RUN "${MAKEVARS[@]}" versions # actual stuff @@ -230,15 +232,6 @@ function run_log () { echo "============================== BEG $COMMAND:run_log on $(date)" - # where to find TESTS_GITPATH - stamp=/vservers/$BASE/build/tests_gitpath - if [ ! -f $stamp ] ; then - echo "$COMMAND: Cannot figure TESTS_GITPATH from missing $stamp" - failure - exit 1 - fi - TESTS_GITPATH=$(cat $stamp) - ### the URL to the RPMS/ location # f12 now has everything in i686; try i386 first as older fedoras have both url="" @@ -262,15 +255,17 @@ function run_log () { # test directory name on test box testdir=${BASE} + # clean it ssh -n ${testmaster_ssh} rm -rf ${testdir} ${testdir}.git - # check it out - just the 'system' subdir is enough - gitrepo=$(echo $TESTS_GITPATH | cut -d@ -f1) - gittag=$(echo $TESTS_GITPATH | cut -s -d@ -f2) - ssh -n ${testmaster_ssh} git clone ${gitrepo} ${testdir}.git - [ -n "$gittag" ] && ssh -n ${testmaster_ssh} "cd ${testdir}.git ; git checkout ${gittag}" - ssh -n ${testmaster_ssh} "mv ${testdir}.git/system ${testdir} ; rm -rf ${testdir}.git" + # check it out in the build + vserver $BASE exec make -C /build tests-module + + # push it onto the testmaster - just the 'system' subdir is enough + rsync --verbose --archive /vservers/$BASE/build/MODULES/tests/system/ ${testmaster_ssh}:${BASE} + # toss the build in the bargain, so the tests don't need to mess with extracting it + rsync --verbose --archive /vservers/$BASE/build/MODULES/build ${testmaster_ssh}:${BASE}/ # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh configs="" @@ -281,11 +276,12 @@ function run_log () { # need to proceed despite of set -e success=true - ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${build_SVNPATH} --url ${url} $configs $test_env $VERBOSE --all || success= + # passing the build_scm_url should not be needed anymore + ssh 2>&1 -n ${testmaster_ssh} ${testdir}/run_log --build ${BUILD_SCM_URL} --url ${url} $configs $test_env $VERBOSE --all || success= - # gather logs in the vserver + # gather logs in the build vserver mkdir -p /vservers/$BASE/build/testlogs - ssh 2>&1 -n ${testmaster_ssh} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || : + rsync --verbose --archive ${testmaster_ssh}:$BASE/logs/ /vservers/$BASE/build/testlogs # push them to the build web chmod -R a+r /vservers/$BASE/build/testlogs/ webpublish_rsync_dir /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/ @@ -360,7 +356,7 @@ function show_env () { echo PLDISTRO=$PLDISTRO echo PERSONALITY=$PERSONALITY echo BASE=$BASE - echo build_SVNPATH=$build_SVNPATH + echo BUILD_SCM_URL=$BUILD_SCM_URL echo MAKEVARS="${MAKEVARS[@]}" echo DRY_RUN="$DRY_RUN" echo PLDISTROTAGS="$PLDISTROTAGS" @@ -408,7 +404,7 @@ function usage () { echo " -d pldistro - defaults to $DEFAULT_PLDISTRO" echo " -p personality - defaults to $DEFAULT_PERSONALITY" echo " -m mailto - no default" - echo " -s svnpath - where to fetch the build module - defaults to $DEFAULT_build_SVNPATH" + echo " -s build_scm_url - git or svn URL where to fetch the build module - defaults to $DEFAULT_BUILD_SCM_URL" echo " -t pldistrotags - defaults to \${PLDISTRO}-tags.mk" echo " -b base - defaults to $DEFAULT_BASE" echo " @NAME@ replaced as appropriate" @@ -452,7 +448,7 @@ function main () { d) PLDISTRO=$OPTARG ;; p) PERSONALITY=$OPTARG ;; m) MAILTO=$OPTARG ;; - s) build_SVNPATH=$OPTARG ;; + s) BUILD_SCM_URL=$OPTARG ;; t) PLDISTROTAGS=$OPTARG ;; b) BASE=$OPTARG ;; o) OVERBASE=$OPTARG ;; @@ -504,7 +500,7 @@ function main () { [ -z "$GPGPATH" ] && GPGPATH="$DEFAULT_GPGPATH" [ -z "$GPGUID" ] && GPGUID="$DEFAULT_GPGUID" [ -z "$IFNAME" ] && IFNAME="$DEFAULT_IFNAME" - [ -z "$build_SVNPATH" ] && build_SVNPATH="$DEFAULT_build_SVNPATH" + [ -z "$BUILD_SCM_URL" ] && BUILD_SCM_URL="$DEFAULT_BUILD_SCM_URL" [ -z "$TESTCONFIG" ] && TESTCONFIG="$DEFAULT_TESTCONFIG" [ -z "$TESTMASTER" ] && TESTMASTER="$DEFAULT_TESTMASTER" @@ -564,22 +560,25 @@ function main () { echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date) # start in case e.g. we just rebooted vserver ${BASE} start || : - # update build - [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY} - vserver ${BASE} exec svn update /build - # make sure we refresh the tests place in case it has changed - rm -f /build/tests_gitpath - # get environment from the first run + # retrieve environment from the previous run FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh) - # retrieve all in one run + BUILD_SCM_URL=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH +build-GITPATH) + # for efficiency, crop everything in one make run tmp=/tmp/${BASE}-env.sh vserver ${BASE} exec make --no-print-directory -C /build stage1=skip \ ++PLDISTRO ++PLDISTROTAGS ++PERSONALITY ++MAILTO ++WEBPATH ++TESTBUILDURL ++WEBROOT > $tmp - # sh vars cannot have a minus - echo build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH) >> $tmp . $tmp rm -f $tmp - options=(${options[@]} -d $PLDISTRO -t $PLDISTROTAGS -s $build_SVNPATH) + # update build + [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY} + if echo $BUILD_SCM_URL | grep -q git ; then + vserver $BASE exec bash -c "cd /build; git pull; make tests-clean" + else + vserver $BASE exec svn update /build + fi + # make sure we refresh the tests place in case it has changed + rm -f /build/MODULES/tests + options=(${options[@]} -d $PLDISTRO -t $PLDISTROTAGS -s $BUILD_SCM_URL) [ -n "$PERSONALITY" ] && options=(${options[@]} -p $PERSONALITY) [ -n "$MAILTO" ] && options=(${options[@]} -m $MAILTO) [ -n "$WEBPATH" ] && options=(${options[@]} -w $WEBPATH) @@ -610,7 +609,14 @@ function main () { ### extract the whole build - much simpler tmpdir=/tmp/$COMMAND-$$ - svn export $build_SVNPATH $tmpdir + if echo $BUILD_SCM_URL | grep -q git ; then + 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 - + else + svn export $BUILD_SCM_URL $tmpdir + fi # Create vserver cd $tmpdir ./vbuild-init-vserver.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${BASE} @@ -619,7 +625,11 @@ function main () { rm -rf $tmpdir # Extract build again - in the vserver [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY} - vserver ${BASE} exec svn checkout ${build_SVNPATH} /build + if echo $BUILD_SCM_URL | grep -q git ; then + vserver $BASE exec bash -c "git clone $GIT_REPO /build; cd /build; git checkout $GIT_TAG" + else + vserver $BASE exec svn checkout ${BUILD_SCM_URL} /build + fi fi # install ssh key in vserver echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date)