From 2f85ea30133d1026fc754f760fa1cd60d161c21b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sat, 22 May 2010 18:58:49 +0200 Subject: [PATCH] moving to git --- scripts/auto-update.sh | 3 ++- scripts/builds.sh | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/scripts/auto-update.sh b/scripts/auto-update.sh index 64d4211..92bf96a 100755 --- a/scripts/auto-update.sh +++ b/scripts/auto-update.sh @@ -5,4 +5,5 @@ DIRNAME=$(dirname $0) DIRNAME=$(cd $DIRNAME; pwd -P) cd $DIRNAME -(date ; svn update ) &> .auto-update.log +[ -d .svn ] && (date ; svn update ) &> .auto-update.log +[ -d .git ] && (date ; git pull ) &> .auto-update.log diff --git a/scripts/builds.sh b/scripts/builds.sh index 477bd94..c8c37ba 100755 --- a/scripts/builds.sh +++ b/scripts/builds.sh @@ -7,45 +7,45 @@ function reed () { hostname | grep -q reed ; } function velvet () { hostname | grep -q velvet ; } # 2.6.27 kernel on f12 -liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f12 -p linux32 -b @DATE@--k27-f12-32 -liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f12 -p linux64 -b @DATE@--k27-f12-64 -B +liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f12 -p linux32 -b @DATE@--k27-f12-32 +liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f12 -p linux64 -b @DATE@--k27-f12-64 -B # 2.6.22 kernel on f12 - known to be broken, node won't fly -#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f12 -p linux32 -b @DATE@--k22-f12-32 -#liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f12 -p linux64 -b @DATE@--k22-f12-64 -B +#liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f f12 -p linux32 -b @DATE@--k22-f12-32 +#liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f f12 -p linux64 -b @DATE@--k22-f12-64 -B # 2.6.27 kernel on f8 -reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f8 -p linux32 -b @DATE@--k27-f8-32 -reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f8 -p linux64 -b @DATE@--k27-f8-64 -B +reed && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f8 -p linux32 -b @DATE@--k27-f8-32 +reed && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f8 -p linux64 -b @DATE@--k27-f8-64 -B # 2.6.22 kernel on f8 -reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f8 -p linux32 -b @DATE@--k22-f8-32 -reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f8 -p linux64 -b @DATE@--k22-f8-64 -B +reed && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f f8 -p linux32 -b @DATE@--k22-f8-32 +reed && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f f8 -p linux64 -b @DATE@--k22-f8-64 -B # 2.6.27 kernel on c5 -velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f centos5 -p linux32 -b @DATE@--k27-c55-32 -B -velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f centos5 -p linux64 -b @DATE@--k27-c55-64 -B +velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f centos5 -p linux32 -b @DATE@--k27-c55-32 -B +velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f centos5 -p linux64 -b @DATE@--k27-c55-64 -B # 2.6.22 kernel on c5 -velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f centos5 -p linux32 -b @DATE@--k22-c55-32 -B -velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f centos5 -p linux64 -b @DATE@--k22-c55-64 -B +velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f centos5 -p linux32 -b @DATE@--k22-c55-32 -B +velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f centos5 -p linux64 -b @DATE@--k22-c55-64 -B # wextoolbox variants -liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f12 -b @DATE@--wextoolbox-f12-32 -B +liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 +liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d wextoolbox -p linux32 -f f12 -b @DATE@--wextoolbox-f12-32 -B ########## f12 bootstrap : 2.6.31, util-vserver and yum, for a plain fedora 12 build or test box ########## enable on a need-by-need basis -########## liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d f12 -f f12 -p linux64 -b @DATE@--f12-f12-64 -B -########## 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/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d f12 -f f12 -p linux64 -b @DATE@--f12-f12-64 -B +########## liquid && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d f12 -f f12 -p linux32 -b @DATE@--f12-f12-32 -B ########## f10 : shouldn't be needed anymore ## 2.6.27 kernel on f10 -#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f10 -p linux32 -b @DATE@--k27-f10-32 -B -#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f10 -p linux64 -b @DATE@--k27-f10-64 -B +#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f10 -p linux32 -b @DATE@--k27-f10-32 -B +#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f10 -p linux64 -b @DATE@--k27-f10-64 -B # ## 2.6.22 kernel on f10 -#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f10 -p linux32 -b @DATE@--k22-f10-32 -B -#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -f f10 -p linux64 -b @DATE@--k22-f10-64 -B +#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f f10 -p linux32 -b @DATE@--k22-f10-32 -B +#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d onelab -f f10 -p linux64 -b @DATE@--k22-f10-64 -B # -#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B +#velvet && /root/bin/vbuild-nightly.sh -s git://git.onelab.eu/build -m build@onelab.eu -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B -- 2.43.0