building rc23/umts

[infrastructure.git] / scripts / all-builds.sh

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 6d1137d..e91f794 100755 (executable)
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -7,12 +7,12 @@
 COMMAND=$(basename $0)
 
 function usage () {
-    echo "Usage: $COMMAND"
+    echo "Usage: $COMMAND [options [ -- vbuild-nightly-options ]]"
     echo "In manual mode you should export the following vars (or use related option)"
     echo "MAJOR_DISTROS (-d) TRUNK_DISTROS (-td) TRUNK_FCDISTROS (-tf) VS_DISTROS (-vd)"
     echo "FCDISTROS (-f) BITS (-i) BASE (-b)"
     echo "BUILD_BRANCH (-bb) BUILD_TRUNK (-bt)"
-    echo "RETRY (-O) TEST (-T) DRY_RUN (-n)"
+    echo "Overwrite (-o) TEST (-T) DRY_RUN (-n)"
     echo "Use at least one space for blanking a set of distros"
     exit 1
 }
@@ -29,13 +29,18 @@ function shortname () {
     case $distro in
        onelab)         echo 1l;;
        planetlab)      echo pl;;
+       f?)             echo $distro;;
+       centos5)        echo c5;;
        *)              echo xx;;
     esac
 }
 
 # comment off for usual dailies
-MAJOR=5.0
-MINOR=rc01
+#MAJOR=5.0
+#MINOR=rc01
+MAJOR=4.2
+MINOR=rc23
+base_option=-b
 
 while [[ -n "$@" ]] ; do
     case "$1" in
@@ -48,15 +53,17 @@ while [[ -n "$@" ]] ; do
        -b) shift; BASE="$1" ;;
        -bb) BUILD_BRANCH=true ;;
        -bt) BUILD_TRUNK=true ;;
-       -O) RETRY=true ;;
+       -o) base_option=-o ;;
        -T) TEST=true ;;
        -n) DRY_RUN=true ;;
        -z) MINOR="" ;;
+       --) shift; extra_option="$@" ; shift $# ;;
        *) usage ;;
     esac
     shift
 done
 
+FCDISTRO=centos5
 DEFAULT_FCDISTROS="centos5"
 DEFAULT_BASE="@DATE@"
 
@@ -108,8 +115,7 @@ if [ -z "$TRUNK_DISTROS" ] ;        then TRUNK_DISTROS=$DEFAULT_TRUNK_DISTROS ;     else ma
 if [ -z "$TRUNK_FCDISTROS" ] ; then TRUNK_FCDISTROS=$DEFAULT_TRUNK_FCDISTROS ; else manual=true ; fi
 if [ -z "$VS_DISTROS" ] ;      then VS_DISTROS=$DEFAULT_VS_DISTROS ;           else manual=true ; fi
 if [ -z "$BASE" ] ;            then BASE=$DEFAULT_BASE ;                       else manual=true ; fi
-[ -n "$RETRY" ] &&     { extra_option="$extra_option -O" ; manual=true ; }
-[ -n "$TEST" ] &&      { extra_option="$extra_option -T" ; manual=true ; }
+[ -n "$TEST" ] &&      { extra_option="$extra_option -T" ; }
 [ -n "$DRY_RUN" ] &&   { manual=true ; }
 
 ############################## ${MAJOR}
@@ -127,7 +133,7 @@ for bits in $BITS; do
            fi
            command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
                -d $d -p $p -f $f -t ${d}-tags-${MAJOR}.mk \
-               -b $buildname $extra_option"
+               ${base_option} $buildname $extra_option"
            run $command
        done
     done
@@ -151,7 +157,7 @@ if [ -z "$TEST" ] ; then
            fi
            command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
            -d $d -p $p -f $f -t ${d}-tags-${MAJOR}.mk \
-           -b $buildname -B vserver"
+           ${base_option} $buildname -B $extra_option vserver"
            run $command
        done
     done
@@ -162,19 +168,24 @@ fi
 for bits in $BITS; do
 
     for d in $TRUNK_DISTROS; do
+       ds=$(shortname $d)
        p=linux${bits}
-       s=$(shortname $d)
-       buildname="${BASE}--tr${s}-${bits}"
+       f=$FCDISTRO
+       fs=$(shortname $f)
+       buildname="${BASE}--tr${fs}-${ds}-${bits}"
        command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
-        -d $d -p $p -b $buildname $extra_option"
+        -d $d -p $p -f $f ${base_option} $buildname $extra_option"
        run $command
     done
 
     for f in $TRUNK_FCDISTROS; do 
+       fs=$(shortname $f)      
        p=linux${bits}
-       buildname="${BASE}--tr${f}-${bits}"
+       d=planetlab
+       ds=$(shortname $d)
+       buildname="${BASE}--tr${fs}-${ds}-${bits}"
        command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
-        -d planetlab -p $p -f $f -b $buildname $extra_option"
+        -d $d -p $p -f $f ${base_option} $buildname $extra_option"
        run $command
     done
 done