cosmetic
authorthierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Tue, 30 Sep 2008 11:41:25 +0000 (11:41 +0000)
committerthierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Tue, 30 Sep 2008 11:41:25 +0000 (11:41 +0000)
scripts/all-builds.sh

index 02608e7..b624e7c 100755 (executable)
@@ -29,6 +29,8 @@ function shortname () {
     case $distro in
        onelab)         echo 1l;;
        planetlab)      echo pl;;
+       f?)             echo $distro;;
+       centos5)        echo c5;;
        *)              echo xx;;
     esac
 }
@@ -164,20 +166,22 @@ fi
 for bits in $BITS; do
 
     for d in $TRUNK_DISTROS; do
+       ds=$(shortname $d)
        p=linux${bits}
-       s=$(shortname $d)
        f=$FCDISTRO
-       buildname="${BASE}--tr${f}-${s}-${bits}"
+       fs=$(shortname $f)
+       buildname="${BASE}--tr${fs}-${ds}-${bits}"
        command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
         -d $d -p $p -f $f ${base_option} $buildname $extra_option"
        run $command
     done
 
     for f in $TRUNK_FCDISTROS; do 
+       fs=$(shortname $f)      
        p=linux${bits}
        d=planetlab
-       s=$(shortname $d)
-       buildname="${BASE}--tr${f}-${s}-${bits}"
+       ds=$(shortname $d)
+       buildname="${BASE}--tr${fs}-${ds}-${bits}"
        command="/root/bin/vbuild-nightly.sh -m onelab-build@one-lab.org ${BUILDOPT} \
         -d $d -p $p -f $f ${base_option} $buildname $extra_option"
        run $command