Fix broken CI and lower-constraints

We need to monkey patch the tests to make sure
we get the same order of operations as we would
when running the service.

This patch also fixes issues with lower-constraints. I based
the fix on the same fix as I did for Designate and Senlin.

Change-Id: Ie325affdb24ba01e762f0832db80e0c46e635f60
This commit is contained in:
Erik Olof Gunnar Andersson 2021-01-16 13:51:31 -08:00
parent 367585e7c8
commit e70179000d
4 changed files with 34 additions and 11 deletions

View File

@ -1,6 +1,6 @@
alabaster==0.7.10
alembic==0.9.8
amqp==2.2.2
amqp==2.5.2
appdirs==1.4.3
asn1crypto==0.24.0
Babel==2.5.3
@ -24,12 +24,14 @@ docutils==0.14
dogpile.cache==0.6.5
dulwich==0.19.0
enum-compat==0.0.2
eventlet==0.22.0
eventlet==0.26.1
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
futurist==1.6.0
greenlet==0.4.13
gitdb2==2.0.3
GitPython==2.1.8
greenlet==0.4.15
httplib2==0.10.3
idna==2.6
imagesize==1.0.0
@ -47,7 +49,7 @@ logutils==0.3.5
lxml==4.1.1
Mako==1.0.7
MarkupSafe==1.1.1
mccabe==0.2.1
mccabe==0.6.0
monotonic==1.4
mox3==0.25.0
msgpack==0.5.6
@ -69,10 +71,10 @@ oslo.log==3.37.0
oslo.messaging==5.36.0
oslo.middleware==3.35.0
oslo.policy==1.34.0
oslo.privsep==1.32.0
oslo.privsep==1.33.2
oslo.rootwrap==5.13.0
oslo.serialization==2.25.0
oslo.service==1.30.0
oslo.service==1.31.0
oslo.upgradecheck==0.1.0
oslo.utils==3.36.0
oslotest==3.3.0
@ -80,7 +82,7 @@ packaging==17.1
Paste==2.0.3
PasteDeploy==1.5.2
pbr==3.1.1
pecan==1.2.1
pecan==1.3.2
pika==0.10.0
pika-pool==0.1.3
prettytable==0.7.2
@ -132,7 +134,7 @@ urllib3==1.22
vine==1.1.4
waitress==1.1.0
warlock==1.3.0
WebOb==1.7.4
WebOb==1.8.0
websocket-client==0.47.0
WebTest==2.0.29
wrapt==1.10.11

View File

@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
eventlet>=0.22.0 # MIT
eventlet>=0.26.1 # MIT
alembic>=0.9.8 # MIT
Babel>=2.5.3 # BSD
docker>=3.1.1 # Apache-2.0
@ -15,14 +15,15 @@ oslo.db>=4.40.0 # Apache-2.0
oslo.messaging>=5.36.0 # Apache-2.0
oslo.middleware>=3.35.0 # Apache-2.0
oslo.serialization>=2.25.0 # Apache-2.0
oslo.service>=1.31.0 # Apache-2.0
oslo.upgradecheck>=0.1.0 # Apache-2.0
oslo.utils>=3.36.0 # Apache-2.0
oslo.log>=3.37.0 # Apache-2.0
oslo.rootwrap>=5.13.0 # Apache-2.0
oslo.policy>=1.34.0 # Apache-2.0
oslo.privsep>=1.32.0 # Apache-2.0
oslo.privsep>=1.33.2 # Apache-2.0
pbr>=3.1.1 # Apache-2.0
pecan>=1.2.1 # BSD
pecan>=1.3.2 # BSD
python-barbicanclient>=4.6.0 # Apache-2.0
python-glanceclient>=2.9.1 # Apache-2.0
python-heatclient>=1.14.0 # Apache-2.0

View File

@ -0,0 +1,14 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import eventlet
eventlet.monkey_patch(os=False)

View File

@ -7,6 +7,8 @@ ignore_basepython_conflict = True
[testenv]
basepython = python3
usedevelop = True
install_command =
pip install {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
deps =
@ -86,6 +88,10 @@ extension =
paths = ./solum/hacking
[testenv:lower-constraints]
skip_install = True
commands =
python -m pip install --no-deps -U .
stestr run {posargs}
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt