From 1b63b3d7aa5b3b446c62cf9137106ba4d9230e7a Mon Sep 17 00:00:00 2001 From: Ghanshyam Date: Thu, 23 Jan 2020 12:00:04 -0600 Subject: [PATCH] Fix neutron-tempest-plugin tag for queens jobs neutron-tempest-plugin tag 0.3.0 is for stable/queen which is compatible with neutron-lib==1.13.0[1]. We are pinning Tempest and upper constraint used in tempest venv for stable/queens which pickup neutron-lib as 1.13.0 from stable/queens upper constraint. Currently used tag of neutron-tempest-plugin 0.7.0 for queens job is not compatible with stable/queens neutron-lib version. we can see the failure[2] Also skip the dns test for queens job which fixed went in 0.4.0 tag (https://bugs.launchpad.net/neutron/+bug/1826419) and 0.4.0 tag is not compatible with stable/queens constraint. Related-Bug: 1859988 [1]https://github.com/openstack/requirements/blob/f7b45b47bfc5f9b635eb5fa6613482c8c253b091/upper-constraints.txt#L58 [2] - https://6631124a20df425843c7-d8780b91d5409425c6866f467a1249cf.ssl.cf5.rackcdn.com/703680/3/check/neutron-tempest-plugin-api-queens/bba5f0e/job-output.txt 2020-01-23 17:36:50.747528 | controller | File "/opt/stack/neutron-tempest-plugin/neutron_tempest_plugin/bgpvpn/scenario/test_bgpvpn_basic.py", line 20, in 2020-01-23 17:36:50.747537 | controller | from neutron_lib.utils import test 2020-01-23 17:36:50.747545 | controller | ImportError: cannot import name test Change-Id: Icc4a91c333ac746183cb423f5e6c59ee0fbdfe2f --- .zuul.yaml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e544bdba..a9fbc65f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -181,7 +181,7 @@ - openstack/devstack-gate - openstack/neutron - name: openstack/neutron-tempest-plugin - override-checkout: 0.7.0 + override-checkout: 0.3.0 - openstack/tempest vars: branch_override: stable/queens @@ -534,14 +534,18 @@ - openstack/devstack-gate - openstack/neutron - name: openstack/neutron-tempest-plugin - override-checkout: 0.7.0 + override-checkout: 0.3.0 - openstack/tempest vars: branch_override: stable/queens network_api_extensions: *api_extensions_queens # 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 DNS test as queens pinned version does not have + # fix for https://bugs.launchpad.net/neutron/+bug/1826419 + tempest_black_regex: "\ + (^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity)|\ + (^neutron_tempest_plugin.scenario.test_internal_dns.InternalDNSTest.test_dns_domain_and_name)" devstack_localrc: USE_PYTHON3: false NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" @@ -684,11 +688,15 @@ - openstack/devstack-gate - openstack/neutron - name: openstack/neutron-tempest-plugin - override-checkout: 0.7.0 + override-checkout: 0.3.0 - openstack/tempest vars: branch_override: stable/queens network_api_extensions: *api_extensions_queens + # NOTE(bcafarel): remove DNS test as queens pinned version does not have + # fix for https://bugs.launchpad.net/neutron/+bug/1826419 + tempest_black_regex: "\ + (^neutron_tempest_plugin.scenario.test_internal_dns.InternalDNSTest.test_dns_domain_and_name)" devstack_localrc: USE_PYTHON3: false NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" @@ -887,14 +895,18 @@ - openstack/devstack-gate - openstack/neutron - name: openstack/neutron-tempest-plugin - override-checkout: 0.7.0 + override-checkout: 0.3.0 - openstack/tempest vars: branch_override: stable/queens network_api_extensions_common: *api_extensions_queens # 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 DNS test as queens pinned version does not have + # fix for https://bugs.launchpad.net/neutron/+bug/1826419 + tempest_black_regex: "\ + (^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity)|\ + (^neutron_tempest_plugin.scenario.test_internal_dns.InternalDNSTest.test_dns_domain_and_name)" devstack_localrc: USE_PYTHON3: false TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin @@ -980,11 +992,15 @@ - openstack/devstack-gate - openstack/neutron - name: openstack/neutron-tempest-plugin - override-checkout: 0.7.0 + override-checkout: 0.3.0 - openstack/tempest vars: branch_override: stable/queens network_api_extensions_common: *api_extensions_queens + # NOTE(bcafarel): remove DNS test as queens pinned version does not have + # fix for https://bugs.launchpad.net/neutron/+bug/1826419 + tempest_black_regex: "\ + (^neutron_tempest_plugin.scenario.test_internal_dns.InternalDNSTest.test_dns_domain_and_name)" devstack_localrc: USE_PYTHON3: false TEMPEST_PLUGINS: '"/opt/stack/designate-tempest-plugin /opt/stack/neutron-tempest-plugin"'