Merge "Use TOX_CONSTRAINTS_FILE in release script"

This commit is contained in:
Zuul 2020-04-16 05:58:28 +00:00 committed by Gerrit Code Review
commit 25cafbee12
1 changed files with 2 additions and 2 deletions

View File

@ -86,7 +86,7 @@ function update_upper_constraints {
echo "No tox.ini file, skipping constraints"
return 0
fi
sed -i~ -e "s,{\(env:UPPER_CONSTRAINTS_FILE\)[^ ]*},{\1:$uc_url}," tox.ini
sed -i~ -e "s,{\(env:UPPER_CONSTRAINTS_FILE\)[^ ]*},{env:TOX_CONSTRAINTS_FILE:$uc_url}," tox.ini
sed -i~ -e "s,{\(env:TOX_CONSTRAINTS_FILE\)[^ ]*},{\1:$uc_url}," tox.ini
# Octavia project specific
if [[ -f elements/amphora-agent/source-repository-amphora-agent ]]; then
@ -95,7 +95,7 @@ function update_upper_constraints {
fi
if ! git diff --exit-code >/dev/null 2>&1 ; then
git add tox.ini
msg="Update TOX/UPPER_CONSTRAINTS_FILE for $branch"
msg="Update TOX_CONSTRAINTS_FILE for $branch"
body="Update the URL to the upper-constraints file to point to the redirect
rule on releases.openstack.org so that anyone working on this branch
will switch to the correct upper-constraints list automatically when