Make lower constraints CI works well
The actual target of openstack-tox-lower-constraints is using the lower version package to run unit test. But in current Cinder CI,there was a hard code to specify the upper-constraints.txt, that means we install the package in upper-constraints.txt, but the lower-constraints.txt doesn't work well. This patch try to fix this error, move the hard code to 'deps'. We also refresh the lower-constraints.txt and requirements.txt to make CI works well: 1. Add libxml2-dev, libxslt-devel, libxslt1-dev to bindep.txt to make lxml can be built successfully, like what we do in other project. [0] 2. Upgrade oslo.messaging to 6.4.0 to avoid "ACCESS_REFUSED - Login was refused using authentication mechanism AMQPLAIN." error. 3. Upgrade oslo.utils to 3.34.0 to add a new method escape_ipv6 [1] to oslo_utils.netutils, which is needed by [2]. 4. Upgrade keystoneauth1 to 3.7.0 to fix "no such option split_loggers in group [service_user]" [3] [0] https://github.com/openstack/nova/blob/bb3ded3/bindep.txt#L17-L19 [1] https://review.openstack.org/#/c/495166/ [2] https://github.com/openstack/cinder/blob/fe421fe/cinder/volume/drivers/netapp/utils.py#L172 [3] https://review.openstack.org/#/c/578008/ Change-Id: Ide84d49c283c0ad179a5cfdb0392d34ee73d97ea Closes-bug: #1801239
This commit is contained in:
parent
54900fd866
commit
3c2a22f75c
|
@ -30,3 +30,6 @@ postgresql-client [platform:dpkg]
|
||||||
postgresql-devel [platform:rpm]
|
postgresql-devel [platform:rpm]
|
||||||
postgresql-server [platform:rpm]
|
postgresql-server [platform:rpm]
|
||||||
thin-provisioning-tools [platform:debian]
|
thin-provisioning-tools [platform:debian]
|
||||||
|
libxml2-dev [platform:dpkg test]
|
||||||
|
libxslt-devel [platform:rpm test]
|
||||||
|
libxslt1-dev [platform:dpkg test]
|
||||||
|
|
|
@ -48,7 +48,7 @@ Jinja2==2.10
|
||||||
jsonpatch==1.21
|
jsonpatch==1.21
|
||||||
jsonpointer==2.0
|
jsonpointer==2.0
|
||||||
jsonschema==2.6.0
|
jsonschema==2.6.0
|
||||||
keystoneauth1==3.4.0
|
keystoneauth1==3.7.0
|
||||||
keystonemiddleware==4.17.0
|
keystonemiddleware==4.17.0
|
||||||
kombu==4.1.0
|
kombu==4.1.0
|
||||||
linecache2==1.0.0
|
linecache2==1.0.0
|
||||||
|
@ -75,7 +75,7 @@ oslo.context==2.19.2
|
||||||
oslo.db==4.27.0
|
oslo.db==4.27.0
|
||||||
oslo.i18n==3.15.3
|
oslo.i18n==3.15.3
|
||||||
oslo.log==3.36.0
|
oslo.log==3.36.0
|
||||||
oslo.messaging==5.29.0
|
oslo.messaging==6.4.0
|
||||||
oslo.middleware==3.31.0
|
oslo.middleware==3.31.0
|
||||||
oslo.policy==1.30.0
|
oslo.policy==1.30.0
|
||||||
oslo.privsep==1.23.0
|
oslo.privsep==1.23.0
|
||||||
|
@ -83,7 +83,7 @@ oslo.reports==1.18.0
|
||||||
oslo.rootwrap==5.8.0
|
oslo.rootwrap==5.8.0
|
||||||
oslo.serialization==2.18.0
|
oslo.serialization==2.18.0
|
||||||
oslo.service==1.24.0
|
oslo.service==1.24.0
|
||||||
oslo.utils==3.33.0
|
oslo.utils==3.34.0
|
||||||
oslo.versionedobjects==1.31.2
|
oslo.versionedobjects==1.31.2
|
||||||
oslo.vmware==2.17.0
|
oslo.vmware==2.17.0
|
||||||
oslotest==3.2.0
|
oslotest==3.2.0
|
||||||
|
|
|
@ -13,7 +13,7 @@ httplib2>=0.9.1 # MIT
|
||||||
iso8601>=0.1.11 # MIT
|
iso8601>=0.1.11 # MIT
|
||||||
jsonschema<3.0.0,>=2.6.0 # MIT
|
jsonschema<3.0.0,>=2.6.0 # MIT
|
||||||
ipaddress>=1.0.17;python_version<'3.3' # PSF
|
ipaddress>=1.0.17;python_version<'3.3' # PSF
|
||||||
keystoneauth1>=3.4.0 # Apache-2.0
|
keystoneauth1>=3.7.0 # Apache-2.0
|
||||||
keystonemiddleware>=4.17.0 # Apache-2.0
|
keystonemiddleware>=4.17.0 # Apache-2.0
|
||||||
lxml!=3.7.0,>=3.4.1 # BSD
|
lxml!=3.7.0,>=3.4.1 # BSD
|
||||||
oauth2client!=4.0.0,>=1.5.0 # Apache-2.0
|
oauth2client!=4.0.0,>=1.5.0 # Apache-2.0
|
||||||
|
@ -22,7 +22,7 @@ oslo.concurrency>=3.26.0 # Apache-2.0
|
||||||
oslo.context>=2.19.2 # Apache-2.0
|
oslo.context>=2.19.2 # Apache-2.0
|
||||||
oslo.db>=4.27.0 # Apache-2.0
|
oslo.db>=4.27.0 # Apache-2.0
|
||||||
oslo.log>=3.36.0 # Apache-2.0
|
oslo.log>=3.36.0 # Apache-2.0
|
||||||
oslo.messaging>=5.29.0 # Apache-2.0
|
oslo.messaging>=6.4.0 # Apache-2.0
|
||||||
oslo.middleware>=3.31.0 # Apache-2.0
|
oslo.middleware>=3.31.0 # Apache-2.0
|
||||||
oslo.policy>=1.30.0 # Apache-2.0
|
oslo.policy>=1.30.0 # Apache-2.0
|
||||||
oslo.privsep>=1.23.0 # Apache-2.0
|
oslo.privsep>=1.23.0 # Apache-2.0
|
||||||
|
@ -31,7 +31,7 @@ oslo.rootwrap>=5.8.0 # Apache-2.0
|
||||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||||
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
|
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
|
||||||
oslo.upgradecheck>=0.1.0 # Apache-2.0
|
oslo.upgradecheck>=0.1.0 # Apache-2.0
|
||||||
oslo.utils>=3.33.0 # Apache-2.0
|
oslo.utils>=3.34.0 # Apache-2.0
|
||||||
oslo.versionedobjects>=1.31.2 # Apache-2.0
|
oslo.versionedobjects>=1.31.2 # Apache-2.0
|
||||||
osprofiler>=1.4.0 # Apache-2.0
|
osprofiler>=1.4.0 # Apache-2.0
|
||||||
paramiko>=2.0.0 # LGPLv2.1+
|
paramiko>=2.0.0 # LGPLv2.1+
|
||||||
|
|
5
tox.ini
5
tox.ini
|
@ -12,9 +12,10 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_TEST_TIMEOUT=60
|
OS_TEST_TIMEOUT=60
|
||||||
OS_TEST_PATH=./cinder/tests/unit
|
OS_TEST_PATH=./cinder/tests/unit
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
install_command = pip install {opts} {packages}
|
||||||
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
# By default stestr will set concurrency
|
# By default stestr will set concurrency
|
||||||
# to ncpu, to specify something else use
|
# to ncpu, to specify something else use
|
||||||
|
|
Loading…
Reference in New Issue