openstack/neutron
Code Issues Proposed changes

Merge "[OVN] Switch release jobs to OVN 20.03 (v20.03.0 tag)"

Browse Source
This commit is contained in:
Zuul 2020-03-17 20:30:17 +00:00 committed by Gerrit Code Review
commit 48c22256d6
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

@ -145,7 +145,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

@ -282,8 +282,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
@ -291,8 +291,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