From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 25 Jun 2015 07:50:44 +0000 (+0200)
Subject: simpler
X-Git-Url: http://git.onelab.eu/?p=infrastructure.git;a=commitdiff_plain;h=430ee940993ef0c4eff8e10d631a31cfa1672179

simpler
---

diff --git a/scripts/5.3.9.sh b/scripts/5.3.9.sh
new file mode 100755
index 0000000..ecd7fc0
--- /dev/null
+++ b/scripts/5.3.9.sh
@@ -0,0 +1,9 @@
+# old-school vserver-based f14 stuff for PLE
+/root/bin/lbuild-nightly.sh -s git://git.onelab.eu/build@5.3.9 -d onelab -f f14 -p linux64 -b onelab--5.3.9-f14-64 &
+# lbuild-nightly forgot to deal with -p very nicely, so here's the magic formula to build the f14/32 combo
+linux32 /root/bin/lbuild-nightly.sh -s git://git.onelab.eu/build@5.3.9 -d onelab -f f14 -p linux32 -b onelab--5.3.9-f14-32 &
+
+# containers-based
+/root/bin/lbuild-nightly.sh -s git://git.onelab.eu/build@5.3.9 -d lxc    -f f20 -p linux64 -b lxc--5.3.9-f20-64 -e check-initscripts&
+/root/bin/lbuild-nightly.sh -s git://git.onelab.eu/build@5.3.9 -d lxc    -f f21 -p linux64 -b lxc--5.3.9-f21-64 -e check-initscripts&
+/root/bin/lbuild-nightly.sh -s git://git.onelab.eu/build@5.3.9 -d lxc    -f f22 -p linux64 -b lxc--5.3.9-f22-64 -e check-initscripts&
diff --git a/scripts/builds.sh b/scripts/builds.sh
index cfeffc4..f674a6b 100755
--- a/scripts/builds.sh
+++ b/scripts/builds.sh
@@ -18,54 +18,54 @@
 # XXX historically we had several build boxes
 #function liquid () { hostname | grep -q liquid ; }
 #function reed () { hostname | grep -q reed ; }
-function buzzcocks () { hostname | grep -q buzzcocks ; }
+#function buzzcocks () { hostname | grep -q buzzcocks ; }
 
-buzzcocks && /root/bin/lbuild-nightly.sh -f f21 -b @DATE@--f21 -e check-initscripts &
+/root/bin/lbuild-nightly.sh -f f21 -b @DATE@--f21 -e check-initscripts &
 
 [ -n "$SINGLE" ] && exit
-buzzcocks && /root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20 -e check-initscripts &
-buzzcocks && /root/bin/lbuild-nightly.sh -f f22 -b @DATE@--f22 -e check-initscripts &
+/root/bin/lbuild-nightly.sh -f f22 -b @DATE@--f22 -e check-initscripts &
+/root/bin/lbuild-nightly.sh -f f14 -b @DATE@--f14 -d onelab &
+#/root/bin/lbuild-nightly.sh -f f20 -b @DATE@--f20 -e check-initscripts &
 
 
 ### sfa from branch
-#buzzcocks  && /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-sfa -e check-initscripts &
+#/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-sfa -e check-initscripts &
 
 ### older fedoras
-#buzzcocks && /root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18 &
-#buzzcocks && /root/bin/lbuild-nightly.sh -f f14 -b @DATE@--f14 -d onelab &
+#/root/bin/lbuild-nightly.sh -f f18 -b @DATE@--f18 &
 ### 32bits build for the yum arch patch - do not forget to protect this within a call to linux32
-#buzzcocks && linux32 /root/bin/lbuild-nightly.sh -f f14 -p linux32 -b @DATE@--f14-32 -d onelab
+#linux32 /root/bin/lbuild-nightly.sh -f f14 -p linux32 -b @DATE@--f14-32 -d onelab
 
 exit
 
 ########## oldies
 
 ###  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 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
-#liquid && /root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f utopic -b @DATE@--f10n-ubu-u debian -B
+#/root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f wheezy -b @DATE@--f10n-deb-w debian -B
+#/root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f jessie -b @DATE@--f10n-deb-j debian -B
+#/root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f saucy  -b @DATE@--f10n-ubu-s debian -B
+#/root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f trusty -b @DATE@--f10n-ubu-t debian -B
+#/root/bin/lbuild-nightly.sh -d federation -P develdeb.pkgs -W http://debian.onelab.eu/ -f utopic -b @DATE@--f10n-ubu-u debian -B
 
 
 ########## probably obsolete
 
 ### nodemanager for ubuntu - giving up for now
-#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@master ALL=nodemanager debian
+#/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@master ALL=nodemanager debian
  
 ####################
 # wextoolbox 
 # bbn won't build so it's taken off that build -- see wexlxc.mk in wextoolbox (branch wexlxc)
 #  f14
-#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
+#/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/lbuild-nightly.sh -d wexlxc -f f18 -b @DATE@--wexlxc-f18-64 -c default -c bignode
+#/root/bin/lbuild-nightly.sh -d wexlxc -f f18 -b @DATE@--wexlxc-f18-64 -c default -c bignode
 # f18 - never tried yet
 
 ####################
 # 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/lbuild-nightly.sh -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B
+#/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/lbuild-nightly.sh -d f14 -f f14 -b @DATE@--f14-f14-64 -B
+#/root/bin/lbuild-nightly.sh -d f14 -f f14 -b @DATE@--f14-f14-64 -B