upgrade sfav2 to dual mode (with 2 PLCs) as I suspect this might have

[infrastructure.git] / scripts / builds.sh

diff --git a/scripts/builds.sh b/scripts/builds.sh
index ff0fbd6..37fe984 100755 (executable)
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -13,8 +13,11 @@ function velvet () { hostname | grep -q velvet ; }
 
 #################### lxc on f14 and f16 
 liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc -f f16 -p linux64 -b @DATE@--lxc16 -X 
-# lxc17 is broken for now - f12 vs-capable build box like liquid can't seem to create the build VMs b/c of some rpm limitations
+# lxc17 is< broken for now - f12 vs-capable build box like liquid can't seem to create the build VMs b/c of some rpm limitations
 #liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc -f f17 -p linux64 -b @DATE@--lxc17 -X
+# the various branches of SFA need close attention for now
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux32 -b @DATE@--f14-32-sfav2-dual -c dual -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 tests-GITPATH=git://git.onelab.eu/tests.git@master
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux32 -b @DATE@--f14-32-sfav3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 tests-GITPATH=git://git.onelab.eu/tests.git@master
 # wextoolbox on f14 (gnuradio is in f14 only)
 # DistributedRateLimiting is not built in this distro
 #liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f14 -b @DATE@--wtx-f14-32
@@ -22,14 +25,16 @@ liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc -f f16 -p linux6
 
 
 # f12 on reed - no SFA any more
-reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f12 -p linux64 -b @DATE@--f12-64
-reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f12 -p linux32 -b @DATE@--f12-32 
+reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f12 -p linux64 -b @DATE@--f12-64
+reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f12 -p linux32 -b @DATE@--f12-32
 
 
 # f14 
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64 
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f14 -p linux32 -b @DATE@--f14-32 
-velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f14 -p linux32 -b @DATE@--f14-32-sfam -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@sfa.git@master
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--f14-64
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux32 -b @DATE@--f14-32
+
+
+
 
 ###### testing only the pg rspecs
 # -y pg
@@ -44,7 +49,7 @@ velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32
 ### newinterface on f16
 ###liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc -f f16 -p linux64 -b @DATE@--lxc16-nint -X -e check_initscripts -e check_tcp plcapi-GITPATH=git://git.onelab.eu/plcapi.git@newinterface 
 ### newinterface on f14
-###velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f14 -p linux64 -b @DATE@--f14-64-nint plcapi-GITPATH=git://git.onelab.eu/plcapi.git@newinterface 
+###velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f14 -p linux64 -b @DATE@--f14-64-nint plcapi-GITPATH=git://git.onelab.eu/plcapi.git@newinterface
 
 ####################
 # wextoolbox on f16 - this one is broken - bbn won't build