From d99da40b6f68218794f64ed038a931eb02d94b8e Mon Sep 17 00:00:00 2001 From: melanie witt Date: Tue, 16 Mar 2021 22:41:33 +0000 Subject: [PATCH] [stable-only] Specify IPv6 CIDR in tempest-slow-py3 This is a copy of a neutron patch [1] which specifies the CIDR used by the public network in the tempest-slow-py3 job. The original bug [2] was fixed in tempest [3] but since devstack pins TEMPEST_BRANCH=26.0.0 for stable/stein, we must do a one-off fix in-tree to fix our job. Related-Bug: #1914037 [1] https://review.opendev.org/c/openstack/neutron/+/777389 [2] https://bugs.launchpad.net/neutron/+bug/1914037 [3] https://review.opendev.org/c/openstack/tempest/+/774764 Change-Id: I8b559084ac424a868a3a3b387fc51bf056dbd3df --- .zuul.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 971c406e18dc..52441068929b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -274,6 +274,14 @@ irrelevant-files: *dsvm-irrelevant-files - tempest-slow-py3: irrelevant-files: *dsvm-irrelevant-files + vars: + devstack_localrc: + # To workaround https://bugs.launchpad.net/neutron/+bug/1914037 + # tempest is pinned to 26.0.0 on stable/stein in devstack, so + # we cannot consume the tempest fix. + IPV6_PUBLIC_RANGE: 2001:db8:0:10::/64 + IPV6_PUBLIC_NETWORK_GATEWAY: 2001:db8:0:10::2 + IPV6_ROUTER_GW_IP: 2001:db8:0:10::1 - grenade-py3: irrelevant-files: *dsvm-irrelevant-files gate: @@ -287,6 +295,14 @@ irrelevant-files: *dsvm-irrelevant-files - tempest-slow-py3: irrelevant-files: *dsvm-irrelevant-files + vars: + devstack_localrc: + # To workaround https://bugs.launchpad.net/neutron/+bug/1914037 + # tempest is pinned to 26.0.0 on stable/stein in devstack, so + # we cannot consume the tempest fix. + IPV6_PUBLIC_RANGE: 2001:db8:0:10::/64 + IPV6_PUBLIC_NETWORK_GATEWAY: 2001:db8:0:10::2 + IPV6_ROUTER_GW_IP: 2001:db8:0:10::1 - grenade-py3: irrelevant-files: *dsvm-irrelevant-files experimental: