X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fbuilds.sh;h=14c635bd2a9dfd70c514571ccabbee64069870f3;hb=e34e1ac30e3a037f14c92066a4ab64ca539f78ab;hp=9c5c40bbde8fc42876a732f13f36ea163815c3bf;hpb=c29d5f21fec5e2f700740ac27037e6fa16877809;p=infrastructure.git

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 9c5c40b..14c635b 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -1,77 +1,62 @@
 #!/bin/bash
 
+# if run with -s (single) we only run one build per box
+[ "$1" == "-s" ] && { shift; SINGLE=true; }
+
 # the tests flavours available
 # -B means no test
+# -e step : mark a step as exclude (do not run it at all)
+# -i step : mark a step as ignore (run it, but keep going if it fails)
 # -c default for the tests setup is one myplc
 # -c dual has two myplc's - pointing to each other AMs
 # -c triangle has three - ditto
 # -c sfamesh makes them point to SMs
 # -c bignode is to allow one hour for the node to install
-# -X : this means use an lxc box to run the vplc (default)
-# -S : this means use an lxc box to run the vplc (hopefully this won't be needed)
+# -c config -c sfadebug - turn on sfa debug
+# -y pg testing only the pg rspecs
 
 function liquid () { hostname | grep -q liquid ; }
 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
-###summer-mode###liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f12 -p linux32 -b @DATE@--f12-32
-
-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
-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 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@--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 nodemanager-GITPATH=git://git.onelab.eu/nodemanager.git@nodemanager-5.2-6
-
-# 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 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 quantal -p linux64 -b @DATE@-myslice  ALL=myslice  myslice-debian  -B
+### 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@--l18 -c default -c no_omf
+velvet && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--l20 -c default -c no_omf
 
-# 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
-#reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f oneiric -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaoneiric ALL=sfa sfa-debian -B
-#reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f precise -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaprecise 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 quantal -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfaquantal ALL=sfa sfa-debian -B
-# raring won't work yet
-# the VS boxes will need some massaging, probably including defining a distro in util-vserver
-# that is to say using init/style=plain and probably tweaking init-post/pre or whatever ..
-# turning it off for now
-#reed   && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc    -P develsfa.pkgs -W http://debian.onelab.eu/ -f raring -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v2 -b @DATE@-sfararing 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 quantal -p linux64 sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 -b @DATE@-sfa3quantal ALL=sfa sfa-debian -B
+[ -n "$SINGLE" ] && exit
 
+### 
+# not really useful anymore as the regular builds use geni-v3
+#liquid && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--sfa3 -c default -c sfadebug sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3
+# rvm-ruby on l20
+velvet && /root/bin/lbuild-nightly.sh -s git://git.onelab.eu/build@omf-friendly -f f20 -b @DATE@--l20-omf 
+# bm on the ansible branch
+reed && /root/bin/lbuild-nightly.sh bootmanager-GITPATH=git://git.planet-lab.org/bootmanager.git@ansible -f f20 -b @DATE@--l20-ansbl
+
+
+###  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
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie -b @DATE@--f10n-deb-j debian -B
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring -b @DATE@--f10n-ubu-r debian -B
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy  -b @DATE@--f10n-ubu-s debian -B
+ 
 ####################
 # wextoolbox 
 # bbn won't build so it's taken off that build -- see wexlxc.mk in wextoolbox (branch wexlxc)
 #  f14
-#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f14 -b @DATE@--wtx-f14-32 -e check_system_slice -c default -c bignode
+#liquid && /root/bin/lbuild-nightly.sh -d wextoolbox -p linux32 -f f14 -b @DATE@--wtx-f14-32 -e check_system_slice -c default -c bignode
 # f16
 # for now this is failing because the nodeimage plain (uncompressed) package is too big, cpio seems to have a 2Gb limit
-#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wexlxc -p linux64 -f f18 -b @DATE@--wexlxc-f18-64 -c default -c bignode
+#liquid && /root/bin/lbuild-nightly.sh -d wexlxc -f f18 -b @DATE@--wexlxc-f18-64 -c default -c bignode
 # f18 - never tried yet
 
-###### testing only the pg rspecs
-# -y pg
-###### triangular tests
-# -c triangle -c sfamesh
-###### sfa debug
-# -c config -c sfadebug
 ###### senslab - not much to test 
 # sfa-GITPATH=git://git.f-lab.fr/sfa.git@senslab2
 
-#################### newinterface
-### newinterface on f16
-###liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d lxc -f f16 -p linux64 -b @DATE@--lxc16-nint -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 -f f14 -p linux64 -b @DATE@--f14-64-nint plcapi-GITPATH=git://git.onelab.eu/plcapi.git@newinterface
-
 ####################
 # build & test : f12 bootstrap : vserver-capable 2.6.32, util-vserver and yum, for a plain fedora 12 build or test box
-#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B
+#liquid && /root/bin/lbuild-nightly.sh -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B
 ### same software release but built on f14 - kernel excluded as, 
 # for some reason, we have to use the one built on f12
-#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d f14 -f f14 -p linux64 -b @DATE@--f14-f14-64 -B
-
+#liquid && /root/bin/lbuild-nightly.sh -d f14 -f f14 -b @DATE@--f14-f14-64 -B