From e0cb072b8407d848370a38c799bd3a203a9bdf5a Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Tue, 3 Mar 2020 09:43:12 +0000 Subject: [PATCH] [OVN] Switch release jobs to OVN 20.03 (v20.03.0 tag) OVN 20.03 (v20.03.0 tag) is the new stable released version of OVN which is compatible with the OVS 2.13 version, also bumped in this review. The patch also updates the use_new_ovn_repository to strip all non-numeric characters of the branch name when comparing the versions, that way we can compare branch- against v version formats. Change-Id: I06f06fbc42c625ad2deab03a92238ae5e68d9033 Signed-off-by: Lucas Alvares Gomes --- devstack/lib/ovn_agent | 3 ++- zuul.d/tempest-singlenode.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent index b36317f0e96..01ab7cade91 100644 --- a/devstack/lib/ovn_agent +++ b/devstack/lib/ovn_agent @@ -143,7 +143,8 @@ function is_kernel_module_loaded { function use_new_ovn_repository { # IF OVN_BRANCH is "master" or branch-2.13 (or higher), use the new # OVN repository - return $(! printf "%s\n%s" $OVN_BRANCH branch-2.12 | sort -C -V) + [ "$OVN_BRANCH" == "master" ] && return 0 + return $(! printf "%s\n%s" ${OVN_BRANCH//[!0-9.]/} 2.12 | sort -C -V) } # NOTE(rtheis): Function copied from DevStack _neutron_ovs_base_setup_bridge diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 7a0dcd56420..9e09186cac9 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -285,8 +285,8 @@ parent: neutron-ovn-tempest-ovs-ipv6-only-base vars: devstack_localrc: - OVN_BRANCH: branch-2.12 - OVS_BRANCH: branch-2.12 + OVN_BRANCH: v20.03.0 + OVS_BRANCH: v2.13.0 - job: name: neutron-ovn-tempest-ovs-release @@ -294,8 +294,8 @@ parent: neutron-ovn-base vars: devstack_localrc: - OVN_BRANCH: branch-2.12 - OVS_BRANCH: branch-2.12 + OVN_BRANCH: v20.03.0 + OVS_BRANCH: v2.13.0 - job: name: neutron-ovn-tempest-ovs-master-fedora