Merge "Fix a neutron-tempest-plugin 2024.2 job definition"
diff --git a/zuul.d/2025_1_jobs.yaml b/zuul.d/2025_1_jobs.yaml
new file mode 100644
index 0000000..9cab902
--- /dev/null
+++ b/zuul.d/2025_1_jobs.yaml
@@ -0,0 +1,242 @@
+- job:
+    name: neutron-tempest-plugin-openvswitch-2025-1
+    parent: neutron-tempest-plugin-openvswitch
+    nodeset: neutron-nested-virt-ubuntu-noble
+    override-checkout: stable/2025.1
+    vars:
+      network_api_extensions_openvswitch: &api_extensions_openvswitch
+        - dhcp_agent_scheduler
+        - local_ip
+        - qos-bw-minimum-ingress
+      tempest_test_regex: "\
+          (^neutron_tempest_plugin.api)|\
+          (^neutron_tempest_plugin.scenario)|\
+          (^tempest.api.compute.servers.test_attach_interfaces)|\
+          (^tempest.api.compute.servers.test_multiple_create)"
+      network_available_features: &available_features
+        - ipv6_metadata
+      network_api_extensions_common: &api_extensions
+        - address-group
+        - address-scope
+        - agent
+        - allowed-address-pairs
+        - auto-allocated-topology
+        - availability_zone
+        - binding
+        - default-subnetpools
+        - dns-domain-ports
+        - dns-integration
+        - dns-integration-domain-keywords
+        - empty-string-filtering
+        - expose-port-forwarding-in-fip
+        - expose-l3-conntrack-helper
+        - ext-gw-mode
+        - external-net
+        - extra_dhcp_opt
+        - extraroute
+        - extraroute-atomic
+        - filter-validation
+        - fip-port-details
+        - flavors
+        - floating-ip-port-forwarding
+        - floating-ip-port-forwarding-detail
+        - floatingip-pools
+        - ip-substring-filtering
+        - l3-conntrack-helper
+        - l3-ext-ndp-proxy
+        - l3-flavors
+        - l3-ha
+        - l3-ndp-proxy
+        - l3_agent_scheduler
+        - metering
+        - multi-provider
+        - net-mtu
+        - net-mtu-writable
+        - network-ip-availability
+        - network_availability_zone
+        - network-segment-range
+        - pagination
+        - port-device-profile
+        - port-mac-address-regenerate
+        - port-trusted-vif
+        - port-resource-request
+        - port-resource-request-groups
+        - port-security
+        - port-security-groups-filtering
+        - project-id
+        - provider
+        - qos
+        - qos-fip
+        - quotas
+        - quota_details
+        - rbac-address-group
+        - rbac-address-scope
+        - rbac-policies
+        - rbac-security-groups
+        - rbac-subnetpool
+        - router
+        - router_availability_zone
+        - security-group
+        - security-groups-default-rules
+        - security-groups-normalized-cidr
+        - security-groups-remote-address-group
+        - segment
+        - service-type
+        - sorting
+        - standard-attr-description
+        - standard-attr-revisions
+        - standard-attr-segment
+        - standard-attr-tag
+        - standard-attr-timestamp
+        - stateful-security-group
+        - subnet_allocation
+        - subnet-dns-publish-fixed-ip
+        - subnet-service-types
+        - subnetpool-prefix-ops
+        - tag-ports-during-bulk-creation
+        - trunk
+        - trunk-details
+        - uplink-status-propagation
+      devstack_localrc:
+        NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            network-feature-enabled:
+              available_features: "{{ network_available_features | join(',') }}"
+
+- job:
+    name: neutron-tempest-plugin-openvswitch-ubuntu-jammy-2025-1
+    parent: neutron-tempest-plugin-openvswitch-2025-1
+    nodeset: neutron-nested-virt-ubuntu-jammy
+
+- job:
+    name: neutron-tempest-plugin-openvswitch-iptables_hybrid-2025-1
+    parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
+    nodeset: neutron-nested-virt-ubuntu-noble
+    override-checkout: stable/2025.1
+    vars:
+      network_api_extensions_common: *api_extensions
+      network_api_extensions_openvswitch: *api_extensions_openvswitch
+      network_available_features: *available_features
+      tempest_test_regex: "\
+          (^neutron_tempest_plugin.api)|\
+          (^neutron_tempest_plugin.scenario)|\
+          (^tempest.api.compute.servers.test_attach_interfaces)|\
+          (^tempest.api.compute.servers.test_multiple_create)"
+      # TODO(slaweq): remove trunks subport_connectivity test from blacklist
+      # when bug https://bugs.launchpad.net/neutron/+bug/1838760 will be fixed
+      # TODO(akatz): remove established tcp session verification test when the
+      # bug https://bugzilla.redhat.com/show_bug.cgi?id=1965036 will be fixed
+      tempest_exclude_regex: "\
+          (^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity)|\
+          (^neutron_tempest_plugin.scenario.test_security_groups.StatefulNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)|\
+          (^neutron_tempest_plugin.scenario.test_security_groups.StatelessNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)"
+      devstack_localrc:
+        NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            network-feature-enabled:
+              available_features: "{{ network_available_features | join(',') }}"
+            neutron_plugin_options:
+              available_type_drivers: flat,vlan,local,vxlan
+              firewall_driver: iptables_hybrid
+
+- job:
+    name: neutron-tempest-plugin-ovn-enforce-scope-old-defaults-2025-1
+    parent: neutron-tempest-plugin-ovn-2025-1
+    nodeset: neutron-nested-virt-ubuntu-noble
+    override-checkout: stable/2025.1
+    vars:
+      devstack_localrc:
+        NEUTRON_ENFORCE_SCOPE: false
+
+- job:
+    name: neutron-tempest-plugin-ovn-2025-1
+    parent: neutron-tempest-plugin-ovn
+    nodeset: neutron-nested-virt-ubuntu-noble
+    override-checkout: stable/2025.1
+    vars:
+      network_api_extensions_ovn:
+        - vlan-transparent
+        - qinq
+        - external-gateway-multihoming
+      tempest_test_regex: "\
+          (^neutron_tempest_plugin.api)|\
+          (^neutron_tempest_plugin.scenario)|\
+          (^tempest.api.compute.servers.test_attach_interfaces)|\
+          (^tempest.api.compute.servers.test_multiple_create)"
+      devstack_localrc:
+        NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            network-feature-enabled:
+              available_features: ""
+            neutron_plugin_options:
+              available_type_drivers: local,flat,vlan,geneve
+              is_igmp_snooping_enabled: True
+              firewall_driver: ovn
+
+- job:
+    name: neutron-tempest-plugin-ovn-ubuntu-jammy-2025-1
+    parent: neutron-tempest-plugin-ovn-2025-1
+    nodeset: neutron-nested-virt-ubuntu-jammy
+
+- job:
+    name: neutron-tempest-plugin-dvr-multinode-scenario-2025-1
+    parent: neutron-tempest-plugin-dvr-multinode-scenario
+    nodeset: openstack-two-node-noble
+    override-checkout: stable/2025.1
+    vars:
+      network_api_extensions_common: *api_extensions
+      network_api_extensions_dvr:
+        - dhcp_agent_scheduler
+        - dvr
+      devstack_localrc:
+        NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}"
+
+- job:
+    name: neutron-tempest-plugin-designate-scenario-2025-1
+    parent: neutron-tempest-plugin-designate-scenario
+    nodeset: neutron-nested-virt-ubuntu-noble
+    override-checkout: stable/2025.1
+    vars:
+      network_api_extensions_common: *api_extensions
+
+- job:
+    name: neutron-tempest-plugin-sfc-2025-1
+    parent: neutron-tempest-plugin-sfc
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.1
+
+- job:
+    name: neutron-tempest-plugin-bgpvpn-bagpipe-2025-1
+    parent: neutron-tempest-plugin-bgpvpn-bagpipe
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.1
+
+- job:
+    name: neutron-tempest-plugin-dynamic-routing-2025-1
+    parent: neutron-tempest-plugin-dynamic-routing
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.1
+
+- job:
+    name: neutron-tempest-plugin-fwaas-2025-1
+    parent: neutron-tempest-plugin-fwaas
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.1
+
+- job:
+    name: neutron-tempest-plugin-vpnaas-2025-1
+    parent: neutron-tempest-plugin-vpnaas
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.1
+
+- job:
+    name: neutron-tempest-plugin-tap-as-a-service-2025-1
+    parent: neutron-tempest-plugin-tap-as-a-service
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.1
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index e28d5fa..d13370e 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -219,6 +219,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -327,6 +328,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -444,6 +446,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -612,6 +615,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -759,6 +763,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1023,6 +1028,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1118,6 +1124,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1206,6 +1213,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1286,6 +1294,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1352,6 +1361,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1429,6 +1439,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1440,7 +1451,7 @@
 - job:
     name: neutron-tempest-plugin-vpnaas
     parent: neutron-tempest-plugin-base
