openstack
/
release-tools
Code Issues Proposed changes

Compute versions using setup.cfg, switch to .0rcX 

Adapt version computation in rcdelivery.sh following the change
to different version numbers for each component and PEP440
.0rcX format.

Change-Id: I32d10f617a70ddafaf7645494f9d63acf723c33a
This commit is contained in:
Thierry Carrez 2015-08-26 15:17:43 +02:00
parent f22a94c392
commit dc667e1e3c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rcdelivery.sh
View File

@ -48,26 +48,29 @@ fi
TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $TOOLSDIR/functions
title "Resolving $LPROJECT $SERIES $RC to version"
title "Cloning repository for $PROJECT"
setup_temp_space rc-delivery-$PROJECT
clone_repo openstack/$PROJECT stable/$SERIES
cd openstack/$PROJECT
title "Resolving $LPROJECT $SERIES $RC to version"
FINALVERSION=`grep "^version = " setup.cfg | awk -F" " '{ print $3 }'`
if [[ "$FINALVERSION" == "" ]]; then
echo "Could not determine pre-version from setup.cfg"
exit 1
fi
if [[ "$RC" == "final" ]]; then
RC1VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $SERIES-rc1`
FINALVERSION=${RC1VERSION:0:8}
MILESTONE=$FINALVERSION
VERSION=$FINALVERSION
$TOOLSDIR/ms2version.py --onlycheck $LPROJECT $MILESTONE
else
MILESTONE="$SERIES-$RC"
VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $MILESTONE`
FINALVERSION=${VERSION:0:8}
VERSION="${FINALVERSION}.0${RC}"
fi
echo "${PROJECT^} $SERIES $RC (milestone $MILESTONE) is version $VERSION"
if [[ "$VERSION" != "$FINALVERSION" ]]; then
echo "Final $SERIES version will be $FINALVERSION"
fi
echo "$SERIES $RC (milestone $MILESTONE) is version $VERSION"
echo "Final $SERIES version will be $FINALVERSION"
title "Cloning repository for $PROJECT"
setup_temp_space rc-delivery-$PROJECT
clone_repo openstack/$PROJECT stable/$SERIES
cd openstack/$PROJECT
if [[ "$RC" == "final" ]]; then
TAGMSG="${PROJECT^} $VERSION"