turn off f12/k22 builds

[infrastructure.git] / scripts / nightly-build.sh

diff --git a/scripts/nightly-build.sh b/scripts/nightly-build.sh
index dd1575e..9512f25 100755 (executable)
--- a/scripts/nightly-build.sh
+++ b/scripts/nightly-build.sh
@@ -8,17 +8,15 @@ ROOT=/build
 CHROOTBINDIR=/root/bin
 
 # default values, tunable with command-line options
-SVNPATH="svn+ssh://build@svn.one-lab.org/svn/build/trunk"
+SVNPATH="svn+ssh://build@svn.onelab.eu/svn/build/trunk"
 DISTRO=onelab
-MAILTO="onelab-build@one-lab.org"
-DISTROMAKETAGS=onelab-tags.mk
-PLEBOX=root@planet-lab.eu
-TESTBUILDURL="http://build.one-lab.org/"
+MAILTO="onelab-build@onelab.eu"
+PLDISTROTAGS=onelab-tags.mk
+TESTBUILDURL="http://build.onelab.eu/"
 TESTBOX=onelab-test.inria.fr
 TESTBOXSSH=root@onelab-test.inria.fr
-TESTSVNPATH="svn+ssh://build@svn.one-lab.org/svn/new_plc_api/trunk/plctest"
+TESTSVNPATH="svn+ssh://build@svn.onelab.eu/svn/new_plc_api/trunk/plctest"
 TESTSCRIPT=TestMain.py
-TESTSEND=TestSendMail
 ####################
 # plc chroot runs in UTC
 DATE=$(date -u +'%Y.%m.%d')
@@ -45,7 +43,7 @@ function success () {
     set -x
     touch ${BUILD}.ok
     if [ -n "$MAILTO" ] ; then
-       (echo "http://build.one-lab.org/$DISTRO/$BASE" ; echo "Completed on $(date)" ) | mail -s "Successfull build in ${BUILD}" $MAILTO
+       (echo "http://build.onelab.eu/$DISTRO/$BASE" ; echo "Completed on $(date)" ) | mail -s "Successfull build in ${BUILD}" $MAILTO
     fi
     cd ${ROOT}
     rm -f latest
@@ -86,22 +84,22 @@ function build () {
     cd $ROOT
     svn co $SVNPATH $BASE
 
-  # if TAGSTAG specified : update DISTROMAKETAGS with this tag
+  # if TAGSTAG specified : update PLDISTROTAGS with this tag
     if [ -n "$TAGSTAG" ] ; then
        cd $BASE
-       svn up -r $TAGSTAG $DISTROMAKETAGS
+       svn up -r $TAGSTAG $PLDISTROTAGS
        cd -
     fi
 
     show_env
     
     echo "Running make IN build $(pwd)"
-    make stage1=true ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE 
+    make stage1=true ${MAKEOPTS[@]} PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE 
     # in case we use an older build
     set +e
-    make ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE versions
+    make ${MAKEOPTS[@]} PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE versions
     set -e
-    make ${MAKEOPTS[@]} DISTROMAKETAGS=${DISTROMAKETAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
+    make ${MAKEOPTS[@]} PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
 
     # restore silent mode - otherwise cron gets it
     set +x
@@ -112,9 +110,7 @@ function runtest () {
     set -e
     trap failure ERR INT
 
-    echo -n"==============================> testing the sendmail service on PLE"
-    #under the chroot jail launch an ssh on ple and the script is run there
-    ssh ${PLEBOX} python -u /root/${TESTSEND} 
+     
 
     echo -n "============================== Starting $COMMAND:runtest on "
     date
@@ -152,10 +148,10 @@ function show_env () {
     echo SVNPATH=$SVNPATH
     echo MAKEVARS="${MAKEVARS[@]}"
     echo MAKEOPTS="${MAKEOPTS[@]}"
-    echo DISTROMAKETAGS="$DISTROMAKETAGS"
+    echo PLDISTROTAGS="$PLDISTROTAGS"
     echo TAGSTAG="$TAGSTAG"
-    echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file $DISTROMAKETAGS"
-    cat $BASE/$DISTROMAKETAGS
+    echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file $PLDISTROTAGS"
+    cat $BASE/$PLDISTROTAGS
     echo "XXXXXXXXXXXXXXXXXXXX end tags definition"
 }
 
@@ -166,8 +162,8 @@ function usage () {
     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 DISTRO"
-    echo " -t DISTROMAKETAGS"
-    echo " -r TAGSTAG - a tag that refers to DISTROMAKETAGS - defaults to HEAD"
+    echo " -t PLDISTROTAGS"
+    echo " -r TAGSTAG - a tag that refers to PLDISTROTAGS - 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 " -m MAILTO"
@@ -191,7 +187,7 @@ function main () {
                b) BASE=$OPTARG ;;
                u) USEOLD=true ;;
                d) DISTRO=$OPTARG ;;
-               t) DISTROMAKETAGS=$OPTARG ;;
+               t) PLDISTROTAGS=$OPTARG ;;
                r) TAGSTAG=$OPTARG ;;
                s) MAKEVARS=(${MAKEVARS[@]} $OPTARG) ;;
                n) MAILTO="" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;