sfa tags naming scheme now relies on master again

[infrastructure.git] / scripts / builds.sh

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 424e3f1..039d3d5 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -20,18 +20,16 @@ function reed () { hostname | grep -q reed ; }
 function velvet () { hostname | grep -q velvet ; }
 
 ### have each box run one main distro build 
-liquid && /root/bin/lbuild-nightly.sh -f f14 -b @DATE@--f14 -d onelab
-reed   && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18
-# velvet is down
-[ -n "$SINGLE" ] && exit
 liquid && /root/bin/lbuild-nightly.sh -f f21 -b @DATE@--f21
 reed   && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20
-
+# velvet is down
 [ -n "$SINGLE" ] && exit
+liquid && /root/bin/lbuild-nightly.sh -f f14 -b @DATE@--f14 -d onelab
+reed   && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18
 
 ### sfa from branch
 # velvet is down
-#reed   && /root/bin/lbuild-nightly.sh sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 tests-GITPATH=git://git.onelab.eu/tests.git@master -f f18 -b @DATE@--f18-sfa3
+#reed   && /root/bin/lbuild-nightly.sh sfa-GITPATH=git://git.onelab.eu/sfa.git@master tests-GITPATH=git://git.onelab.eu/tests.git@master -f f21 -b @DATE@--f21-sfa3
 
 ###  sfa + manifold + myslice
 #liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@--f10n-deb-w debian -B