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/stein_jobs.yaml b/zuul.d/stein_jobs.yaml
index b229296..e9e8137 100644
--- a/zuul.d/stein_jobs.yaml
+++ b/zuul.d/stein_jobs.yaml
@@ -1,6 +1,6 @@
- job:
name: neutron-tempest-plugin-api-stein
- parent: neutron-tempest-plugin-api
+ parent: neutron-tempest-plugin-base
nodeset: openstack-single-node-bionic
override-checkout: stable/stein
required-projects: &required-projects-stein
@@ -25,6 +25,7 @@
q-meta: true
q-metering: true
branch_override: stable/stein
+ 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
@@ -128,12 +129,16 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-stein
- parent: neutron-tempest-plugin-scenario-openvswitch
+ parent: neutron-tempest-plugin-openvswitch
nodeset: openstack-single-node-bionic
override-checkout: stable/stein
required-projects: *required-projects-stein
vars:
branch_override: stable/stein
+ 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
tempest_black_regex: *stein_tempest_exclude
@@ -160,13 +165,17 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-stein
- parent: neutron-tempest-plugin-scenario
+ parent: neutron-tempest-plugin-base
nodeset: openstack-single-node-bionic
timeout: 10000
override-checkout: stable/stein
required-projects: *required-projects-stein
vars:
branch_override: stable/stein
+ tempest_test_regex: "\
+ (^neutron_tempest_plugin.scenario)|\
+ (^tempest.api.compute.servers.test_attach_interfaces)|\
+ (^tempest.api.compute.servers.test_multiple_create)"
devstack_services:
# Disable OVN services
br-ex-tcpdump: false
@@ -247,7 +256,7 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-stein
- parent: neutron-tempest-plugin-scenario
+ parent: neutron-tempest-plugin-base
nodeset: openstack-single-node-bionic
timeout: 10000
roles:
@@ -257,6 +266,10 @@
required-projects: *required-projects-stein
vars:
branch_override: stable/stein
+ tempest_test_regex: "\
+ (^neutron_tempest_plugin.scenario)|\
+ (^tempest.api.compute.servers.test_attach_interfaces)|\
+ (^tempest.api.compute.servers.test_multiple_create)"
devstack_services:
# Disable OVN services
br-ex-tcpdump: false