openstack
/
neutron
Code Issues Proposed changes

Change ovs release used to compile kernel module for tests node 

In some test jobs, like fullstack and ovsfw-scenario job
openvswitch kernel module is compiled from source before tests.
This compilation was failing because of new kernel 4.4.0-127 provided
by Ubuntu.

Kernel module will be compiled from source which contains
fix for this change in kernel.
See related openvswitch commit message for details:
138df3e563

As current Ubuntu uses ovs 2.9.0 we don't need to compile ovs for
ovsfw-scenario-job anymore because fix we needed is already contained
in ovs 2.9.0.

Change-Id: Idc34776e5b2fad105e246f7718220c23f0a94164
Closes-bug: #1772689
This commit is contained in:
Slawek Kaplonski 2018-05-23 01:27:41 +02:00 committed by Jakub Libosvar
parent 5516783520
commit edc909a267
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,10 +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 v2.6.1 openvswitch tag that contains a fix for usage of VXLAN
# tunnels on a single node and is compatible with Ubuntu Xenial kernel:
# https://github.com/openvswitch/ovs/commit/741f47cf35df2bfc7811b2cff75c9bb8d05fd26f
OVS_BRANCH="v2.6.1"
# we use openvswitch commit 138df3e563de9da0e5a4155b3534a69621495742
# that contains a fix for usage of VXLAN tunnels on a single node
# (commit 741f47cf35df2bfc7811b2cff75c9bb8d05fd26f) and is compatible
# with kernel 4.4.119
# NOTE(slaweq): Replace with a release tag when one is available.
# See commit 138df3e563de9da0e5a4155b3534a69621495742 (on the ovs repo).
OVS_BRANCH="138df3e563de9da0e5a4155b3534a69621495742"
compile_ovs_kernel_module
fi
@ -89,19 +92,6 @@ case $VENV in
;;
"api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
if [[ "$VENV" =~ "full-ovsfw" ]]; then
source $DEVSTACK_PATH/functions
source $NEUTRON_PATH/devstack/lib/ovs
# In the above case, this is done in configure_for_func_testing.sh
DEST=${GATE_DEST:-$DEST}
# The OVS_BRANCH variable is used by git checkout. In the case below,
# we use v2.8 branch that contains a fix for ovs-vswtichd crash.
# NOTE(toshii): Replace with a release tag when one is available.
# See commit 3a23430b573e8ab (on the ovs repo).
OVS_BRANCH="064f8465022856654648b4b8fa11898024316e11"
compile_ovs True /usr /var
fi
# TODO(ihrachys) consider feeding result of ext-list into tempest.conf
load_rc_hook api_all_extensions
if [ "${FLAVOR}" = "dvrskip" ]; then