From 9ffe3621baf22833634a27195e96b0f805f4e4f2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 20 May 2019 20:15:38 +0200 Subject: [PATCH] Handle TOX_CONSTRAINTS_FILE as well as UPPER_CONSTRAINTS_FILE In I3f957187ed4f29fcf88db99cb79fb33b21a8dd8d we'd like to rename the use of UPPER_CONSTRAINTS_FILE to TOX_CONSTRAINTS_FILE so that we can reuse the logic for LOWER constraints file checking as well. Change-Id: I04066ca815814ecf66abe9cb385469969edead57 --- roles/copy-release-tools-scripts/files/release-tools/functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/copy-release-tools-scripts/files/release-tools/functions b/roles/copy-release-tools-scripts/files/release-tools/functions index ddd2649b87..5342c832c5 100644 --- a/roles/copy-release-tools-scripts/files/release-tools/functions +++ b/roles/copy-release-tools-scripts/files/release-tools/functions @@ -87,9 +87,10 @@ function update_upper_constraints { return 0 fi sed -i~ -e "s,{\(env:UPPER_CONSTRAINTS_FILE\)[^ ]*},{\1:$uc_url}," tox.ini + sed -i~ -e "s,{\(env:TOX_CONSTRAINTS_FILE\)[^ ]*},{\1:$uc_url}," tox.ini if ! git diff --exit-code >/dev/null 2>&1 ; then git add tox.ini - msg="Update UPPER_CONSTRAINTS_FILE for $branch" + msg="Update TOX/UPPER_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