Fix multiple CI failures

1) Bump hacking max version to 3.0.1 and fix code style failures.

pep8 job is failing because the version of flake8 (flake8<2.7.0,>=2.6.0)
requested by hacking<1.2.0 is not compatible with pyflakes>=2.1.1.
Therefore the patch increases the max version of hacking.

2) Disable swift-proxy service which fails to start on stein. Disabled
   other unneeded services while here.

Change-Id: I87c6d037fbbc24ef795ddbe26b5e297fb1bbc7a9
This commit is contained in:
Pierre Riteau 2021-01-05 17:18:45 +01:00
parent 85b54e1f6a
commit 10ef8b76dd
4 changed files with 17 additions and 4 deletions

View File

@ -85,5 +85,18 @@
nodeset: openstack-single-node-bionic
override-checkout: stable/stein
vars:
devstack_services:
# Disable unneeded services.
etcd3: false
s-account: false
s-container: false
s-object: false
s-proxy: false
c-api: false
c-bak: false
c-sch: false
c-vol: false
cinder: false
horizon: false
devstack_localrc:
USE_PYTHON3: True

View File

@ -316,5 +316,5 @@ class TestHostReservationScenario(rrs.ResourceReservationScenarioTest):
# check the reservation status
lease = self.reservation_client.get_lease(lease_id)['lease']
self.assertTrue('deleted'in
self.assertTrue('deleted' in
next(iter(lease['reservations']))['status'])

View File

@ -2,11 +2,11 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=1.1.0,<1.2.0 # Apache-2.0
hacking>=1.1.0,<3.0.1 # Apache-2.0
# remove this pyflakes from here once you bump the
# hacking to 3.2.0 or above. hacking 3.2.0 takes
# care of pyflakes version compatibilty.
pyflakes>=2.1.1
pyflakes>=2.1.1 # MIT
# docs
sphinx>=2.0.0,!=2.1.0 # BSD

View File

@ -54,6 +54,6 @@ commands = oslo_debug_helper {posargs}
[flake8]
# E123, E125 skipped as they are invalid PEP-8.
show-source = True
ignore = E123,E125
ignore = E123,E125,W503,W504
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build