From d7330243402e613701e3c817f63084ca851d2ec2 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 27 May 2010 16:40:00 +0200 Subject: [PATCH] default to the nightly build is now the git build module --- scripts/builds.sh | 45 ++++++++++++++++++++------------------- scripts/vbuild-nightly.sh | 2 +- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/scripts/builds.sh b/scripts/builds.sh index 4abb804..9e540fc 100755 --- a/scripts/builds.sh +++ b/scripts/builds.sh @@ -7,46 +7,47 @@ function reed () { hostname | grep -q reed ; } function velvet () { hostname | grep -q velvet ; } # 2.6.27 kernel on f12 -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 -m build@onelab.eu -d onelab -t onelab-k27-tags.mk -f f12 -p linux32 -b @DATE@--k27-f12-32-svn -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 linux64 -b @DATE@--k27-f12-64 -B +# default (i.e. without -s) should now be -s git://git.onelab.eu/build +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 linux32 -b @DATE@--k27-f12-32-svn -B -s http://svn.planet-lab.org/build/trunk +#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 # 2.6.22 kernel on f12 - known to be broken, node won't fly -#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 +#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 # 2.6.27 kernel on f8 -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 +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 # 2.6.22 kernel on f8 -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 +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 # 2.6.27 kernel on c5 -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 +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 # 2.6.22 kernel on c5 -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 +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 # wextoolbox variants -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 +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 ########## 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 -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 +########## 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 ########## f10 : shouldn't be needed anymore ## 2.6.27 kernel on f10 -#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 +#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 # ## 2.6.22 kernel on f10 -#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 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 wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B +#velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d wextoolbox -p linux32 -f f10 -b @DATE@--wextoolbox-f10-32 -B diff --git a/scripts/vbuild-nightly.sh b/scripts/vbuild-nightly.sh index 512e331..65da0bb 100755 --- a/scripts/vbuild-nightly.sh +++ b/scripts/vbuild-nightly.sh @@ -1,7 +1,7 @@ #!/bin/bash REVISION=$(echo '$Revision: 1053 $' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' ) COMMAND=$(basename $0) -BUILD_SCM_URL="http://svn.planet-lab.org/svn/build/trunk" +BUILD_SCM_URL="git://git.onelab.eu/build" USE_GIT="" # scan args for any -s option, and set BUILD_SCM_URL in this case -- 2.43.0