From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Fri, 25 Apr 2008 10:52:52 +0000 (+0000)
Subject: switch back to daily mode
X-Git-Tag: foo~335
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b71766f25813286ab0e3013f7a718faf040a38ce;p=infrastructure.git

switch back to daily mode
---

diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh
index 2c2679a..065805c 100755
--- a/scripts/all-builds.sh
+++ b/scripts/all-builds.sh
@@ -60,50 +60,48 @@ function shortname () {
     esac
 }
 
+############################## 4.2
 for d in $PLDISTROS ; do
     for f in $FCDISTROS ; do 
 	for bits in $BITS; do
 	    p=linux${bits}
 	    s=$(shortname $d)
-#	    command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
-#		-d $d -p $p -f $f \
-#		-t ${d}-tags-4.2.mk \
-#		-b @DATE@--${s}.4.2--${f}-${bits} $extra_option"
+	    buildname="@DATE@--${s}.4.2--${f}-${bits}"
+#	    buildname="${d}-4.2-rc2.1lab-${f}-${bits}"
 	    command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
-		-d $d -p $p -f $f \
-		-t ${d}-tags-4.2.mk \
-		-b ${d}-4.2-rc2.1lab-${f}-${bits} $extra_option"
+		-d $d -p $p -f $f -t ${d}-tags-4.2.mk \
+		-b $buildname $extra_option"
 	    run $command
 	done
     done
 done
 
-## # raw - std planetlab x f8 x 32bits for deploying on alpha nodes
-## for d in $TRUNK_DISTRO; do
-##     for bits in $BITS; do
-## 	p=linux${bits}
-## 	s=$(shortname $d)
-## 	command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
-## 	 -d $d -p $p -b @DATE@--tr${s}-${bits} $extra_option"
-## 	run $command
-##     done
-## done
-
+############################## 4.2/centos5
 # centos5 : for both archs, make the vserver rpms
 f=centos5
 for d in $TRUNK_DISTRO ; do
     for bits in $BITS ; do
 	p=linux${bits}
 	s=$(shortname $d)
-#	command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
-#	    -d $d -p $p -f $f \
-#	    -b @DATE@--tr${s}-c5vs-${bits} \
-#	    -B vserver"
+	buildname="@DATE@--tr${s}-c5vs-${bits}"
+#	buildname="${d}-4.2-rc2.1lab-${f}-${bits}"
 	command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
-	    -d $d -p $p -f $f \
-	    -t ${d}-tags-4.2.mk \
-	    -b ${d}-4.2-rc2.1lab-centos5-${bits} \
-	    -B vserver"
+	    -d $d -p $p -f $f -t ${d}-tags-4.2.mk \
+	    -b $buildname -B vserver"
 	run $command
     done
 done
+
+############################## TRUNK
+# raw - std planetlab x f8 x 32bits for deploying on alpha nodes
+for d in $TRUNK_DISTRO; do
+    for bits in $BITS; do
+	p=linux${bits}
+	s=$(shortname $d)
+	buildname="@DATE@--tr${s}-${bits}"
+	command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org \
+	 -d $d -p $p -b $buildname $extra_option"
+	run $command
+    done
+done
+