Use PEP440 normalized versions
Switch to using X.Y.Z format (think: 2015.1.0) versions for final
versions, X.Y.Z{b,rc}N for milestones and release candidates, to
match PEP440-normalized versions that setuptools and our tooling
now produce for our tarballs.
Change-Id: I42bd41b7fd2d9f1e9ead8a76f11a54926b637fdf
This commit is contained in:
Thierry Carrez
parent
654d07dad0
commit
208af0667a
56
README.rst
56
README.rst
|
|
@ -33,9 +33,9 @@ oslo-incubator (where no tarball is generated or needs to be uploaded).
|
|||
|
||||
Example:
|
||||
|
||||
./milestone.sh juno-3 HEAD keystone
|
||||
./milestone.sh kilo-3 HEAD keystone
|
||||
|
||||
Apply 2014.2.b3 tag to HEAD of keystone master branch, check resulting
|
||||
Apply 2015.1.0b3 tag to HEAD of keystone master branch, check resulting
|
||||
tarball, mark FixCommitted bugs as released, upload tarball to Launchpad
|
||||
and mark Launchpad milestone released.
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ Example:
|
|||
|
||||
./swiftrc.sh 7432f32d838ab346c 2.1.0
|
||||
|
||||
Apply 2.1.0.rc1 tag to Swift's 7432f32d838ab346c commit, check resulting
|
||||
Apply 2.1.0rc1 tag to Swift's 7432f32d838ab346c commit, check resulting
|
||||
tarball, mark FixCommitted bugs as released and target them to the 2.1.0
|
||||
milestone.
|
||||
|
||||
|
|
@ -100,21 +100,21 @@ where no tarball is generated or needs to be uploaded.
|
|||
|
||||
Examples:
|
||||
|
||||
./rcdelivery.sh juno rc1 cinder
|
||||
./rcdelivery.sh kilo rc1 cinder
|
||||
|
||||
Push 2014.2.rc1 tag to current cinder proposed/juno branch HEAD, wait for the
|
||||
tarball build, and upload the resulting tarball to Launchpad (while marking
|
||||
it released).
|
||||
Push 2015.1.0rc1 tag to current cinder proposed/kilo branch HEAD, wait for
|
||||
the tarball build, and upload the resulting tarball to Launchpad (while
|
||||
marking it released).
|
||||
|
||||
./rcdelivery juno rc2 swift 2.3.0
|
||||
|
||||
Push 2.3.0.rc2 tag to current swift proposed/juno branch HEAD, wait for the
|
||||
Push 2.3.0rc2 tag to current swift proposed/juno branch HEAD, wait for the
|
||||
tarball build, and upload the resulting tarball to Launchpad (while marking
|
||||
it released).
|
||||
|
||||
./rcdelivery juno final neutron
|
||||
./rcdelivery kilo final neutron
|
||||
|
||||
Push 2014.2 final tag to current neutron proposed/juno branch HEAD (which
|
||||
Push 2015.1.0 final tag to current neutron proposed/juno branch HEAD (which
|
||||
should be the last RC), wait for the tarball build, and upload the resulting
|
||||
tarball to Launchpad (while marking it released).
|
||||
|
||||
|
|
@ -167,9 +167,9 @@ exists in Launchpad (useful for Swift where the rules are different).
|
|||
|
||||
Examples:
|
||||
|
||||
./ms2version.py nova juno-3
|
||||
./ms2version.py nova kilo-3
|
||||
|
||||
Returns 2014.2.b3 (after checking that the juno-3 milestone exists in Nova)
|
||||
Returns 2015.1.0b3 (after checking that the kilo-3 milestone exists in Nova)
|
||||
|
||||
./ms2version.py swift 2.1.0 --onlycheck
|
||||
|
||||
|
|
@ -200,10 +200,10 @@ This script compares the content of two tarballs on tarballs.openstack.org.
|
|||
|
||||
Example:
|
||||
|
||||
./similar_tarballs.sh nova milestone-proposed 2013.1.rc1
|
||||
./similar_tarballs.sh nova proposed-kilo 2015.1.0rc1
|
||||
|
||||
Check content differences between nova-milestone-proposed.tar.gz and
|
||||
nova-2013.1.rc1.tar.gz, as found on http://tarballs.openstack.org.
|
||||
Check content differences between nova-proposed-kilo.tar.gz and
|
||||
nova-2015.1.0rc1.tar.gz, as found on http://tarballs.openstack.org.
|
||||
|
||||
|
||||
process_bugs.py
|
||||
|
|
@ -268,15 +268,14 @@ intend to release, and to sign the tarball upload.
|
|||
|
||||
Examples:
|
||||
|
||||
./upload_release.py nova 2013.1 --milestone=grizzly-3
|
||||
./upload_release.py nova 2015.1.0 --milestone=kilo-3
|
||||
|
||||
Uploads Nova's nova-2013.1.g3.tar.gz to the grizzly-3
|
||||
milestone as nova-2013.1.g3.tar.gz
|
||||
Uploads Nova's nova-2015.1.0b3.tar.gz to the kilo-3 milestone page.
|
||||
|
||||
./upload_release.py glance 2013.1 --test
|
||||
./upload_release.py glance 2015.1.0 --test
|
||||
|
||||
Uploads Glance's glance-2013.1.tar.gz to the final "2013.1" milestone
|
||||
as glance-2013.1.tar.gz, on Launchpad staging server
|
||||
Uploads Glance's glance-2015.1.0.tar.gz to the final "2015.1.0" milestone
|
||||
as glance-2015.1.0.tar.gz, on Launchpad staging server
|
||||
|
||||
./upload_release.py cinder 2012.2.3 --tarball=stable-folsom
|
||||
|
||||
|
|
@ -299,21 +298,21 @@ fixed in).
|
|||
|
||||
Examples:
|
||||
|
||||
./consolidate_release_page.py cinder grizzly 2013.1
|
||||
./consolidate_release_page.py cinder kilo 2015.1.0
|
||||
|
||||
Moves Cinder blueprints and bugs from intermediary grizzly milestones
|
||||
to the final 2013.1 milestone page.
|
||||
Moves Cinder blueprints and bugs from intermediary kilo milestones
|
||||
to the final 2015.1 milestone page.
|
||||
|
||||
./consolidate_release_page.py --test swift grizzly 1.8.0
|
||||
|
||||
Moves Swift 1.8.0-rc* blueprints and bugs to the final 1.8.0 page, on
|
||||
Launchpad staging server
|
||||
|
||||
./consolidate_release_page.py --copytask glance grizzly 2013.1
|
||||
./consolidate_release_page.py --copytask glance kilo 2015.1.0
|
||||
|
||||
Moves Glance blueprints from intermediary grizzly milestones to the final
|
||||
2013.1 milestone page. Creates grizzly series task for all grizzly bugs
|
||||
and sets the milestone for those to 2013.1.
|
||||
Moves Glance blueprints from intermediary kilo milestones to the final
|
||||
2015.1.0 milestone page. Creates kilo series task for all grizzly bugs
|
||||
and sets the milestone for those to 2015.1.0.
|
||||
|
||||
|
||||
create_milestones.py
|
||||
|
|
@ -392,6 +391,7 @@ To view open reviews for stable/icehouse 2014.1.4:
|
|||
period started. References to these reviews will be appended to
|
||||
2014.1.4-freeze.txt to be unfrozen later on.
|
||||
|
||||
|
||||
autokick.py
|
||||
-----------
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ if [[ "$IS_RELEASE" == "1" ]]; then
|
|||
RELVERSION=$MILESTONE
|
||||
else
|
||||
VERSION=`$TOOLSDIR/ms2version.py $PROJECT $MILESTONE`
|
||||
RELVERSION=${VERSION:0:6}
|
||||
RELVERSION=${VERSION:0:8}
|
||||
fi
|
||||
echo "$MILESTONE is $VERSION (final being $RELVERSION)"
|
||||
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ def abort(code, errmsg):
|
|||
|
||||
# Argument parsing
|
||||
parser = argparse.ArgumentParser(description='Convert milestone code names '
|
||||
'(juno-1) to version numbers '
|
||||
'(2014.2.b1)')
|
||||
'(kilo-1) to version numbers '
|
||||
'(2015.1.0b1)')
|
||||
parser.add_argument('project', help='Project the milestone is defined in')
|
||||
parser.add_argument('milestone', help='Milestone code name')
|
||||
parser.add_argument('--onlycheck', action='store_true',
|
||||
|
|
@ -72,4 +72,4 @@ qualifier = 'b'
|
|||
if target_milestone.name[-3:-1].lower() == 'rc':
|
||||
qualifier = 'rc'
|
||||
|
||||
print "%d.%d.%s%s" % (year, sequence, qualifier, args.milestone[-1:])
|
||||
print "%d.%d.0%s%s" % (year, sequence, qualifier, args.milestone[-1:])
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ title "Resolving $PROJECT $SERIES $RC to version"
|
|||
if [[ "$RC" == "final" ]]; then
|
||||
if [[ "$PROJECT" != "swift" ]]; then
|
||||
RC1VERSION=`$TOOLSDIR/ms2version.py $PROJECT $SERIES-rc1`
|
||||
FINALVERSION=${RC1VERSION:0:6}
|
||||
FINALVERSION=${RC1VERSION:0:8}
|
||||
fi
|
||||
MILESTONE=$FINALVERSION
|
||||
VERSION=$FINALVERSION
|
||||
|
|
@ -67,10 +67,10 @@ else
|
|||
if [[ "$PROJECT" != "swift" ]]; then
|
||||
MILESTONE="$SERIES-$RC"
|
||||
VERSION=`$TOOLSDIR/ms2version.py $PROJECT $MILESTONE`
|
||||
FINALVERSION=${VERSION:0:6}
|
||||
FINALVERSION=${VERSION:0:8}
|
||||
else
|
||||
MILESTONE="$FINALVERSION-$RC"
|
||||
VERSION="$FINALVERSION.$RC"
|
||||
VERSION="${FINALVERSION}$RC"
|
||||
$TOOLSDIR/ms2version.py --onlycheck $PROJECT $MILESTONE
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ fi
|
|||
|
||||
SHA=$1
|
||||
VERSION=$2
|
||||
RCVERSION="${VERSION}.rc1"
|
||||
RCVERSION="${VERSION}rc1"
|
||||
|
||||
PROJECT="swift"
|
||||
TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ def abort(code, errmsg):
|
|||
parser = argparse.ArgumentParser(description='Grab tarball and release it '
|
||||
'on LP as milestone or version.')
|
||||
parser.add_argument('project', help='Project to publish release for (nova)')
|
||||
parser.add_argument('version', help='Version under development (2013.1)')
|
||||
parser.add_argument("--milestone", help='Milestone to publish (grizzly-3)')
|
||||
parser.add_argument('version', help='Version under development (2015.1.0)')
|
||||
parser.add_argument("--milestone", help='Milestone to publish (kilo-2)')
|
||||
parser.add_argument("--nop", action='store_true',
|
||||
help='Only create release, do not upload tarball')
|
||||
parser.add_argument("--tarball",
|
||||
|
|
@ -74,9 +74,11 @@ for lp_milestone in lp_proj.all_milestones:
|
|||
if args.milestone:
|
||||
short_ms = lp_milestone.code_name.lower()
|
||||
if not short_ms.startswith("rc"):
|
||||
short_ms = "b" + args.milestone[-1:]
|
||||
if len(short_ms) < 2 or len(short_ms) > 3:
|
||||
abort(2, 'Bad code name for milestone: %s' % short_ms)
|
||||
preversion = "b" + args.milestone[-1:]
|
||||
else:
|
||||
preversion = short_ms
|
||||
else:
|
||||
preversion = ""
|
||||
break
|
||||
else:
|
||||
abort(2, 'Could not find milestone: %s' % milestone)
|
||||
|
|
@ -86,11 +88,7 @@ if not args.nop:
|
|||
print "Downloading tarball..."
|
||||
tmpdir = tempfile.mkdtemp()
|
||||
if args.tarball is None:
|
||||
if args.milestone is None:
|
||||
base_tgz = "%s-%s.tar.gz" % (args.project, args.version)
|
||||
else:
|
||||
base_tgz = "%s-%s.%s.tar.gz" \
|
||||
% (args.project, args.version, short_ms)
|
||||
base_tgz = "%s-%s%s.tar.gz" % (args.project, args.version, preversion)
|
||||
else:
|
||||
base_tgz = "%s-%s.tar.gz" % (args.project, args.tarball)
|
||||
url_tgz = "http://tarballs.openstack.org/%s/%s" % (args.project, base_tgz)
|
||||
|
|
@ -143,12 +141,11 @@ lp_milestone.lp_save()
|
|||
if not args.nop:
|
||||
# Upload file
|
||||
print "Uploading release files..."
|
||||
final_tgz = "%s-%s%s.tar.gz" % (args.project, args.version, preversion)
|
||||
if args.milestone:
|
||||
final_tgz = "%s-%s.%s.tar.gz" % (args.project, args.version, short_ms)
|
||||
description = '%s "%s" milestone' % \
|
||||
(args.project.capitalize(), args.milestone)
|
||||
else:
|
||||
final_tgz = "%s-%s.tar.gz" % (args.project, args.version)
|
||||
description = '%s %s release' % \
|
||||
(args.project.capitalize(), args.version)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue