Synchronise yoga with upstream

zuul.d/base.yaml

@@ -123,34 +123,6 @@
       # stadium projects where they need to use stadium project as working dir.
       zuul_work_dir: src/opendev.org/openstack/neutron
 
-- job:
-    name: neutron-functional-with-uwsgi-fips
-    parent: neutron-functional-with-uwsgi
-    nodeset: devstack-single-node-centos-8-stream
-    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:
-        ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
-        Q_BUILD_OVS_FROM_GIT: true
-
-- job:
-    name: neutron-fullstack-with-uwsgi-fips
-    parent: neutron-fullstack-with-uwsgi
-    nodeset: devstack-single-node-centos-8-stream
-    description: |
-      Functional testing for a FIPS enabled Centos 8 system
-    vars:
-      nslookup_target: 'opendev.org'
-      enable_fips: True
-      devstack_localrc:
-        ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
-        Q_BUILD_OVS_FROM_GIT: true
-
 - job:
     name: neutron-linuxbridge-tempest-plugin-scenario-nftables
     parent: neutron-tempest-plugin-scenario-linuxbridge-yoga

zuul.d/job-templates.yaml

@@ -47,7 +47,6 @@
     name: neutron-experimental-jobs
     experimental:
       jobs:
-        - neutron-functional-with-uwsgi-fips
         - neutron-ovn-grenade-multinode
         - neutron-ovn-tempest-with-uwsgi-loki
         - tempest-integrated-networking:
@@ -92,9 +91,7 @@
     periodic:
       jobs:
         - neutron-functional
-        - neutron-functional-with-uwsgi-fips
         - neutron-fullstack
-        - neutron-fullstack-with-uwsgi-fips
         - neutron-ovs-tempest-slow
         - neutron-ovn-tempest-slow
         - neutron-ovn-tempest-postgres-full