From d8c444319b679823f2e549b2781c17a28923df95 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 15 Apr 2020 20:47:20 +0200 Subject: [PATCH] Use TOX_CONSTRAINTS_FILE in release script UPPER_CONSTRAINTS_FILE is deprecatedi[1], use the newer TOX_CONSTRAINTS_FILE instead when creating new master versions. [1] https://zuul-ci.org/docs/zuul-jobs/python-roles.html#rolevar-tox.tox_constraints_file Change-Id: I9df6b2bd8660cd24d8408d9753184564276ca98f --- .../copy-release-tools-scripts/files/release-tools/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/copy-release-tools-scripts/files/release-tools/functions b/roles/copy-release-tools-scripts/files/release-tools/functions index 3be4d8be18..a30ae6807e 100644 --- a/roles/copy-release-tools-scripts/files/release-tools/functions +++ b/roles/copy-release-tools-scripts/files/release-tools/functions @@ -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