From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Tue, 30 Sep 2008 11:38:30 +0000 (+0000)
Subject: dont rely on default fcdistro, always specify it
X-Git-Tag: foo~270
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eb397ff349f4ebde92697187171279013a1f46b1;p=infrastructure.git

dont rely on default fcdistro, always specify it
---

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 87739f6..9845bcd 100755
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -59,6 +59,7 @@ while [[ -n "$@" ]] ; do
     shift
 done
 
+FCDISTRO=centos5
 DEFAULT_FCDISTROS="centos5"
 DEFAULT_BASE="@DATE@"
 
@@ -165,17 +166,20 @@ for bits in $BITS; do
     for d in $TRUNK_DISTROS; do
 	p=linux${bits}
 	s=$(shortname $d)
-	buildname="${BASE}--tr${s}-${bits}"
+	f=$FCDISTRO
+	buildname="${BASE}--tr${f}-${s}-${bits}"
 	command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
-	 -d $d -p $p ${base_option} $buildname $extra_option"
+	 -f $f -d $d -p $p ${base_option} $buildname $extra_option"
 	run $command
     done
 
     for f in $TRUNK_FCDISTROS; do 
 	p=linux${bits}
-	buildname="${BASE}--tr${f}-${bits}"
+	d=planetlab
+	s=$(shortname $d)
+	buildname="${BASE}--tr${f}-${s}-${bits}"
 	command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
-	 -d planetlab -p $p -f $f ${base_option} $buildname $extra_option"
+	 -d $d -p $p -f $f ${base_option} $buildname $extra_option"
 	run $command
     done
 done