new policy

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 18c6701..28e42f7 100755 (executable)
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -34,8 +34,8 @@ function shortname () {
 }
 
 # comment off for usual dailies
-MAJOR=4.2
-MINOR=rc22
+MAJOR=5.0
+MINOR=rc01
 
 while [[ -n "$@" ]] ; do
     case "$1" in
@@ -57,17 +57,17 @@ while [[ -n "$@" ]] ; do
     shift
 done
 
-DEFAULT_FCDISTROS="f8"
+DEFAULT_FCDISTROS="centos5"
 DEFAULT_BASE="@DATE@"
 
 function trunk_builds () {
-    DEFAULT_BITS="32"
+    DEFAULT_BITS="32 64"
     DEFAULT_MAJOR_DISTROS=""
     DEFAULT_VS_DISTROS=""
 # 5.0 ready for planetlab distro only so far
     DEFAULT_TRUNK_DISTROS="planetlab"
 #    DEFAULT_TRUNK_DISTROS="onelab planetlab"
-    DEFAULT_TRUNK_FCDISTROS="centos5 f9"
+    DEFAULT_TRUNK_FCDISTROS="f8 f9"
 }
 
 function branch_builds () {
@@ -159,8 +159,9 @@ fi
 
 ############################## TRUNK
 # raw - std planetlab x f8 x 32bits for deploying on alpha nodes
-for d in $TRUNK_DISTROS; do
-    for bits in $BITS; do
+for bits in $BITS; do
+
+    for d in $TRUNK_DISTROS; do
        p=linux${bits}
        s=$(shortname $d)
        buildname="${BASE}--tr${s}-${bits}"
@@ -168,10 +169,8 @@ for d in $TRUNK_DISTROS; do
         -d $d -p $p -b $buildname $extra_option"
        run $command
     done
-done
 
-for f in $TRUNK_FCDISTROS; do 
-    for bits in $BITS; do
+    for f in $TRUNK_FCDISTROS; do 
        p=linux${bits}
        buildname="${BASE}--tr${f}-${bits}"
        command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \