From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Fri, 9 May 2008 10:43:11 +0000 (+0000)
Subject: more flexible
X-Git-Tag: foo~331
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b60268bf3ba2440b998c043371a758ef11ad955e;p=infrastructure.git

more flexible
---

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 3361052..4fe6258 100755
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -8,8 +8,9 @@ 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_DISTROS (-td) BASE (-b)"
-    echo "RETRY (-O) TEST (-T) DRY_RUN (-n)"
+    echo "PLDISTROS (-d) FCDISTROS (-f) BITS (-i) TRUNK_DISTROS (-td) VS_PLDISTROS (-vd)"
+    echo "BASE (-b) RETRY (-O) TEST (-T) DRY_RUN (-n)"
+    echo "Use at least one space for blanking a set of distros"
     exit 1
 }
 
@@ -19,6 +20,7 @@ while [[ -n "$@" ]] ; do
 	-f) shift ; FCDISTROS="$FCDISTROS $1" ;;
 	-i) shift ; BITS="$BITS $1" ;;
 	-td) shift; TRUNK_DISTROS="$1" ;;
+	-vd) shift; VS_PLDISTROS="$1" ;;
 	-b) shift; BASE="$1" ;;
 	-O) RETRY=true ;;
 	-T) TEST=true ;;
@@ -37,6 +39,7 @@ DEFAULT_FCDISTROS="f8"
 DEFAULT_BITS="32 64"
 #DEFAULT_TRUNK_DISTROS="onelab"
 DEFAULT_TRUNK_DISTROS="onelab planetlab"
+DEFAULT_VS_PLDISTROS="onelab"
 DEFAULT_BASE="@DATE@"
 
 # export any of these to override - this is for manual use only
@@ -44,6 +47,7 @@ if [ -z "$PLDISTROS" ] ;	then PLDISTROS=$DEFAULT_PLDISTROS ;		else manual=true ;
 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_DISTROS" ] ;	then TRUNK_DISTROS=$DEFAULT_TRUNK_DISTROS ;	else manual=true ; fi
+if [ -z "$VS_PLDISTROS" ] ;	then VS_PLDISTROS=$DEFAULT_VS_PLDISTROS ;	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 ; }
@@ -86,7 +90,7 @@ done
 # does not test, so skip if test is requested
 if [ -z "$TEST" ] ; then
     f=centos5
-    for d in $TRUNK_DISTROS ; do
+    for d in $VS_PLDISTROS ; do
 	for bits in $BITS ; do
 	    p=linux${bits}
 	    s=$(shortname $d)