Update tox.ini files to use stein constraints

This updates the upper-constraints.txt used by tox for
installing python modules to reference the stable/stein
constraints.

Change-Id: Ia3a145933e44aca016e84024dca4131dd778ecce
Closes-Bug: 1834216
Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
Don Penney 2019-06-25 13:04:31 -04:00
parent 7648737409
commit 27ba5a02a2
7 changed files with 24 additions and 7 deletions

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
*.a *.a
*.egg *.egg*
*.egg-info *.egg-info
*.o *.o
*.py[co] *.py[co]

View File

@ -308,7 +308,7 @@ def tidy_storage(result_file):
raise TidyStorageFail("Failed to get Cinder volume info") raise TidyStorageFail("Failed to get Cinder volume info")
if pools: if pools:
host = pools[0].name host = pools[0].name # pylint: disable=no-member
if v_t_d is None: if v_t_d is None:
v_t_d = 'ceph' v_t_d = 'ceph'
@ -318,7 +318,7 @@ def tidy_storage(result_file):
cinder_volume_l = [i.id.encode('utf-8') for i in volume_l] cinder_volume_l = [i.id.encode('utf-8') for i in volume_l]
if avail_zones: if avail_zones:
avail_z = avail_zones[0].zoneName avail_z = avail_zones[0].zoneName # pylint: disable=no-member
try: try:
output = subprocess.check_output( output = subprocess.check_output(

View File

@ -11,7 +11,10 @@ stxdir = {toxinidir}/../../..
[testenv] [testenv]
whitelist_externals = find whitelist_externals = find
install_command = pip install --no-cache-dir -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/pike/upper-constraints.txt} {opts} {packages} install_command = pip install \
--no-cache-dir \
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
{opts} {packages}
# Note: Developers can leave STX_PREFIX unset in their env, and it will default to "stx-". # Note: Developers can leave STX_PREFIX unset in their env, and it will default to "stx-".
# Zuul sets STX_PREFIX to an empty string. # Zuul sets STX_PREFIX to an empty string.

View File

@ -18,7 +18,10 @@ setenv = VIRTUAL_ENV={envdir}
STX_PREFIX = {env:STX_PREFIX:stx-} STX_PREFIX = {env:STX_PREFIX:stx-}
basepython = python2.7 basepython = python2.7
usedevelop = True usedevelop = True
install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} install_command = pip install \
-U \
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
{opts} {packages}
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-e{[tox]stxdir}/{env:STX_PREFIX}update/tsconfig/tsconfig -e{[tox]stxdir}/{env:STX_PREFIX}update/tsconfig/tsconfig

View File

@ -21,7 +21,11 @@ sitepackages = True
whitelist_externals = bash whitelist_externals = bash
find find
install_command = pip install -v -v -v -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/pike/upper-constraints.txt} {opts} {packages} install_command = pip install \
-v -v -v \
-c{toxinidir}/upper-constraints.txt \
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
{opts} {packages}
# Note the hash seed is set to 0 until can be tested with a # Note the hash seed is set to 0 until can be tested with a
# random hash seed successfully. # random hash seed successfully.

View File

@ -0,0 +1,5 @@
# Override upstream constraints based on StarlingX load
iso8601==0.1.11
openstacksdk==0.25.0
os-client-config==1.28.0
paramiko==2.1.1

View File

@ -4,7 +4,9 @@ minversion = 2.3
skipsdist = True skipsdist = True
[testenv] [testenv]
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages} install_command = pip install \
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
{opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_CAPTURE=1 OS_STDOUT_CAPTURE=1
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1