From: thierry Date: Fri, 20 Feb 2009 13:38:58 +0000 (+0000) Subject: update X-Git-Tag: foo~258 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c63423291678b94506b29ad4e6140df309d7df38;hp=9185baa859f24a7114c401f41d4a903d859f786c;p=infrastructure.git update --- diff --git a/scripts/all-builds.sh b/scripts/all-builds.sh index 949d6f6..ec817dd 100755 --- a/scripts/all-builds.sh +++ b/scripts/all-builds.sh @@ -13,7 +13,7 @@ function usage () { echo "In manual mode you should export the following vars (or use related option)" echo "MAJOR_DISTROS (-d) TRUNK_DISTROS (-td) TRUNK_FCDISTROS (-tf) VS_DISTROS (-vd)" echo "FCDISTROS (-f) BITS (-i) BASE (-b)" - echo "BUILD_BRANCH (-bb) BUILD_TRUNK (-bt)" + echo "BUILD_BRANCH(4.2) (-bb) BUILD_TRUNK (-bt)" echo "Overwrite (-o) TEST (-T) DRY_RUN (-n)" echo "Use at least one space for blanking a set of distros" exit 1 @@ -79,16 +79,16 @@ function trunk_builds () { DEFAULT_TRUNK_FCDISTROS="f8 f10" } -function branch_builds () { - DEFAULT_BITS="32 64" +function branch_builds_42 () { DEFAULT_MAJOR_DISTROS="onelab planetlab" DEFAULT_VS_DISTROS="" DEFAULT_BITS="32" DEFAULT_TRUNK_DISTROS="" DEFAULT_TRUNK_FCDISTROS="" + DEFAULT_FCDISTROS="f8" } -function tagged_builds () { +function tagged_builds_42 () { DEFAULT_BITS="32 64" DEFAULT_MAJOR_DISTROS="onelab planetlab" DEFAULT_VS_DISTROS="onelab" @@ -97,13 +97,13 @@ function tagged_builds () { } if [ -n "$BUILD_BRANCH" ] ; then - branch_builds + branch_builds_42 BUILDOPT="-s http://svn.planet-lab.org/svn/build/branches/${MAJOR}" elif [ -n "$BUILD_TRUNK" ] ; then trunk_builds BUILDOPT="" else - tagged_builds + tagged_builds_42 BUILDOPT="-s http://svn.planet-lab.org/svn/build/tags/${MAJOR}-${MINOR}" fi