-O should now work, -- is new

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 6d1137d..5527fbf 100755 (executable)
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -7,7 +7,7 @@
 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)"
@@ -36,6 +36,7 @@ function shortname () {
 # comment off for usual dailies
 MAJOR=5.0
 MINOR=rc01
+base_option=-b
 
 while [[ -n "$@" ]] ; do
     case "$1" in
@@ -48,10 +49,11 @@ 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
@@ -108,8 +110,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 +128,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 +152,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
@@ -166,7 +167,7 @@ for bits in $BITS; do
        s=$(shortname $d)
        buildname="${BASE}--tr${s}-${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 ${base_option} $buildname $extra_option"
        run $command
     done
 
@@ -174,7 +175,7 @@ for bits in $BITS; do
        p=linux${bits}
        buildname="${BASE}--tr${f}-${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 planetlab -p $p -f $f ${base_option} $buildname $extra_option"
        run $command
     done
 done