-    timeout: 4500
+    timeout: 5400
     required-projects:
       - openstack/neutron
       - openstack/neutron-vpnaas
@@ -1510,6 +1521,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1521,7 +1533,7 @@
 - job:
     name: neutron-tempest-plugin-vpnaas-ovn
     parent: neutron-tempest-plugin-base
-    timeout: 3900
+    timeout: 5400
     required-projects:
       - openstack/neutron
       - openstack/neutron-vpnaas
@@ -1583,6 +1595,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1704,6 +1717,7 @@
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
       - ^zuul.d/2024_2_jobs.yaml
+      - ^zuul.d/2025_1_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index be5f1a5..07af912 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -194,6 +194,25 @@
         - neutron-tempest-plugin-linuxbridge-2024-2
         - neutron-tempest-plugin-dvr-multinode-scenario-2024-2
 
+- project-template:
+    name: neutron-tempest-plugin-jobs-2025-1
+    check:
+      jobs:
+        - neutron-tempest-plugin-openvswitch-2025-1
+        - neutron-tempest-plugin-openvswitch-iptables_hybrid-2025-1
+        - neutron-tempest-plugin-ovn-2025-1
+        - neutron-tempest-plugin-designate-scenario-2025-1
+        - neutron-tempest-plugin-openvswitch-ubuntu-jammy-2025-1
+        - neutron-tempest-plugin-ovn-ubuntu-jammy-2025-1
+    gate:
+      jobs:
+        - neutron-tempest-plugin-ovn-2025-1
+    #TODO(slaweq): Move neutron-tempest-plugin-dvr-multinode-scenario out of
+    #              the experimental queue when it will be more stable
+    experimental:
+      jobs:
+        - neutron-tempest-plugin-dvr-multinode-scenario-2025-1
+
 - project:
     templates:
       - build-openstack-docs-pti
