diff --git a/jenkins/scripts/release-tools/branch_from_yaml.sh b/jenkins/scripts/release-tools/branch_from_yaml.sh index 7540b179ab..b4ff6040db 100755 --- a/jenkins/scripts/release-tools/branch_from_yaml.sh +++ b/jenkins/scripts/release-tools/branch_from_yaml.sh @@ -44,7 +44,7 @@ shift 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" $TOOLSDIR/make_stable_branch.sh $SERIES $repo $version done diff --git a/jenkins/scripts/release-tools/list_deliverable_changes.py b/jenkins/scripts/release-tools/list_deliverable_changes.py index 4bbb5d5259..0211729d41 100755 --- a/jenkins/scripts/release-tools/list_deliverable_changes.py +++ b/jenkins/scripts/release-tools/list_deliverable_changes.py @@ -69,14 +69,6 @@ def get_modified_deliverable_file_content(reporoot, filenames): with open(filename, 'r') as f: 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 # link. Default to no, for service projects, because it is # 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, diff_start, project['repo'], project['hash'], - send_announcements_to, include_pypi_link, first_full_release) diff --git a/jenkins/scripts/release-tools/release.sh b/jenkins/scripts/release-tools/release.sh index 8102f3aaa8..96239dde68 100755 --- a/jenkins/scripts/release-tools/release.sh +++ b/jenkins/scripts/release-tools/release.sh @@ -24,9 +24,9 @@ TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $TOOLSDIR/functions 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 "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 '" + echo "Example: release.sh openstack/oslo.rootwrap mitaka 3.0.3 '' gerrit/master yes no 'meta:release:Workflow+1: Doug Hellmann '" } if [ $# -lt 5 ]; then @@ -39,10 +39,9 @@ SERIES=$2 VERSION=$3 DIFF_START=$4 SHA=$5 -ANNOUNCE=$6 -INCLUDE_PYPI=${7:-no} -FIRST_FULL=${8:-no} -EXTRA_METADATA="$9" +INCLUDE_PYPI=${6:-no} +FIRST_FULL=${7:-no} +EXTRA_METADATA="$8" SHORTNAME=`basename $REPO` @@ -82,7 +81,6 @@ meta:version: $VERSION meta:diff-start: $DIFF_START meta:series: $SERIES meta:release-type: $RELEASETYPE -meta:announce: $ANNOUNCE meta:pypi: $INCLUDE_PYPI meta:first: $FIRST_FULL $EXTRA_METADATA diff --git a/jenkins/scripts/release-tools/release_from_yaml.sh b/jenkins/scripts/release-tools/release_from_yaml.sh index 6e6c87d279..e2198b8d6b 100755 --- a/jenkins/scripts/release-tools/release_from_yaml.sh +++ b/jenkins/scripts/release-tools/release_from_yaml.sh @@ -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') $TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES \ -| while read deliverable series version diff_start repo hash announce_to pypi first_full; do - echo "$deliverable $series $version $diff_start $repo $hash $announce_to $pypi $first_full" - $TOOLSDIR/release.sh $repo $series $version $diff_start $hash $announce_to $pypi $first_full "$RELEASE_META" +| while read deliverable series version diff_start repo hash pypi first_full; do + echo "$deliverable $series $version $diff_start $repo $hash $pypi $first_full" + $TOOLSDIR/release.sh $repo $series $version $diff_start $hash $pypi $first_full "$RELEASE_META" done exit 0