From faa408159dfd214a1f30a9e9db1901235a7d1142 Mon Sep 17 00:00:00 2001
From: likui <likui@yovole.com>
Date: Mon, 17 May 2021 16:38:52 +0800
Subject: [PATCH] Replace deprecated UPPER_CONSTRAINTS_FILE variable

UPPER_CONSTRAINTS_FILE is old name and deprecated

[1] https://zuul-ci.org/docs/zuul-jobs/python-roles.html#rolevar-tox.tox_constraints_file

Change-Id: Ieb09cd19a88453e21c079541a5daa1dc5df3ffa9
---
 scripts/bootstrap-ansible.sh | 10 +++++-----
 scripts/gate-check-commit.sh |  2 +-
 scripts/scripts-library.sh   |  2 +-
 tox.ini                      |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index 0932df1d50..0b29adaa36 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -109,17 +109,17 @@ fi
 PYTHON_EXEC_PATH="${PYTHON_EXEC_PATH:-$(which python3)}"
 
 # Obtain the SHA of the upper-constraints to use for the ansible runtime venv
-UPPER_CONSTRAINTS_SHA=$(awk '/requirements_git_install_branch:/ {print $2}' playbooks/defaults/repo_packages/openstack_services.yml)
+TOX_CONSTRAINTS_SHA=$(awk '/requirements_git_install_branch:/ {print $2}' playbooks/defaults/repo_packages/openstack_services.yml)
 
 # if we are in CI, grab the u-c file from the locally cached repo, otherwise download
-UPPER_CONSTRAINTS_PATH="/opt/ansible-runtime-constraints-${UPPER_CONSTRAINTS_SHA}.txt"
+TOX_CONSTRAINTS_PATH="/opt/ansible-runtime-constraints-${TOX_CONSTRAINTS_SHA}.txt"
 if [[ -z "${ZUUL_SRC_PATH+defined}" ]]; then
-  wget ${UPPER_CONSTRAINTS_FILE:-"https://opendev.org/openstack/requirements/raw/${UPPER_CONSTRAINTS_SHA}/upper-constraints.txt"} -O ${UPPER_CONSTRAINTS_PATH}
+  wget ${TOX_CONSTRAINTS_FILE:-"https://opendev.org/openstack/requirements/raw/${TOX_CONSTRAINTS_SHA}/upper-constraints.txt"} -O ${TOX_CONSTRAINTS_PATH}
 else
-  git --git-dir=${ZUUL_SRC_PATH}/opendev.org/openstack/requirements/.git show ${UPPER_CONSTRAINTS_SHA}:upper-constraints.txt > ${UPPER_CONSTRAINTS_PATH}
+  git --git-dir=${ZUUL_SRC_PATH}/opendev.org/openstack/requirements/.git show ${TOX_CONSTRAINTS_SHA}:upper-constraints.txt > ${TOX_CONSTRAINTS_PATH}
 fi
 
-export UPPER_CONSTRAINTS_FILE="file://${UPPER_CONSTRAINTS_PATH}"
+export TOX_CONSTRAINTS_FILE="file://${TOX_CONSTRAINTS_PATH}"
 
 if [[ -z "${SKIP_OSA_RUNTIME_VENV_BUILD+defined}" ]]; then
     build_ansible_runtime_venv
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 072a32d9a0..ae905bf917 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -234,7 +234,7 @@ if [[ "${ACTION}" == "upgrade" ]]; then
     # script to allow newer versions of Ansible and global
     # requirements to be installed.
     unset ANSIBLE_PACKAGE
-    unset UPPER_CONSTRAINTS_FILE
+    unset TOX_CONSTRAINTS_FILE
     unset PIP_OPTS
     unset UPGRADE_TARGET_BRANCH
 
diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh
index f78295fa4c..742366cde5 100755
--- a/scripts/scripts-library.sh
+++ b/scripts/scripts-library.sh
@@ -68,7 +68,7 @@ function build_ansible_runtime_venv {
 
     # The vars used to prepare the Ansible runtime venv
     PIP_OPTS+=" --constraint global-requirement-pins.txt"
-    PIP_OPTS+=" --constraint ${UPPER_CONSTRAINTS_FILE}"
+    PIP_OPTS+=" --constraint ${TOX_CONSTRAINTS_FILE}"
 
     # When executing the installation, we want to specify all our options on the CLI,
     # making sure to completely ignore any config already on the host. This is to
diff --git a/tox.ini b/tox.ini
index 378c5ef2e9..32b8569da7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ ignore_basepython_conflict = True
 usedevelop = True
 basepython = python3
 install_command =
-    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages}
+    pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 deps =
     -r{toxinidir}/global-requirement-pins.txt
     -r{toxinidir}/test-requirements.txt