Merge "Cleanup some of the zuul job definitions"
diff --git a/zuul.d/2024_2_jobs.yaml b/zuul.d/2024_2_jobs.yaml
index 2002142..229b2c0 100644
--- a/zuul.d/2024_2_jobs.yaml
+++ b/zuul.d/2024_2_jobs.yaml
@@ -139,10 +139,10 @@
               firewall_driver: iptables_hybrid
 
 - job:
-    name: neutron-tempest-plugin-openvswitch-enforce-scope-new-defaults-2024-1
-    parent: neutron-tempest-plugin-openvswitch-2024-1
+    name: neutron-tempest-plugin-openvswitch-enforce-scope-new-defaults-2024-2
+    parent: neutron-tempest-plugin-openvswitch-2024-2
     nodeset: neutron-nested-virt-ubuntu-jammy
-    override-checkout: stable/2024.1
+    override-checkout: stable/2024.2
     vars:
       devstack_localrc:
         # Enabeling the scope and new defaults for services.
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 6b7a095..75558ad 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -1342,7 +1342,7 @@
 - job:
     name: neutron-tempest-plugin-vpnaas
     parent: neutron-tempest-plugin-base
-    timeout: 4500
+    timeout: 5400
     required-projects:
       - openstack/neutron
       - openstack/neutron-vpnaas
@@ -1414,7 +1414,7 @@
 - job:
     name: neutron-tempest-plugin-vpnaas-ovn
     parent: neutron-tempest-plugin-base
-    timeout: 3900
+    timeout: 5400
     required-projects:
       - openstack/neutron
       - openstack/neutron-vpnaas