enable f20 build

[infrastructure.git] / scripts / builds.sh

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 98c525b..58814cf 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -15,17 +15,12 @@ function reed () { hostname | grep -q reed ; }
 function velvet () { hostname | grep -q velvet ; }
 
 ### 
-liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -f f18 -p linux64 -b @DATE@--lxc18 tests-GITPATH=git://git.onelab.eu/tests.git@no-omf
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -f f20 -p linux64 -b @DATE@--lxc20 -c default -c no_omf
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -f f18 -p linux64 -b @DATE@--lxc18 -c default -c no_omf
 
+### 
 reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--f14-64
 
-# at this point we have 2 branches for the tests, master is for the v2 API and sfa-geni-v3 is for the v3 API
-# also we temporarily use a nodemanager tag because the latest code has the OMF rc script stalled
-# disabled again for now :  nodemanager-GITPATH=git://git.onelab.eu/nodemanager.git@nodemanager-5.2-6
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--sfav2 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 tests-GITPATH=git://git.onelab.eu/tests.git@master 
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--sfav3-dual -c dual -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 tests-GITPATH=git://git.onelab.eu/tests.git@sfa-geni-v3
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--sfav3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 tests-GITPATH=git://git.onelab.eu/tests.git@sfa-geni-v3
-
 # debians & ubuntus for manifold and myslice - for now these are defined in onelab distro only
 reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f wheezy  -p linux64 -b @DATE@-manifold-w ALL=manifold manifold-debian -B
 reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f wheezy  -p linux64 -b @DATE@-myslice-w  ALL=myslice  myslice-debian  -B
@@ -33,6 +28,10 @@ reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.p
 # would be interesting to build on raring aka ubuntu 13.04 but that's not yet an option ...
 #reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f raring  -p linux64 -b @DATE@-myslice-r  ALL=myslice  myslice-debian  -B
 
+### 
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--sfav3-dual -c dual -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--sfav3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 
+
 # debians  & ubuntus for sfa
 #reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f squeeze -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfasqueeze ALL=sfa sfa-debian -B
 ###summer-mode###reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f wheezy  -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfawheezy ALL=sfa sfa-debian  -B