more variants

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 947a6ae..3361052 100755 (executable)
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -8,7 +8,7 @@ COMMAND=$(basename $0)
 function usage () {
     echo "Usage: $COMMAND"
     echo "In manual mode you should export the following vars (or use related option)"
-    echo "PLDISTROS (-d) FCDISTROS (-f) BITS (-i) TRUNK_DISTRO (-td) BASE (-b)"
+    echo "PLDISTROS (-d) FCDISTROS (-f) BITS (-i) TRUNK_DISTROS (-td) BASE (-b)"
     echo "RETRY (-O) TEST (-T) DRY_RUN (-n)"
     exit 1
 }
@@ -18,7 +18,7 @@ while [[ -n "$@" ]] ; do
        -d) shift ; PLDISTROS="$PLDISTROS $1" ;;
        -f) shift ; FCDISTROS="$FCDISTROS $1" ;;
        -i) shift ; BITS="$BITS $1" ;;
-       -td) shift; TRUNK_DISTRO="$1" ;;
+       -td) shift; TRUNK_DISTROS="$1" ;;
        -b) shift; BASE="$1" ;;
        -O) RETRY=true ;;
        -T) TEST=true ;;
@@ -35,14 +35,15 @@ done
 DEFAULT_PLDISTROS="planetlab onelab"
 DEFAULT_FCDISTROS="f8"
 DEFAULT_BITS="32 64"
-DEFAULT_TRUNK_DISTRO=onelab
+#DEFAULT_TRUNK_DISTROS="onelab"
+DEFAULT_TRUNK_DISTROS="onelab planetlab"
 DEFAULT_BASE="@DATE@"
 
 # export any of these to override - this is for manual use only
 if [ -z "$PLDISTROS" ] ;       then PLDISTROS=$DEFAULT_PLDISTROS ;             else manual=true ; fi
 if [ -z "$FCDISTROS" ] ;       then FCDISTROS=$DEFAULT_FCDISTROS ;             else manual=true ; fi
 if [ -z "$BITS" ] ;            then BITS=$DEFAULT_BITS ;                       else manual=true ; fi
-if [ -z "$TRUNK_DISTRO" ] ;    then TRUNK_DISTRO=$DEFAULT_TRUNK_DISTRO ;       else manual=true ; fi
+if [ -z "$TRUNK_DISTROS" ] ;   then TRUNK_DISTROS=$DEFAULT_TRUNK_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 ; }
@@ -85,7 +86,7 @@ done
 # does not test, so skip if test is requested
 if [ -z "$TEST" ] ; then
     f=centos5
-    for d in $TRUNK_DISTRO ; do
+    for d in $TRUNK_DISTROS ; do
        for bits in $BITS ; do
            p=linux${bits}
            s=$(shortname $d)
@@ -101,7 +102,7 @@ fi
 
 ############################## TRUNK
 # raw - std planetlab x f8 x 32bits for deploying on alpha nodes
-for d in $TRUNK_DISTRO; do
+for d in $TRUNK_DISTROS; do
     for bits in $BITS; do
        p=linux${bits}
        s=$(shortname $d)
@@ -112,3 +113,4 @@ for d in $TRUNK_DISTRO; do
     done
 done
 
+##############################