Merge "Use an older version of neutron-tempest-plugin for stein jobs"
diff --git a/zuul.d/stein_jobs.yaml b/zuul.d/stein_jobs.yaml
index f84df2a..676e0e1 100644
--- a/zuul.d/stein_jobs.yaml
+++ b/zuul.d/stein_jobs.yaml
@@ -6,7 +6,7 @@
required-projects: &required-projects-stein
- openstack/neutron
- name: openstack/neutron-tempest-plugin
- override-checkout: 1.3.0
+ override-checkout: 1.1.0
- openstack/tempest
vars:
devstack_services:
@@ -96,6 +96,9 @@
- dvr
network_available_features: &available_features
-
+ # NOTE(bcafarel): remove port forwarding test as pinned version
+ # used in this EM branch is unstable
+ tempest_black_regex: "(^neutron_tempest_plugin.scenario.test_port_forwardings.PortForwardingTestJSON.test_port_forwarding_to_2_servers)"
devstack_localrc:
NEUTRON_DEPLOY_MOD_WSGI: false
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
@@ -128,6 +131,9 @@
branch_override: stable/stein
network_api_extensions: *api_extensions
network_available_features: *available_features
+ # NOTE(bcafarel): remove port forwarding test as pinned version
+ # used in this EM branch is unstable
+ tempest_black_regex: "(^neutron_tempest_plugin.scenario.test_port_forwardings.PortForwardingTestJSON.test_port_forwarding_to_2_servers)"
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
ADVANCED_INSTANCE_TYPE: ds512M
@@ -172,7 +178,11 @@
network_available_features: *available_features
# TODO(slaweq): remove trunks subport_connectivity test from blacklist
# when bug https://bugs.launchpad.net/neutron/+bug/1838760 will be fixed
- tempest_black_regex: "(^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity)"
+ # NOTE(bcafarel): remove port forwarding test as pinned version
+ # used in this EM branch is unstable
+ tempest_black_regex: "\
+ (^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity)|\
+ (^neutron_tempest_plugin.scenario.test_port_forwardings.PortForwardingTestJSON.test_port_forwarding_to_2_servers)"
devstack_localrc:
Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan