openstack
/
project-config
Code Issues Proposed changes

Merge "update the branching script to include a semver bump"

This commit is contained in:
Zuul 2018-10-12 20:16:27 +00:00 committed by Gerrit Code Review
parent 794ef71253 d919755370
commit ca7e84e7cc
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/copy-release-tools-scripts/files/release-tools/add_release_note_page.sh
View File

@ -36,7 +36,17 @@ cd $REPO
NEW_BRANCH="stable/$SERIES"
commit_msg="Update reno for $NEW_BRANCH"
commit_msg="Update master for $NEW_BRANCH
Add file to the reno documentation build to show release notes for
$NEW_BRANCH.
Use pbr instruction to increment the minor version number
automatically so that master versions are higher than the versions on
$NEW_BRANCH.
Sem-Ver: feature
"
titlebranch=$(python -c "print('$SERIES'.title())")
cat - > releasenotes/source/${SERIES}.rst <<EOF
===================================

4
roles/copy-release-tools-scripts/files/release-tools/make_branch.sh
View File

@ -72,8 +72,8 @@ if [[ $NEW_BRANCH =~ stable/ ]]; then
series=$(echo $NEW_BRANCH | cut -f2 -d/)
if [[ -d releasenotes/source ]]; then
# Also update the reno settings, in master, to add the new
# series page.
echo "Updating reno"
# series page and bump the SemVer value for feature work.
echo "Updating reno and semver"
git checkout master
$TOOLSDIR/add_release_note_page.sh $series .
else