From 16a40e28b6ca7c661bc0ebef941121189a159987 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Fri, 19 Aug 2016 10:41:51 +0100 Subject: [PATCH] fullstack: Use ovs-2.5 for tests The commit bumps commit in 2.5 branch for current HEAD. It contains fix for local VXLAN bug [1] that blocked us in running fullstack tests. [1] http://openvswitch.org/pipermail/discuss/2016-July/022122.html Change-Id: I41bd7b084ffb4d6e7082ba01629f5b64a5a94419 --- neutron/tests/contrib/gate_hook.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index b2601d01494..f993c63ce47 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -44,15 +44,14 @@ case $VENV in configure_host_for_func_testing - if [[ "$VENV" =~ "dsvm-functional" ]]; then - # The OVS_BRANCH variable is used by git checkout. In the case below - # we use a commit on branch-2.5 that fixes compilation with the - # latest ubuntu trusty kernel. - OVS_BRANCH=8c0b419a0b9ac0141d6973dcc80306dfc6a83d31 - remove_ovs_packages - compile_ovs True /usr /var - start_new_ovs - fi + # The OVS_BRANCH variable is used by git checkout. In the case below, + # we use a current (2016-08-19) HEAD commit from branch-2.5 that contains + # a fix for usage of VXLAN tunnels on a single node: + # https://github.com/openvswitch/ovs/commit/741f47cf35df2bfc7811b2cff75c9bb8d05fd26f + OVS_BRANCH=042326c3fcf61e8638fa15926f984ce5ae142f4b + remove_ovs_packages + compile_ovs True /usr /var + start_new_ovs load_conf_hook iptables_verify # Make the workspace owned by the stack user