Merge pull request #106 from stackhpc/upstream/yoga-2024-01-01

Synchronise yoga with upstream

Author: markgoddard

neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py

@@ -1005,7 +1005,9 @@ def _verify_lb(test, protocol, vip_ext_port, vip_int_port):
                 pf_def.INTERNAL_IP_ADDRESS: p1_ip}
             pf_obj = self.pf_plugin.create_floatingip_port_forwarding(
                 self.context, fip_id, **fip_attrs(fip_pf_args))
-            m_publish.assert_called_once()
+            call = mock.call('port_forwarding', 'after_create', self.pf_plugin,
+                             payload=mock.ANY)
+            m_publish.assert_has_calls([call])
 
             # Assert load balancer for port forwarding was not created
             self.assertFalse(self._find_pf_lb(router_id, fip_id))
@@ -1023,7 +1025,9 @@ def _verify_lb(test, protocol, vip_ext_port, vip_int_port):
             m_publish.reset_mock()
             self.pf_plugin.update_floatingip_port_forwarding(
                 self.context, pf_obj['id'], fip_id, **fip_attrs(fip_pf_args))
-            m_publish.assert_called_once()
+            call = mock.call('port_forwarding', 'after_update', self.pf_plugin,
+                             payload=mock.ANY)
+            m_publish.assert_has_calls([call])
 
             # Assert load balancer for port forwarding is stale
             _verify_lb(self, 'tcp', 2222, 22)

roles/configure_functional_tests/tasks/main.yaml

@@ -34,6 +34,9 @@
             # NOTE(slaweq) On Fedora/CentOS systems make sure that SELinux is
             # not in enforcing mode
             sudo setenforce 0
+            if [[ $os_VENDOR == "CentOSStream" && $os_RELEASE -eq 8 ]]; then
+                install_package python3.8 python38-devel
+            fi
         fi
 
         configure_host_for_func_testing

tox.ini

@@ -5,7 +5,7 @@ skipsdist = False
 ignore_basepython_conflict = True
 
 [testenv]
-basepython = python3
+basepython = {env:TOX_PYTHON:python3}
 setenv = VIRTUAL_ENV={envdir}
          OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
          OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}

zuul.d/base.yaml

@@ -130,6 +130,8 @@
     description: |
       Functional testing for a FIPS enabled Centos 8 system
     vars:
+      tox_environment:
+        TOX_PYTHON: python3.8
       nslookup_target: 'opendev.org'
       enable_fips: True
       devstack_localrc:

zuul.d/job-templates.yaml

@@ -47,6 +47,7 @@
     name: neutron-experimental-jobs
     experimental:
       jobs:
+        - neutron-functional-with-uwsgi-fips
         - neutron-ovn-grenade-multinode
         - neutron-ovn-tempest-with-uwsgi-loki
         - tempest-integrated-networking: