X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fbuilds.sh;h=6b4dfa3b2a2c7440cc6af6f9c2df757095ba169e;hb=e606c7a8d17ab5a6101751aa7d5bdbad6f47a075;hp=7b533da5d29f9eb4a7891f8828f8c974de217a5b;hpb=6edca06c83bb46298e29a5784d706f3b308b43a1;p=infrastructure.git

diff --git a/scripts/builds.sh b/scripts/builds.sh
index 7b533da..6b4dfa3 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -21,29 +21,25 @@ 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@--l18 -c default -c no_omf
-velvet && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--l20 -c default -c no_omf
+reed   && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18 
+velvet && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20 
 
 [ -n "$SINGLE" ] && exit
 
-### 
-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
+### sfa from branch
+velvet && /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
 
-### focus on building again, so only wheezy for now
-reed   && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@--f10n-deb-w debian -B
-velvet && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie -b @DATE@--f10n-deb-j debian -B
-reed   && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring -b @DATE@--f10n-ubu-r debian -B
-velvet && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy  -b @DATE@--f10n-ubu-s debian -B
- 
-########################################
-# debians  & ubuntus for sfa
-liquid && /root/bin/lbuild-nightly.sh -P develdeb.pkgs -W http://debian.onelab.eu/ -f raring sfa-GITPATH=git://git.onelab.eu/sfa.git@geni-v3 -b @DATE@--sfa3-r ALL=sfa sfa-debian -B
-
-# 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
+liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f trusty -b @DATE@--f10n-ubu-t debian -B
 
+### nodemanager: new rpm packaging 
+velvet && /root/bin/lbuild-nightly.sh -d lxc -f f20						    -b @DATE@--nm-pkgng -B nodemanager-GITPATH=git://git.onelab.eu/nodemanager.git@packaging -s git://git.onelab.eu/build.git@nm-one-spec ALL=nodemanager
+#velvet && /root/bin/lbuild-nightly.sh -d lxc -f trusty -P develdeb.pkgs -W http://debian.onelab.eu/ -b @DATE@--nm-ubu-t -B nodemanager-GITPATH=git://git.onelab.eu/nodemanager.git@debian    -s git://git.onelab.eu/build.git@nm-one-spec ALL=nodemanager debian
+ 
 ####################
 # wextoolbox 
 # bbn won't build so it's taken off that build -- see wexlxc.mk in wextoolbox (branch wexlxc)