Support deliverables, not just for neutron

Generically support multiple projects in a single deliverable,
rather than only support the Neutron case.

Change-Id: I96a8e02c1d38368c687564bcba9971c30a137ed1
This commit is contained in:
Thierry Carrez 2015-08-26 15:07:31 +02:00
parent 13b8dc194c
commit f22a94c392
3 changed files with 30 additions and 23 deletions

View File

@ -67,8 +67,10 @@ rccut.sh creates a stable/$SERIES branch from the specified SHA, and turns
all Launchpad bugs for the RC1 milestone to FixReleased (which means
"present in the release branch").
It special-cases oslo-incubator, where it doesn't wait for a tarball to be
built.
It supports deliverables with multiple repositories, using an additional
parameter to point to the main deliverable (in which case it skips Launchpad
update). It special-cases oslo-incubator, where it doesn't wait for a tarball
to be built.
Examples:
@ -78,6 +80,10 @@ Examples:
mark FixCommitted bugs FixReleased, while targeting them to the juno-rc1
milestone.
./rccut.sh 3472368b3a546d liberty neutron-fwaas neutron
Create a series/liberty branch for neutron-fwaas at commit 3472368b3a546d.
rcdelivery.sh
-------------
@ -87,8 +93,10 @@ release from the stable/$SERIES branch. It applies the RC or final tag,
pushes it, waits for the tarball build, and uploads the resulting
tarball to Launchpad (while marking it released).
It special-cases oslo-incubator, where no tarball is generated or needs
to be uploaded.
It supports deliverables with multiple repositories, using an additional
parameter to point to the main deliverable (in which case it uploads to the
main Launchpad page). It special-cases oslo-incubator, where no tarball is
generated or needs to be uploaded.
Examples:
@ -98,11 +106,11 @@ Examples:
the tarball build, and upload the resulting tarball to Launchpad (while
marking it released).
./rcdelivery kilo final neutron
./rcdelivery kilo final neutron-fwaas neutron
Push 2015.1.0 final tag to current neutron stable/kilo branch HEAD (which
should be the last RC), wait for the tarball build, and upload the resulting
tarball to Launchpad (while marking it released).
Push 2015.1.0 final tag to current neutron-fwaas stable/kilo branch HEAD
(which should be the last RC), wait for the tarball build, and upload the
resulting tarball to the "neutron" Launchpad page.
release_postversion.sh

View File

@ -20,15 +20,17 @@
set -e
if [[ $# -lt 3 ]]; then
echo "Usage: $0 SHA series projectname"
echo "Usage: $0 SHA series projectname [deliverable]"
echo
echo "Example: $0 HEAD juno keystone"
echo "Example: $0 HEAD juno neutron-fwaas neutron"
exit 2
fi
SHA=$1
SERIES=$2
PROJECT=$3
DELIVERABLE=$4
LPROJECT="$PROJECT"
if [[ "$PROJECT" == "oslo-incubator" ]]; then
@ -36,10 +38,11 @@ if [[ "$PROJECT" == "oslo-incubator" ]]; then
SKIPTARBALL=1
fi
if [[ "$PROJECT" == neutron-* ]]; then
echo "Neutron advanced services mode: skipping bugs"
if [[ "$DELIVERABLE" != "" ]]; then
echo "Extra element in $DELIVERABLE deliverable"
echo "Bugs won't be FixReleased to the RC1 milestone"
SKIPBUGS=1
LPROJECT="neutron"
LPROJECT="$DELIVERABLE"
fi
RC1MILESTONE="$SERIES-rc1"
@ -65,12 +68,6 @@ git branch stable/$SERIES $SHA
REALSHA=`git show-ref -s stable/$SERIES`
git push gerrit stable/$SERIES
# No longer check tarballs since they can lag hours now
#if [[ "$SKIPTARBALL" != "1" ]]; then
# title "Waiting for tarball from $REALSHA"
# $TOOLSDIR/wait_for_tarball.py $REALSHA
#fi
if [[ "$SKIPBUGS" != "1" ]]; then
title "Setting FixCommitted bugs to FixReleased"
$TOOLSDIR/process_bugs.py $LPROJECT --settarget=$RC1MILESTONE --fixrelease

View File

@ -20,16 +20,17 @@
set -e
if [[ $# -lt 3 ]]; then
echo "Usage: $0 series rcX|final projectname"
echo "Usage: $0 series rcX|final projectname [deliverable]"
echo
echo "Example: $0 liberty rc2 keystone"
echo "Example: $0 liberty final neutron-fwaas"
echo "Example: $0 liberty final neutron-fwaas neutron"
exit 2
fi
SERIES=$1
RC=$2
PROJECT=$3
DELIVERABLE=$4
LPROJECT="$PROJECT"
if [[ "$PROJECT" == "oslo-incubator" ]]; then
@ -38,9 +39,10 @@ if [[ "$PROJECT" == "oslo-incubator" ]]; then
SKIPUPLOAD=1
fi
if [[ "$PROJECT" == neutron-* ]]; then
echo "Neutron advanced services mode: upload to Neutron Launchpad project"
LPROJECT="neutron"
if [[ "$DELIVERABLE" != "" ]]; then
echo "Extra element in $DELIVERABLE deliverable"
echo "Tarball will be uploaded to $DELIVERABLE LP page"
LPROJECT="$DELIVERABLE"
fi
TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"