Support new location for oslo-incubator
oslo-incubator Launchpad project is now (correctly) called oslo-incubator, so we don't need to special-case it anymore. Change-Id: I0834877779f8fa37ea419d1531da5e96734eaec8
This commit is contained in:
parent
017acb9902
commit
a967ea6dab
|
@ -1,12 +1,12 @@
|
||||||
# Name of the series
|
# Name of the series
|
||||||
series: icehouse
|
series: kilo
|
||||||
|
|
||||||
# Milestone codes (series- will be prefixed)
|
# Milestone codes (series- will be prefixed)
|
||||||
# Value is the release date (or empty string if not set yet)
|
# Value is the release date (or empty string if not set yet)
|
||||||
milestones:
|
milestones:
|
||||||
'1': '2013-12-05'
|
'1': '2014-12-05'
|
||||||
'2': '2014-01-23'
|
'2': '2015-01-23'
|
||||||
'3': '2014-03-06'
|
'3': '2015-03-06'
|
||||||
|
|
||||||
# Set of projects to create milestones for
|
# Set of projects to create milestones for
|
||||||
projects:
|
projects:
|
||||||
|
@ -16,7 +16,8 @@ projects:
|
||||||
- horizon
|
- horizon
|
||||||
- neutron
|
- neutron
|
||||||
- cinder
|
- cinder
|
||||||
- oslo
|
- oslo-incubator
|
||||||
- heat
|
- heat
|
||||||
- ceilometer
|
- ceilometer
|
||||||
- trove
|
- trove
|
||||||
|
- sahara
|
||||||
|
|
71
milestone.sh
71
milestone.sh
|
@ -29,7 +29,6 @@ fi
|
||||||
MILESTONE=$1
|
MILESTONE=$1
|
||||||
SHA=$2
|
SHA=$2
|
||||||
PROJECT=$3
|
PROJECT=$3
|
||||||
LPROJECT="$PROJECT"
|
|
||||||
|
|
||||||
TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
@ -47,13 +46,7 @@ fi
|
||||||
if [[ "$PROJECT" == "oslo-incubator" ]]; then
|
if [[ "$PROJECT" == "oslo-incubator" ]]; then
|
||||||
echo "Oslo-incubator mode: skipping tarball generation and upload"
|
echo "Oslo-incubator mode: skipping tarball generation and upload"
|
||||||
SKIPTARBALL=1
|
SKIPTARBALL=1
|
||||||
LPROJECT="oslo"
|
SKIPUPLOAD=1
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$PROJECT" == "oslo.messaging" ]]; then
|
|
||||||
echo "oslo.messaging mode: skipping tag, tarball generation and upload"
|
|
||||||
SKIPTAG=1
|
|
||||||
SKIPTARBALL=1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
title "Resolving $MILESTONE to version"
|
title "Resolving $MILESTONE to version"
|
||||||
|
@ -61,39 +54,37 @@ if [[ "$IS_RELEASE" == "1" ]]; then
|
||||||
VERSION=$MILESTONE
|
VERSION=$MILESTONE
|
||||||
RELVERSION=$MILESTONE
|
RELVERSION=$MILESTONE
|
||||||
else
|
else
|
||||||
VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $MILESTONE`
|
VERSION=`$TOOLSDIR/ms2version.py $PROJECT $MILESTONE`
|
||||||
RELVERSION=${VERSION:0:6}
|
RELVERSION=${VERSION:0:6}
|
||||||
fi
|
fi
|
||||||
echo "$MILESTONE is $VERSION (final being $RELVERSION)"
|
echo "$MILESTONE is $VERSION (final being $RELVERSION)"
|
||||||
|
|
||||||
if [[ "$SKIPTAG" != "1" ]]; then
|
title "Cloning repository for $PROJECT"
|
||||||
title "Cloning repository for $PROJECT"
|
MYTMPDIR=`mktemp -d`
|
||||||
MYTMPDIR=`mktemp -d`
|
cd $MYTMPDIR
|
||||||
cd $MYTMPDIR
|
git clone git://git.openstack.org/openstack/$PROJECT
|
||||||
git clone git://git.openstack.org/openstack/$PROJECT
|
cd $PROJECT
|
||||||
cd $PROJECT
|
LANG=C git review -s
|
||||||
LANG=C git review -s
|
TARGETSHA=`git log -1 $SHA --format='%H'`
|
||||||
TARGETSHA=`git log -1 $SHA --format='%H'`
|
HEADSHA=`git log -1 HEAD --format='%H'`
|
||||||
HEADSHA=`git log -1 HEAD --format='%H'`
|
|
||||||
|
|
||||||
title "Tagging $TARGETSHA as $VERSION"
|
title "Tagging $TARGETSHA as $VERSION"
|
||||||
if [[ "$IS_RELEASE" == "1" ]]; then
|
if [[ "$IS_RELEASE" == "1" ]]; then
|
||||||
TAGMSG="${PROJECT^} $VERSION release"
|
TAGMSG="${PROJECT^} $VERSION release"
|
||||||
else
|
else
|
||||||
TAGMSG="${PROJECT^} $MILESTONE milestone ($VERSION)"
|
TAGMSG="${PROJECT^} $MILESTONE milestone ($VERSION)"
|
||||||
fi
|
|
||||||
echo "Tag message is '$TAGMSG'"
|
|
||||||
if [[ "$TARGETSHA" != "$HEADSHA" ]]; then
|
|
||||||
echo "Warning: target SHA does not correspond to HEAD"
|
|
||||||
fi
|
|
||||||
git tag -m "$TAGMSG" -s "$VERSION" $TARGETSHA
|
|
||||||
git push gerrit $VERSION
|
|
||||||
REALSHA=`git show-ref -s --tags "$VERSION"`
|
|
||||||
|
|
||||||
title "Cleaning up"
|
|
||||||
cd ../..
|
|
||||||
rm -rf $MYTMPDIR
|
|
||||||
fi
|
fi
|
||||||
|
echo "Tag message is '$TAGMSG'"
|
||||||
|
if [[ "$TARGETSHA" != "$HEADSHA" ]]; then
|
||||||
|
echo "Warning: target SHA does not correspond to HEAD"
|
||||||
|
fi
|
||||||
|
git tag -m "$TAGMSG" -s "$VERSION" $TARGETSHA
|
||||||
|
git push gerrit $VERSION
|
||||||
|
REALSHA=`git show-ref -s --tags "$VERSION"`
|
||||||
|
|
||||||
|
title "Cleaning up"
|
||||||
|
cd ../..
|
||||||
|
rm -rf $MYTMPDIR
|
||||||
|
|
||||||
if [[ "$SKIPTARBALL" != "1" ]]; then
|
if [[ "$SKIPTARBALL" != "1" ]]; then
|
||||||
title "Waiting for tarball from $REALSHA"
|
title "Waiting for tarball from $REALSHA"
|
||||||
|
@ -109,18 +100,18 @@ fi
|
||||||
|
|
||||||
if [[ "$SKIPBUGS" != "1" ]]; then
|
if [[ "$SKIPBUGS" != "1" ]]; then
|
||||||
title "Setting FixCommitted bugs to FixReleased"
|
title "Setting FixCommitted bugs to FixReleased"
|
||||||
$TOOLSDIR/process_bugs.py $LPROJECT --settarget=$MILESTONE --fixrelease
|
$TOOLSDIR/process_bugs.py $PROJECT --settarget=$MILESTONE --fixrelease
|
||||||
read -sn 1 -p "Fix any leftover bugs manually and press key to continue..."
|
read -sn 1 -p "Fix any leftover bugs manually and press key to continue..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$SKIPTARBALL" != "1" ]]; then
|
if [[ "$SKIPUPLOAD" != "1" ]]; then
|
||||||
title "Uploading tarball to Launchpad"
|
title "Uploading tarball to Launchpad"
|
||||||
if [[ "$IS_RELEASE" == "1" ]]; then
|
if [[ "$IS_RELEASE" == "1" ]]; then
|
||||||
$TOOLSDIR/upload_release.py $LPROJECT $RELVERSION
|
$TOOLSDIR/upload_release.py $PROJECT $RELVERSION
|
||||||
else
|
else
|
||||||
$TOOLSDIR/upload_release.py $LPROJECT $RELVERSION --milestone=$MILESTONE
|
$TOOLSDIR/upload_release.py $PROJECT $RELVERSION --milestone=$MILESTONE
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
title "Marking milestone as released in Launchpad"
|
title "Marking milestone as released in Launchpad"
|
||||||
$TOOLSDIR/upload_release.py $LPROJECT $RELVERSION --milestone=$MILESTONE --nop
|
$TOOLSDIR/upload_release.py $PROJECT $RELVERSION --milestone=$MILESTONE --nop
|
||||||
fi
|
fi
|
||||||
|
|
1
rccut.sh
1
rccut.sh
|
@ -34,7 +34,6 @@ PROJECT=$3
|
||||||
if [[ "$PROJECT" == "oslo-incubator" ]]; then
|
if [[ "$PROJECT" == "oslo-incubator" ]]; then
|
||||||
echo "Oslo-incubator mode: skipping tarball check"
|
echo "Oslo-incubator mode: skipping tarball check"
|
||||||
SKIPTARBALL=1
|
SKIPTARBALL=1
|
||||||
PROJECT="oslo"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$PROJECT" == "swift" ]]; then
|
if [[ "$PROJECT" == "swift" ]]; then
|
||||||
|
|
|
@ -30,12 +30,11 @@ fi
|
||||||
SERIES=$1
|
SERIES=$1
|
||||||
RC=$2
|
RC=$2
|
||||||
PROJECT=$3
|
PROJECT=$3
|
||||||
LPROJECT="$PROJECT"
|
|
||||||
|
|
||||||
if [[ "$PROJECT" == "oslo-incubator" ]]; then
|
if [[ "$PROJECT" == "oslo-incubator" ]]; then
|
||||||
echo "Oslo-incubator mode: skipping tarball generation and upload"
|
echo "Oslo-incubator mode: skipping tarball generation and upload"
|
||||||
SKIPTARBALL=1
|
SKIPTARBALL=1
|
||||||
LPROJECT="oslo"
|
SKIPUPLOAD=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$PROJECT" == "swift" ]]; then
|
if [[ "$PROJECT" == "swift" ]]; then
|
||||||
|
@ -54,24 +53,24 @@ function title {
|
||||||
echo "$(tput bold)$(tput setaf 1)[ $1 ]$(tput sgr0)"
|
echo "$(tput bold)$(tput setaf 1)[ $1 ]$(tput sgr0)"
|
||||||
}
|
}
|
||||||
|
|
||||||
title "Resolving $LPROJECT $SERIES $RC to version"
|
title "Resolving $PROJECT $SERIES $RC to version"
|
||||||
|
|
||||||
if [[ "$RC" == "final" ]]; then
|
if [[ "$RC" == "final" ]]; then
|
||||||
if [[ "$LPROJECT" != "swift" ]]; then
|
if [[ "$PROJECT" != "swift" ]]; then
|
||||||
RC1VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $SERIES-rc1`
|
RC1VERSION=`$TOOLSDIR/ms2version.py $PROJECT $SERIES-rc1`
|
||||||
FINALVERSION=${RC1VERSION:0:6}
|
FINALVERSION=${RC1VERSION:0:6}
|
||||||
fi
|
fi
|
||||||
MILESTONE=$FINALVERSION
|
MILESTONE=$FINALVERSION
|
||||||
VERSION=$FINALVERSION
|
VERSION=$FINALVERSION
|
||||||
$TOOLSDIR/ms2version.py --onlycheck $LPROJECT $MILESTONE
|
$TOOLSDIR/ms2version.py --onlycheck $PROJECT $MILESTONE
|
||||||
else
|
else
|
||||||
if [[ "$LPROJECT" != "swift" ]]; then
|
if [[ "$PROJECT" != "swift" ]]; then
|
||||||
MILESTONE="$SERIES-$RC"
|
MILESTONE="$SERIES-$RC"
|
||||||
VERSION=`$TOOLSDIR/ms2version.py $LPROJECT $MILESTONE`
|
VERSION=`$TOOLSDIR/ms2version.py $PROJECT $MILESTONE`
|
||||||
else
|
else
|
||||||
MILESTONE="$FINALVERSION-$RC"
|
MILESTONE="$FINALVERSION-$RC"
|
||||||
VERSION="$FINALVERSION.$RC"
|
VERSION="$FINALVERSION.$RC"
|
||||||
$TOOLSDIR/ms2version.py --onlycheck $LPROJECT $MILESTONE
|
$TOOLSDIR/ms2version.py --onlycheck $PROJECT $MILESTONE
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo "$SERIES $RC (milestone $MILESTONE) is version $VERSION"
|
echo "$SERIES $RC (milestone $MILESTONE) is version $VERSION"
|
||||||
|
@ -100,19 +99,21 @@ if [[ "$SKIPTARBALL" != "1" ]]; then
|
||||||
title "Checking tarball is similar to last proposed-$SERIES.tar.gz"
|
title "Checking tarball is similar to last proposed-$SERIES.tar.gz"
|
||||||
$TOOLSDIR/similar_tarballs.sh $PROJECT proposed-$SERIES $VERSION
|
$TOOLSDIR/similar_tarballs.sh $PROJECT proposed-$SERIES $VERSION
|
||||||
read -sn 1 -p "Press any key to continue..."
|
read -sn 1 -p "Press any key to continue..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$SKIPUPLOAD" != "1" ]]; then
|
||||||
title "Uploading tarball to Launchpad"
|
title "Uploading tarball to Launchpad"
|
||||||
if [[ "$RC" == "final" ]]; then
|
if [[ "$RC" == "final" ]]; then
|
||||||
$TOOLSDIR/upload_release.py $LPROJECT $VERSION
|
$TOOLSDIR/upload_release.py $PROJECT $VERSION
|
||||||
else
|
else
|
||||||
$TOOLSDIR/upload_release.py $LPROJECT $VERSION --milestone=$MILESTONE
|
$TOOLSDIR/upload_release.py $PROJECT $VERSION --milestone=$MILESTONE
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
title "Marking milestone as released in Launchpad"
|
title "Marking milestone as released in Launchpad"
|
||||||
if [[ "$RC" == "final" ]]; then
|
if [[ "$RC" == "final" ]]; then
|
||||||
$TOOLSDIR/upload_release.py $LPROJECT $VERSION --nop
|
$TOOLSDIR/upload_release.py $PROJECT $VERSION --nop
|
||||||
else
|
else
|
||||||
$TOOLSDIR/upload_release.py $LPROJECT $VERSION --milestone=$MILESTONE --nop
|
$TOOLSDIR/upload_release.py $PROJECT $VERSION --milestone=$MILESTONE --nop
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue