openstack/releases
Code Issues Proposed changes

Rely on Zuul to provide project name in announces

Browse Source 
If we run in CI, rather than prioritizing using 'python setup.py --name'
as the project name to be used in release announcements, use the
repository name as provided by Zuul.

This should fix the issue reported in:
http://lists.openstack.org/pipermail/openstack-discuss/2020-April/014359.html

Change-Id: Ia0026356676561a6b3a55ab05db5ed7a58b646b6
This commit is contained in:
Thierry Carrez 2020-04-24 12:34:58 +02:00
parent 050447401e
commit d40c4ca491
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/announce.sh
View File

@ -168,9 +168,6 @@ echo "$DIFF_START to $VERSION on $SERIES"
relnotes_file="$RELNOTESDIR/$SHORTNAME-$VERSION" relnotes_file="$RELNOTESDIR/$SHORTNAME-$VERSION"
# If we don't have a setup.py, use a CI system environment variable or the
# current directory name as the library name so the email template makes
# sense.
if [ -e setup.py ] ; then if [ -e setup.py ] ; then
# Some projects have setup_requires dependencies on packages that are # Some projects have setup_requires dependencies on packages that are
# not pre-installed, so run a setuptools command in a way to get them # not pre-installed, so run a setuptools command in a way to get them
@ -178,16 +175,18 @@ if [ -e setup.py ] ; then
# be sending. # be sending.
echo "Priming setup_requires packages" echo "Priming setup_requires packages"
python setup.py --name python setup.py --name
library_name=$(python setup.py --name) project_name=$(python setup.py --name)
description="$(python setup.py --description)" description="$(python setup.py --description)"
elif [ -n "$ZUUL_PROJECT" ] ; then
# We may be running in the context of a Zuul CI system, in which case
# we can infer the project name from the repo name it supplies.
library_name="$(basename ${ZUUL_PROJECT})"
else else
# As a last resort, guess that the project name may be the same as that # As a last resort, guess that the project name may be the same as that
# of the local working directory at the point this script is invoked. # of the local working directory at the point this script is invoked.
library_name="$(basename $(pwd))" project_name="$(basename $(pwd))"
fi
# If we are running in the context of a Zuul CI system,
# we can just infer the project name from the repo name it supplies.
if [ -n "$ZUUL_PROJECT" ] ; then
project_name="$(basename ${ZUUL_PROJECT})"
fi fi
echo echo
@ -198,7 +197,7 @@ release-notes \
$stable \ $stable \
$first_release \ $first_release \
--publishing-dir-name "$SHORTNAME" \ --publishing-dir-name "$SHORTNAME" \
. "$library_name" "$DIFF_START" "$VERSION" \ . "$project_name" "$DIFF_START" "$VERSION" \
$include_pypi_link \ $include_pypi_link \
--description "$description" \ --description "$description" \
| tee $relnotes_file | tee $relnotes_file