Add neutron-tempest-plugin-fwaas-ovn job
The existing job is now renamed from "neutron-tempest-plugin-fwaas" to
"neutron-tempest-plugin-fwaas-openvswitch" and there is also new job,
based on the ML2/OVN backend added as well.
Change-Id: I7026750882e59ce2b3b9e26d840c62f208be5945
diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml
index 8b6a581..cedbc67 100644
--- a/zuul.d/2023_1_jobs.yaml
+++ b/zuul.d/2023_1_jobs.yaml
@@ -291,7 +291,7 @@
- job:
name: neutron-tempest-plugin-fwaas-2023-1
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-openvswitch
nodeset: openstack-single-node-jammy
override-checkout: stable/2023.1
vars:
diff --git a/zuul.d/2023_2_jobs.yaml b/zuul.d/2023_2_jobs.yaml
index 2a6a9a5..2261b7c 100644
--- a/zuul.d/2023_2_jobs.yaml
+++ b/zuul.d/2023_2_jobs.yaml
@@ -280,7 +280,7 @@
- job:
name: neutron-tempest-plugin-fwaas-2023-2
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-openvswitch
nodeset: openstack-single-node-jammy
override-checkout: stable/2023.2
vars:
diff --git a/zuul.d/2024_1_jobs.yaml b/zuul.d/2024_1_jobs.yaml
index 0fb6e88..674d1ab 100644
--- a/zuul.d/2024_1_jobs.yaml
+++ b/zuul.d/2024_1_jobs.yaml
@@ -279,7 +279,7 @@
- job:
name: neutron-tempest-plugin-fwaas-2024-1
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-openvswitch
nodeset: openstack-single-node-jammy
override-checkout: stable/2024.1
vars:
diff --git a/zuul.d/2024_2_jobs.yaml b/zuul.d/2024_2_jobs.yaml
index 229b2c0..f42bdbf 100644
--- a/zuul.d/2024_2_jobs.yaml
+++ b/zuul.d/2024_2_jobs.yaml
@@ -271,7 +271,7 @@
- job:
name: neutron-tempest-plugin-fwaas-2024-2
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-openvswitch
nodeset: openstack-single-node-jammy
override-checkout: stable/2024.2
diff --git a/zuul.d/2025_1_jobs.yaml b/zuul.d/2025_1_jobs.yaml
index 9cab902..b34db9f 100644
--- a/zuul.d/2025_1_jobs.yaml
+++ b/zuul.d/2025_1_jobs.yaml
@@ -225,7 +225,7 @@
- job:
name: neutron-tempest-plugin-fwaas-2025-1
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-openvswitch
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 27ab428..3d4f0e9 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -1271,8 +1271,8 @@
- ^zuul.d/base-nested-switch.yaml
- job:
- name: neutron-tempest-plugin-fwaas
- parent: neutron-tempest-plugin-base
+ name: neutron-tempest-plugin-fwaas-ovn
+ parent: neutron-tempest-plugin-ovn
timeout: 10800
required-projects:
- openstack/neutron-fwaas
@@ -1284,29 +1284,16 @@
tempest_test_regex: ^neutron_tempest_plugin\.fwaas
devstack_plugins:
neutron-fwaas: https://opendev.org/openstack/neutron-fwaas.git
- neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git
network_api_extensions_fwaas:
- fwaas_v2
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_fwaas) | join(',') }}"
- Q_AGENT: openvswitch
- Q_ML2_TENANT_NETWORK_TYPE: vxlan
- Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
- devstack_services:
- # Disable OVN services
- br-ex-tcpdump: false
- br-int-flows: false
- ovn-controller: false
- ovn-northd: false
- q-ovn-metadata-agent: false
- # Neutron services
- q-agt: true
- q-dhcp: true
- q-meta: true
- q-metering: true
- q-l3: true
- neutron-log: false
- irrelevant-files:
+ devstack_local_conf:
+ test-config:
+ $TEMPEST_CONFIG:
+ fwaas:
+ driver: ovn
+ irrelevant-files: &fwaas_irrelevant_files
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1340,6 +1327,44 @@
- ^zuul.d/base-nested-switch.yaml
- job:
+ name: neutron-tempest-plugin-fwaas-openvswitch
+ parent: neutron-tempest-plugin-openvswitch
+ required-projects:
+ - openstack/neutron-fwaas
+ - openstack/neutron
+ - openstack/neutron-tempest-plugin
+ - openstack/tempest
+ vars:
+ tempest_concurrency: 4
+ tempest_test_regex: ^neutron_tempest_plugin\.fwaas
+ devstack_plugins:
+ neutron-fwaas: https://opendev.org/openstack/neutron-fwaas.git
+ network_api_extensions_fwaas:
+ - fwaas_v2
+ devstack_localrc:
+ NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_fwaas) | join(',') }}"
+ devstack_services:
+ # Neutron services
+ q-agt: true
+ q-dhcp: true
+ q-meta: true
+ q-metering: true
+ q-l3: true
+ neutron-log: false
+ devstack_local_conf:
+ test-config:
+ $TEMPEST_CONFIG:
+ fwaas:
+ driver: openvswitch
+ irrelevant-files: *fwaas_irrelevant_files
+
+# TODO(slaweq):
+# Remove this alias once jobs in fwaas project will be moved to the new names
+- job:
+ name: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-openvswitch
+
+- job:
name: neutron-tempest-plugin-vpnaas
parent: neutron-tempest-plugin-base
timeout: 5400
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index c554886..34bcfc9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -246,7 +246,8 @@
- 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-ovn
+ - neutron-tempest-plugin-fwaas-openvswitch
- neutron-tempest-plugin-fwaas-2023-2
- neutron-tempest-plugin-fwaas-2024-1
- neutron-tempest-plugin-fwaas-2024-2
@@ -267,5 +268,5 @@
jobs:
- neutron-tempest-plugin-sfc
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-fwaas
+ - neutron-tempest-plugin-fwaas-ovn
- neutron-tempest-plugin-vpnaas-ovn
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index f99ff42..f936b8c 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -288,7 +288,7 @@
- job:
name: neutron-tempest-plugin-fwaas-zed
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-openvswitch
nodeset: openstack-single-node-focal
override-checkout: unmaintained/zed
required-projects: *required-projects-zed