From 71b86a313953ee193d482e4d0d30f55585eeae8e Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Wed, 4 Nov 2020 14:19:54 +0100
Subject: [PATCH] Recognize TOX_CONSTRAINTS_FILE as a valid constraints
 variable

Add-on for https://review.opendev.org/760782

Change-Id: I62413ba860d84c48c2da97ea469d3906d885e6ef
---
 doc/source/contributor/testenv.rst                        | 7 ++++---
 playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml | 6 +++++-
 playbooks/roles/bifrost-pip-install/defaults/main.yml     | 5 ++++-
 scripts/install-deps.sh                                   | 6 +++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/doc/source/contributor/testenv.rst b/doc/source/contributor/testenv.rst
index efe117665..e9e4bbacc 100644
--- a/doc/source/contributor/testenv.rst
+++ b/doc/source/contributor/testenv.rst
@@ -26,9 +26,10 @@ Command::
 Note:
 
 - In order to cap requirements for installation, an ``upper_constraints_file``
-  setting is defined. This is consuming the ``UPPER_CONSTRAINTS_FILE`` env
-  var by default, to properly integrate with CI systems, and will default
-  to ``/opt/stack/requirements/upper-constraints.txt`` file if not present.
+  setting is defined. This is consuming the ``UPPER_CONSTRAINTS_FILE`` or
+  ``TOX_CONSTRAINTS_FILE`` env var by default, to properly integrate with CI
+  systems, and will default to
+  ``/opt/stack/requirements/upper-constraints.txt`` file if not present.
 
 Manually test with Virtual Machines
 ===================================
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml
index b8c14e0bc..80ffc9fd1 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml
@@ -50,7 +50,11 @@ git_url_root: https://opendev.org
 reqs_git_url: "{{ git_url_root }}/openstack/requirements"
 reqs_git_folder: "{{ git_root }}/requirements"
 reqs_git_branch: "{{ git_branch }}"
-upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(reqs_git_folder + '/upper-constraints.txt', True) }}"
+upper_constraints_file: >-
+  {{ lookup('env', 'UPPER_CONSTRAINTS_FILE')
+     | default(lookup('env', 'TOX_CONSTRAINTS_FILE'), True)
+     | default(reqs_git_folder + '/upper-constraints.txt', True) }}
+
 update_repos: true
 force_update_repos: true
 
diff --git a/playbooks/roles/bifrost-pip-install/defaults/main.yml b/playbooks/roles/bifrost-pip-install/defaults/main.yml
index 7f1d21a11..e73423bdd 100644
--- a/playbooks/roles/bifrost-pip-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-pip-install/defaults/main.yml
@@ -16,4 +16,7 @@ pip_install_delay: 10
 reqs_git_folder: /opt/stack/requirements
 state: present
 version:
-upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(reqs_git_folder + '/upper-constraints.txt', True) }}"
+upper_constraints_file: >-
+  {{ lookup('env', 'UPPER_CONSTRAINTS_FILE')
+     | default(lookup('env', 'TOX_CONSTRAINTS_FILE'), True)
+     | default(reqs_git_folder + '/upper-constraints.txt', True) }}
diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
index 572c4a73c..893c5e9a6 100755
--- a/scripts/install-deps.sh
+++ b/scripts/install-deps.sh
@@ -13,6 +13,10 @@ export LANG=en_US.UTF-8
 
 export VENV=${VENV:-/opt/stack/bifrost}
 
+# NOTE(dtantsur): change this when creating a stable branch
+BRANCH=${ZUUL_BRANCH:-master}
+CONSTRAINTS_FILE=${UPPER_CONSTRAINTS_FILE:-${TOX_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/$BRANCH}}
+
 CHECK_CMD_PKGS=(
     python3-devel
     python3
@@ -145,6 +149,6 @@ echo "Using Bindep to install binary dependencies"
 bindep -b &> /dev/null || ${INSTALLER_CMD} $(bindep -b)
 
 echo "Installing Python requirements"
-${PIP} install -r "$(dirname $0)/../requirements.txt" -c ${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/master}
+${PIP} install -r "$(dirname $0)/../requirements.txt" -c "${CONSTRAINTS_FILE}"
 
 echo "Completed installation of basic dependencies."