openstack
/
neutron
Code Issues Proposed changes

[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-<version> against v<version> version
formats.

Change-Id: I06f06fbc42c625ad2deab03a92238ae5e68d9033
Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
This commit is contained in:
Lucas Alvares Gomes 2020-03-03 09:43:12 +00:00
parent 59dd469bd3
commit e0cb072b84
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/ovn_agent
View File

@ -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

8
zuul.d/tempest-singlenode.yaml
View File

@ -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