From 10ef8b76dddbd6c4f0ba917a67ee61188f998571 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 5 Jan 2021 17:18:45 +0100
Subject: [PATCH] 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
---
 .zuul.yaml                                          | 13 +++++++++++++
 .../tests/scenario/test_host_reservation.py         |  2 +-
 test-requirements.txt                               |  4 ++--
 tox.ini                                             |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 1b51433..59720ed 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -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
diff --git a/blazar_tempest_plugin/tests/scenario/test_host_reservation.py b/blazar_tempest_plugin/tests/scenario/test_host_reservation.py
index 9daeed4..5d055fc 100644
--- a/blazar_tempest_plugin/tests/scenario/test_host_reservation.py
+++ b/blazar_tempest_plugin/tests/scenario/test_host_reservation.py
@@ -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'])
diff --git a/test-requirements.txt b/test-requirements.txt
index c46ca66..5f1d4fd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -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
diff --git a/tox.ini b/tox.ini
index 3408e40..8a9c3de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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