Merge "list floating ip api contains port forwarding id"
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 2f43957..c167947 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -301,7 +301,6 @@
- ^neutron/services/trunk/drivers/ovn/.*$
- ^neutron/cmd/ovn/.*$
- ^neutron/common/ovn/.*$
- - ^neutron_tempest_plugin/api/test_.*$
- ^neutron_tempest_plugin/(bgpvpn|fwaas|neutron_dynamic_routing|sfc|tap_as_a_service|vpnaas).*$
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
@@ -402,7 +401,6 @@
- ^neutron/services/trunk/drivers/ovn/.*$
- ^neutron/cmd/ovn/.*$
- ^neutron/common/ovn/.*$
- - ^neutron_tempest_plugin/api/test_.*$
- ^neutron_tempest_plugin/(bgpvpn|fwaas|neutron_dynamic_routing|sfc|tap_as_a_service|vpnaas).*$
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
@@ -551,7 +549,6 @@
- ^neutron/services/trunk/drivers/ovn/.*$
- ^neutron/cmd/ovn/.*$
- ^neutron/common/ovn/.*$
- - ^neutron_tempest_plugin/api/test_.*$
- ^neutron_tempest_plugin/(bgpvpn|fwaas|neutron_dynamic_routing|sfc|tap_as_a_service|vpnaas).*$
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
@@ -688,7 +685,6 @@
- ^neutron/services/trunk/drivers/linuxbridge/.*$
- ^neutron/services/trunk/drivers/openvswitch/.*$
- ^neutron/scheduler/.*$
- - ^neutron_tempest_plugin/api/test_.*$
- ^neutron_tempest_plugin/(bgpvpn|fwaas|neutron_dynamic_routing|sfc|tap_as_a_service|vpnaas).*$
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
@@ -1034,6 +1030,7 @@
q-l3: true
q-meta: true
q-metering: true
+ tempest_concurrency: 4
tempest_test_regex: ^neutron_tempest_plugin\.bgpvpn
network_api_extensions_bgpvpn:
- bgpvpn
@@ -1206,6 +1203,7 @@
- openstack/neutron-tempest-plugin
- openstack/tempest
vars:
+ tempest_concurrency: 4
tempest_test_regex: ^neutron_tempest_plugin\.vpnaas
devstack_plugins:
neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas.git
@@ -1271,6 +1269,7 @@
- openstack/tap-as-a-service
- openstack/tempest
vars:
+ tempest_concurrency: 4
tempest_test_regex: ^neutron_tempest_plugin\.tap_as_a_service
tox_envlist: all
network_api_extensions_tempest:
diff --git a/zuul.d/queens_jobs.yaml b/zuul.d/queens_jobs.yaml
index 35fba1b..3a1c37f 100644
--- a/zuul.d/queens_jobs.yaml
+++ b/zuul.d/queens_jobs.yaml
@@ -25,6 +25,7 @@
q-meta: true
q-metering: true
branch_override: stable/queens
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/rocky_jobs.yaml b/zuul.d/rocky_jobs.yaml
index 62e57bf..75d7098 100644
--- a/zuul.d/rocky_jobs.yaml
+++ b/zuul.d/rocky_jobs.yaml
@@ -27,6 +27,7 @@
q-meta: true
q-metering: true
branch_override: stable/rocky
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/stein_jobs.yaml b/zuul.d/stein_jobs.yaml
index d494559..0f18a8a 100644
--- a/zuul.d/stein_jobs.yaml
+++ b/zuul.d/stein_jobs.yaml
@@ -25,6 +25,7 @@
q-meta: true
q-metering: true
branch_override: stable/stein
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml
index 961b3b7..c8c2efe 100644
--- a/zuul.d/train_jobs.yaml
+++ b/zuul.d/train_jobs.yaml
@@ -25,6 +25,7 @@
q-meta: true
q-metering: true
branch_override: stable/train
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml
index 28fccc6..56da160 100644
--- a/zuul.d/ussuri_jobs.yaml
+++ b/zuul.d/ussuri_jobs.yaml
@@ -25,6 +25,7 @@
q-meta: true
q-metering: true
branch_override: stable/ussuri
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index 67737a7..7a92403 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -24,6 +24,7 @@
q-meta: true
q-metering: true
branch_override: stable/victoria
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 746ee9c..a3c07c0 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -3,6 +3,7 @@
parent: neutron-tempest-plugin-base
override-checkout: stable/wallaby
vars:
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 1e6eb80..e0a58a7 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -3,6 +3,7 @@
parent: neutron-tempest-plugin-base
override-checkout: stable/xena
vars:
+ tempest_concurrency: 4
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,
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 87db14e..bc88c83 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -3,6 +3,7 @@
parent: neutron-tempest-plugin-base
override-checkout: stable/yoga
vars:
+ tempest_concurrency: 4
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,