openstack/project-config
Code Issues Proposed changes

Merge "No longer specify announce list in tag message"

Browse Source
This commit is contained in:
Jenkins 2016-11-21 09:00:06 +00:00 committed by Gerrit Code Review
commit 49012f9926
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/scripts/release-tools/branch_from_yaml.sh
View File

@ -44,7 +44,7 @@ shift
DELIVERABLES="$@" DELIVERABLES="$@"
$TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES \ $TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES \
| while read deliverable series version diff_start repo hash announce_to pypi first_full; do | while read deliverable series version diff_start repo hash pypi first_full; do
echo "$SERIES $repo $version" echo "$SERIES $repo $version"
$TOOLSDIR/make_stable_branch.sh $SERIES $repo $version $TOOLSDIR/make_stable_branch.sh $SERIES $repo $version
done done

9
jenkins/scripts/release-tools/list_deliverable_changes.py
View File

@ -69,14 +69,6 @@ def get_modified_deliverable_file_content(reporoot, filenames):
with open(filename, 'r') as f: with open(filename, 'r') as f:
deliverable_data = yaml.load(f.read()) deliverable_data = yaml.load(f.read())
# Determine where to send email announcements of
# releases. Default to the development list, to cut down on
# excessive emails to the announcement list.
send_announcements_to = deliverable_data.get(
'send-announcements-to',
'openstack-dev@lists.openstack.org',
)
# Determine whether announcements should include a PyPI # Determine whether announcements should include a PyPI
# link. Default to no, for service projects, because it is # link. Default to no, for service projects, because it is
# less irksome to fail to include a link to a thing that # less irksome to fail to include a link to a thing that
@ -115,7 +107,6 @@ def get_modified_deliverable_file_content(reporoot, filenames):
yield (deliverable_name, series_name, version, yield (deliverable_name, series_name, version,
diff_start, diff_start,
project['repo'], project['hash'], project['repo'], project['hash'],
send_announcements_to,
include_pypi_link, include_pypi_link,
first_full_release) first_full_release)

12
jenkins/scripts/release-tools/release.sh
View File

@ -24,9 +24,9 @@ TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $TOOLSDIR/functions source $TOOLSDIR/functions
function usage { function usage {
echo "Usage: release.sh [-a] repository series version diff_start SHA announce include_pypi first-full-release extra-metadata" echo "Usage: release.sh [-a] repository series version diff_start SHA include_pypi first-full-release extra-metadata"
echo echo
echo "Example: release.sh openstack/oslo.rootwrap mitaka 3.0.3 '' gerrit/master openstack-dev@lists.openstack.org yes no 'meta:release:Workflow+1: Doug Hellmann <doug@doughellmann.com>'" echo "Example: release.sh openstack/oslo.rootwrap mitaka 3.0.3 '' gerrit/master yes no 'meta:release:Workflow+1: Doug Hellmann <doug@doughellmann.com>'"
} }
if [ $# -lt 5 ]; then if [ $# -lt 5 ]; then
@ -39,10 +39,9 @@ SERIES=$2
VERSION=$3 VERSION=$3
DIFF_START=$4 DIFF_START=$4
SHA=$5 SHA=$5
ANNOUNCE=$6 INCLUDE_PYPI=${6:-no}
INCLUDE_PYPI=${7:-no} FIRST_FULL=${7:-no}
FIRST_FULL=${8:-no} EXTRA_METADATA="$8"
EXTRA_METADATA="$9"
SHORTNAME=`basename $REPO` SHORTNAME=`basename $REPO`
@ -82,7 +81,6 @@ meta:version: $VERSION
meta:diff-start: $DIFF_START meta:diff-start: $DIFF_START
meta:series: $SERIES meta:series: $SERIES
meta:release-type: $RELEASETYPE meta:release-type: $RELEASETYPE
meta:announce: $ANNOUNCE
meta:pypi: $INCLUDE_PYPI meta:pypi: $INCLUDE_PYPI
meta:first: $FIRST_FULL meta:first: $FIRST_FULL
$EXTRA_METADATA $EXTRA_METADATA

6
jenkins/scripts/release-tools/release_from_yaml.sh
View File

@ -90,9 +90,9 @@ fi
RELEASE_META=$(git show --format=full --show-notes=review $parent | egrep -i '(Author|Commit:|Code-Review|Workflow|Change-Id)' | sed -e 's/^ //g' -e 's/^/meta:release:/g') RELEASE_META=$(git show --format=full --show-notes=review $parent | egrep -i '(Author|Commit:|Code-Review|Workflow|Change-Id)' | sed -e 's/^ //g' -e 's/^/meta:release:/g')
$TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES \ $TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES \
| while read deliverable series version diff_start repo hash announce_to pypi first_full; do | while read deliverable series version diff_start repo hash pypi first_full; do
echo "$deliverable $series $version $diff_start $repo $hash $announce_to $pypi $first_full" echo "$deliverable $series $version $diff_start $repo $hash $pypi $first_full"
$TOOLSDIR/release.sh $repo $series $version $diff_start $hash $announce_to $pypi $first_full "$RELEASE_META" $TOOLSDIR/release.sh $repo $series $version $diff_start $hash $pypi $first_full "$RELEASE_META"
done done
exit 0 exit 0