remove upper-constraints.txt from lower-const job
Currently in lower-constraints job, pip install is issued with both upper-constraints.txt by `install_command` in [testenv] and lower-constraints.txt by `deps` in [testenv:lower-constraints] so lower-constraints job actually tests aginst upper-constraints. We need to remove upper-constraints.txt from lower-constraints job. Along with the above, update version of mock, olso_messaging and keystoneatuh1 package in lower-constraints.txt, requirements.txt and test-requirements.txt. Change-Id: I9f93075402dd5273a4ab045db5cd15bd4dea8582
This commit is contained in:
parent
bdb2d52b3a
commit
8ee4d0d405
@ -47,7 +47,7 @@ jmespath==0.9.3
|
||||
jsonpatch==1.21
|
||||
jsonpointer==2.0
|
||||
jsonschema==2.6.0
|
||||
keystoneauth1==3.4.0
|
||||
keystoneauth1==3.11.0
|
||||
keystonemiddleware==4.17.0
|
||||
kombu==4.0.0
|
||||
kubernetes==5.0.0
|
||||
@ -55,7 +55,7 @@ linecache2==1.0.0
|
||||
Mako==1.0.7
|
||||
MarkupSafe==1.0
|
||||
mccabe==0.2.1
|
||||
mock==2.0.0
|
||||
mock==3.0.0
|
||||
monotonic==1.4
|
||||
mox3==0.25.0
|
||||
msgpack==0.5.6
|
||||
@ -76,7 +76,7 @@ oslo.context==2.19.2
|
||||
oslo.db==4.27.0
|
||||
oslo.i18n==3.20.0
|
||||
oslo.log==3.36.0
|
||||
oslo.messaging==5.29.0
|
||||
oslo.messaging==9.3.0
|
||||
oslo.middleware==3.31.0
|
||||
oslo.policy==1.30.0
|
||||
oslo.reports==1.18.0
|
||||
|
@ -26,7 +26,7 @@ oslo.config>=5.2.0 # Apache-2.0
|
||||
oslo.context>=2.19.2 # Apache-2.0
|
||||
oslo.db>=4.27.0 # Apache-2.0
|
||||
oslo.log>=3.36.0 # Apache-2.0
|
||||
oslo.messaging>=5.29.0 # Apache-2.0
|
||||
oslo.messaging>=9.3.0 # Apache-2.0
|
||||
oslo.middleware>=3.31.0 # Apache-2.0
|
||||
oslo.policy>=1.30.0 # Apache-2.0
|
||||
oslo.reports>=1.18.0 # Apache-2.0
|
||||
|
@ -9,7 +9,7 @@ ddt>=1.0.1 # MIT
|
||||
doc8>=0.6.0 # Apache-2.0
|
||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||
mock>=2.0.0 # BSD
|
||||
mock>=3.0.0 # BSD
|
||||
python-subunit>=1.0.0 # Apache-2.0/BSD
|
||||
python-tackerclient>=0.8.0 # Apache-2.0
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
@ -19,4 +19,4 @@ testtools>=2.2.0 # MIT
|
||||
WebTest>=2.0.27 # MIT
|
||||
python-barbicanclient>=4.5.2 # Apache-2.0
|
||||
python-blazarclient>=1.0.1 # Apache-2.0
|
||||
requests-mock>=1.2.0 # Apache-2.0
|
||||
requests-mock>=1.2.0 # Apache-2.0
|
||||
|
8
tox.ini
8
tox.ini
@ -13,9 +13,11 @@ passenv = UPPER_CONSTRAINTS_FILE
|
||||
usedevelop = True
|
||||
whitelist_externals = rm
|
||||
install_command =
|
||||
pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
pip install -U {opts} {packages}
|
||||
deps =
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands =
|
||||
stestr run --slowest --concurrency 1 {posargs}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user