Bump hacking

Fixes some new PEP8 errors that appear with jobs running on new ubuntu
version, and temporarily filters out the larger I202 error ("Additional
 newline in a group of imports").

This patch updates the hacking and flake8-import-order versions and also
updates the tempest-release jobs to use a newer version of OVN/OVS.

Change-Id: I8e33e830d59b7021ef96034af85b8ef98c850183

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>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=6.1.0,<6.2.0 # Apache-2.0
 
 bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
-flake8-import-order==0.12 # LGPLv3
+flake8-import-order>=0.18.0,<0.19.0 # LGPLv3
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0

tox.ini

@@ -97,8 +97,9 @@ deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]
+# I202 Additional newline in a group of imports
 # W504 line break after binary operator
-ignore = W504
+ignore = W504,I202
 # H106: Don't put vim configuration in source files
 # H203: Use assertIs(Not)None to check for None
 # H204: Use assert(Not)Equal to check for equality

zuul.d/base.yaml

@@ -39,8 +39,8 @@
       OVN_BUILD_FROM_SOURCE: True
       Q_BUILD_OVS_FROM_GIT: True
       INSTALL_OVN: True
-      OVN_BRANCH: v21.06.0
-      OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+      OVN_BRANCH: branch-24.03
+      OVS_BRANCH: branch-3.3
 
 - job:
     name: ovn-octavia-provider-functional-master
@@ -94,6 +94,9 @@
             api_settings:
               enabled_provider_drivers: 'ovn:OVN provider driver'
               default_provider_driver: 'ovn'
+          /etc/octavia/octavia-uwsgi.ini:
+            uwsgi:
+              processes: 1
         test-config:
           "$TEMPEST_CONFIG":
             load_balancer:
@@ -163,10 +166,9 @@
     vars:
       devstack_localrc:
         OVN_BUILD_FROM_SOURCE: True
-        Q_BUILD_OVS_FROM_GIT: True
         INSTALL_OVN: True
-        OVN_BRANCH: v21.06.0
-        OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+        OVN_BRANCH: branch-24.03
+        OVS_BRANCH: branch-3.3
 
 - job:
     name: ovn-octavia-provider-tempest-master
@@ -174,7 +176,6 @@
     vars:
       devstack_localrc:
         OVN_BUILD_FROM_SOURCE: True
-        Q_BUILD_OVS_FROM_GIT: True
         INSTALL_OVN: True
         OVN_BRANCH: main
         # NOTE(froyo): OVN main branch following OVS stable branch