]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Replace deprecated UPPER_CONSTRAINTS_FILE variable
authorZhongShengping <chdzsp@163.com>
Wed, 11 Nov 2020 01:08:35 +0000 (09:08 +0800)
committerZhongShengping <chdzsp@163.com>
Wed, 11 Nov 2020 01:08:35 +0000 (09:08 +0800)
UPPER_CONSTRAINTS_FILE is deprecated and TOX_CONSTRAINTS_FILE is
the new environment variable name that replaces it [1].

This allows to use upper-constraints file as more
readable way instead of UPPER_CONSTRAINTS_FILE=<lower-constraints file>.

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

Change-Id: I668ab8cdfb3ec49bb26d890630c823419c8cb3de

tox.ini

diff --git a/tox.ini b/tox.ini
index 5099a0d39fe37ac49cd42dd53b06721bc2a7ccdd..90eea2ed4daad0b12b48505ca247f8371138f65e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
+install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 
 [testenv:releasenotes]
 deps = -r{toxinidir}/doc/requirements.txt