Consolidate neutron-tempest-plugin-api with scenario jobs
That way we will run our API tests on the ML2/{OVS,OVN,Linuxbridge}
deployments which will give us slightly better coverage in some cases as
some API extensions may be available only with some specific backends
(see NDPProxy for example, which isn't available on the ML2/OVN case).
This will also allow us to drop neutron-tempest-plugin-api job and
having less jobs with same or better coverage is always good thing :)
Change-Id: Ie34e89636c56783000b4d72a479c23d8d1295002
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index d648aa8..10d58e1 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -1,6 +1,6 @@
- job:
name: neutron-tempest-plugin-api-victoria
- parent: neutron-tempest-plugin-api
+ parent: neutron-tempest-plugin-base
override-checkout: stable/victoria
vars:
devstack_services:
@@ -19,6 +19,7 @@
q-meta: true
q-metering: true
branch_override: stable/victoria
+ tempest_test_regex: ^neutron_tempest_plugin\.api
# TODO(slaweq): find a way to put this list of extensions in
# neutron repository and keep it different per branch,
# then it could be removed from here
@@ -123,10 +124,14 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-victoria
- parent: neutron-tempest-plugin-scenario-openvswitch
+ parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/victoria
vars:
branch_override: stable/victoria
+ tempest_test_regex: "\
+ (^neutron_tempest_plugin.scenario)|\
+ (^tempest.api.compute.servers.test_attach_interfaces)|\
+ (^tempest.api.compute.servers.test_multiple_create)"
network_api_extensions: *api_extensions
network_available_features: *available_features
devstack_localrc:
@@ -141,10 +146,14 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-victoria
- parent: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid
+ parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/victoria
vars:
branch_override: stable/victoria
+ tempest_test_regex: "\
+ (^neutron_tempest_plugin.scenario)|\
+ (^tempest.api.compute.servers.test_attach_interfaces)|\
+ (^tempest.api.compute.servers.test_multiple_create)"
network_api_extensions: *api_extensions
network_available_features: *available_features
devstack_localrc:
@@ -159,10 +168,14 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-victoria
- parent: neutron-tempest-plugin-scenario-linuxbridge
+ parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/victoria
vars:
branch_override: stable/victoria
+ tempest_test_regex: "\
+ (^neutron_tempest_plugin.scenario)|\
+ (^tempest.api.compute.servers.test_attach_interfaces)|\
+ (^tempest.api.compute.servers.test_multiple_create)"
network_api_extensions: *api_extensions
network_available_features: *available_features
devstack_localrc:
@@ -177,10 +190,14 @@
- job:
name: neutron-tempest-plugin-scenario-ovn-victoria
- parent: neutron-tempest-plugin-scenario-ovn
+ parent: neutron-tempest-plugin-ovn
override-checkout: stable/victoria
vars:
branch_override: stable/victoria
+ tempest_test_regex: "\
+ (^neutron_tempest_plugin.scenario)|\
+ (^tempest.api.compute.servers.test_attach_interfaces)|\
+ (^tempest.api.compute.servers.test_multiple_create)"
network_api_extensions: *api_extensions
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"