From: Thierry Parmentelat Date: Thu, 3 Feb 2011 11:49:59 +0000 (+0100) Subject: update X-Git-Tag: foo~4 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4a62606d2752ec80cb64d8a5ec797922a2bc842e;hp=d24ce6532e38100b1a65fd6dc6d28158a4dae935;p=infrastructure.git update --- diff --git a/scripts/5.0-rc18.sh b/scripts/5.0-rc18.sh deleted file mode 100755 index ef13d64..0000000 --- a/scripts/5.0-rc18.sh +++ /dev/null @@ -1,12 +0,0 @@ -function liquid () { hostname | grep liquid >& /dev/null ; } -function reed () { hostname | grep reed >& /dev/null ; } -function velvet () { hostname | grep velvet >& /dev/null ; } - -liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc18 -d onelab -f f8 -p linux64 -b onelab--5.0-rc18-f8-64 -t onelab-k22-tags.mk -liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc18 -d onelab -f f8 -p linux32 -b onelab--5.0-rc18-f8-32 -t onelab-k22-tags.mk - -reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc18 -d onelab -f f12 -p linux64 -b onelab--5.0-rc18-f12-64 -t onelab-k27-tags.mk -reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc18 -d onelab -f f12 -p linux32 -b onelab--5.0-rc18-f12-32 -t onelab-k27-tags.mk - -velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc18 -d onelab -f f14 -p linux64 -b onelab--5.0-rc18-f14-64 -t onelab-k32-tags.mk -velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc18 -d onelab -f f14 -p linux32 -b onelab--5.0-rc18-f14-32 -t onelab-k32-tags.mk diff --git a/scripts/sfa-1.0-13.sh b/scripts/sfa-1.0-13.sh index 80150fe..dd94d38 100755 --- a/scripts/sfa-1.0-13.sh +++ b/scripts/sfa-1.0-13.sh @@ -7,8 +7,9 @@ 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 onelab -t onelab-k32-tags.mk -f f8 -p linux32 -b sfa-1.0-13--f8-32 -B sfa ALL=sfa sfa-GITPATH=git://git.onelab.eu/sfa.git@sfa-1.0-13 -liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f8 -p linux64 -b sfa-1.0-13--f8-64 -B sfa ALL=sfa sfa-GITPATH=git://git.onelab.eu/sfa.git@sfa-1.0-13 +# keep liquid out of the loop as it's probably busy serving the local yum repos +reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f8 -p linux32 -b sfa-1.0-13--f8-32 -B sfa ALL=sfa sfa-GITPATH=git://git.onelab.eu/sfa.git@sfa-1.0-13 +velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f8 -p linux64 -b sfa-1.0-13--f8-64 -B sfa ALL=sfa sfa-GITPATH=git://git.onelab.eu/sfa.git@sfa-1.0-13 reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f12 -p linux32 -b sfa-1.0-13--f12-32 -B sfa ALL=sfa sfa-GITPATH=git://git.onelab.eu/sfa.git@sfa-1.0-13 reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -d onelab -t onelab-k32-tags.mk -f f12 -p linux64 -b sfa-1.0-13--f12-64 -B sfa ALL=sfa sfa-GITPATH=git://git.onelab.eu/sfa.git@sfa-1.0-13