@@ -201,6 +220,7 @@
       - neutron-tempest-plugin-jobs-2023-2
       - neutron-tempest-plugin-jobs-2024-1
       - neutron-tempest-plugin-jobs-2024-2
+      - neutron-tempest-plugin-jobs-2025-1
       - check-requirements
       - tempest-plugin-jobs
       - release-notes-jobs-python3
@@ -210,10 +230,12 @@
         - neutron-tempest-plugin-sfc-2023-2
         - neutron-tempest-plugin-sfc-2024-1
         - neutron-tempest-plugin-sfc-2024-2
+        - neutron-tempest-plugin-sfc-2025-1
         - neutron-tempest-plugin-bgpvpn-bagpipe
         - neutron-tempest-plugin-bgpvpn-bagpipe-2023-2
         - neutron-tempest-plugin-bgpvpn-bagpipe-2024-1
         - neutron-tempest-plugin-bgpvpn-bagpipe-2024-2
+        - neutron-tempest-plugin-bgpvpn-bagpipe-2025-1
         - neutron-tempest-plugin-dynamic-routing:
             # TODO(ralonsoh): this job is temporarily disabled; it will be
             # restored once [1] is merged. This patch has been successfully
@@ -225,19 +247,23 @@
         - neutron-tempest-plugin-dynamic-routing-2023-2
         - neutron-tempest-plugin-dynamic-routing-2024-1
         - neutron-tempest-plugin-dynamic-routing-2024-2
+        - neutron-tempest-plugin-dynamic-routing-2025-1
         - neutron-tempest-plugin-fwaas
         - neutron-tempest-plugin-fwaas-2023-2
         - neutron-tempest-plugin-fwaas-2024-1
         - neutron-tempest-plugin-fwaas-2024-2
+        - neutron-tempest-plugin-fwaas-2025-1
         - neutron-tempest-plugin-vpnaas
         - neutron-tempest-plugin-vpnaas-ovn
         - neutron-tempest-plugin-vpnaas-2023-2
         - neutron-tempest-plugin-vpnaas-2024-1
         - neutron-tempest-plugin-vpnaas-2024-2
+        - neutron-tempest-plugin-vpnaas-2025-1
         - neutron-tempest-plugin-tap-as-a-service
         - neutron-tempest-plugin-tap-as-a-service-2023-2
         - neutron-tempest-plugin-tap-as-a-service-2024-1
         - neutron-tempest-plugin-tap-as-a-service-2024-2
+        - neutron-tempest-plugin-tap-as-a-service-2025-1
 
     gate:
       jobs: