Skip to content

Commit

Permalink
[stable-only] fix lower-constraints and disable qos resize
Browse files Browse the repository at this point in the history
This is a combination of 2 commits, as both are needed to unblock
Ussuri gate.

1. [stable-only] lower-contraints: Bump various packages

* amqp==2.5.0 & kombu==4.6.1 via oslo.messaging
  I4b72d8feb85c2b9b4657510c356cd21e22fe40c2

* enum34==1.1.8 to workaround known issues with the package

  The associated repo and issue tracker is currently offline so I can't
  link the actual issue here but it's widely reported elsewhere.

  iterative/dvc#1995

* hacking==3.0.1 introduced via Ie00c10332bd7110169dbb150d601c157b6694d05

* oslo.context==2.22.0 introduced via oslo-policy 3.1.0

* stestr==2.0.0 introduced via oslotest 3.8.0

2. Disable qos resize tempest test for nova-multi-cell job

It turned out that during the qos resize work we did not implemented
support of cross cell resize with qos ports. Tempest test coverage for
the resize and migrate is landed recently that made the nova-multi-cell
job to fail.

So this patch disables the qos resize and migrate tempest tests for the
nova-multi-cell job to unblock the gate.

Related-Bug: #1907522

[1] I8c573c4a11a76932057d8415d76114a03269b9f3
(cherry picked from commit 048250a)

Change-Id: Ib0e09df9d61e42592c2d36ceed7f38c1278c53b2
Closes-Bug: #1907756
  • Loading branch information
lyarwood authored and Elod Illes committed Dec 15, 2020
1 parent 9534b9f commit d5561d3
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 9 deletions.
3 changes: 2 additions & 1 deletion api-guide/source/port_with_resource_request.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ As of 20.0.0 (Train), nova supports cold migrating and resizing servers with
neutron ports having resource requests if both the source and destination
compute services are upgraded to 20.0.0 (Train) and the
``[upgrade_levels]/compute`` configuration does not prevent the computes from
using the latest RPC version.
using the latest RPC version. However cross cell resize and cross cell migrate
operations are still not supported with such ports.

As of 21.0.0 (Ussuri), nova supports evacuating, live migrating and unshelving
servers with neutron ports having resource requests.
Expand Down
6 changes: 6 additions & 0 deletions devstack/nova-multi-cell-blacklist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@
# Exclude tempest.scenario.test_network tests since they are slow and
# only test advanced neutron features, unrelated to multi-cell testing.
^tempest.scenario.test_network

# Also exlude resize and migrate tests with qos ports as qos is currently
# not supported in cross cell resize case . See
# https://bugs.launchpad.net/nova/+bug/1907511 for details
test_migrate_with_qos_min_bw_allocation
test_resize_with_qos_min_bw_allocation
12 changes: 6 additions & 6 deletions lower-constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
alembic==0.9.8
amqp==2.2.2
amqp==2.5.0
appdirs==1.4.3
asn1crypto==0.24.0
attrs==17.4.0
Expand All @@ -21,7 +21,7 @@ debtcollector==1.19.0
decorator==3.4.0
deprecation==2.0
dogpile.cache==0.6.5
enum34==1.0.4
enum34==1.1.8
enum-compat==0.0.2
eventlet==0.20.0
extras==1.0.0
Expand All @@ -34,7 +34,7 @@ gabbi==1.35.0
gitdb2==2.0.3
GitPython==2.1.8
greenlet==0.4.10
hacking==2.0
hacking==3.0.1
idna==2.6
iso8601==0.1.11
Jinja2==2.10
Expand All @@ -46,7 +46,7 @@ jsonpointer==2.0
jsonschema==2.6.0
keystoneauth1==3.16.0
keystonemiddleware==4.20.0
kombu==4.1.0
kombu==4.6.1
linecache2==1.0.0
lxml==3.4.1
Mako==1.0.7
Expand Down Expand Up @@ -75,7 +75,7 @@ osc-lib==1.10.0
oslo.cache==1.26.0
oslo.concurrency==3.29.0
oslo.config==6.1.0
oslo.context==2.21.0
oslo.context==2.22.0
oslo.db==4.44.0
oslo.i18n==3.15.3
oslo.log==3.36.0
Expand Down Expand Up @@ -148,7 +148,7 @@ SQLAlchemy==1.2.19
sqlalchemy-migrate==0.13.0
sqlparse==0.2.4
statsd==3.2.2
stestr==1.0.0
stestr==2.0.0
stevedore==1.20.0
suds-jurko==0.6
taskflow==2.16.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
issues:
- |
When the tempest test coverage was added for resize and cold migrate
with neutron ports having QoS minimum bandwidth policy rules we
discovered that the cross cell resize code path cannot handle such ports.
See bug https://bugs.launchpad.net/nova/+bug/1907522 for details.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ websockify>=0.9.0 # LGPLv3
oslo.cache>=1.26.0 # Apache-2.0
oslo.concurrency>=3.29.0 # Apache-2.0
oslo.config>=6.1.0 # Apache-2.0
oslo.context>=2.21.0 # Apache-2.0
oslo.context>=2.22.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.21.1 # Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ python-barbicanclient>=4.5.2 # Apache-2.0
python-ironicclient!=2.7.1,>=2.7.0 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0
oslotest>=3.8.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
Expand Down

0 comments on commit d5561d3

Please sign in to comment.