openstack
/
neutron
Code Issues Proposed changes

Merge "Change ovs version we use in fullstack tests" into stable/queens

This commit is contained in:
Zuul 2019-04-24 02:08:36 +00:00 committed by Gerrit Code Review
parent cd716ffca4 5dbb26b423
commit 4e1f7f5b36
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/tests/contrib/gate_hook.sh
View File

@ -74,13 +74,13 @@ case $VENV in
# we need a fix for VXLAN local tunneling.
if [[ "$VENV" =~ "dsvm-fullstack" ]]; then
# The OVS_BRANCH variable is used by git checkout. In the case below,
# we use openvswitch commit 138df3e563de9da0e5a4155b3534a69621495742
# we use openvswitch commit 175be4bf23a206b264719b5661707af186b31f32
# that contains a fix for usage of VXLAN tunnels on a single node
# (commit 741f47cf35df2bfc7811b2cff75c9bb8d05fd26f) and is compatible
# with kernel 4.4.119
# with kernel 4.4.0-145
# NOTE(slaweq): Replace with a release tag when one is available.
# See commit 138df3e563de9da0e5a4155b3534a69621495742 (on the ovs repo).
OVS_BRANCH="138df3e563de9da0e5a4155b3534a69621495742"
OVS_BRANCH="175be4bf23a206b264719b5661707af186b31f32"
compile_ovs_kernel_module
elif [[ "$VENV" =~ "dsvm-functional" ]]; then
# NOTE(slaweq): there is some bug in keepalived