From 211e0a65a0cf637ab58a20c91791b7eb6b8c8519 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Mon, 29 Feb 2016 16:20:05 +0100 Subject: [PATCH] functional: Update ref used from ovs branch-2.5. OVS 2.5.0 has been released, but we need a later commit on branch-2.5 that fixes compilation with the latest kernel on ubuntu that backported some changes that broke compilation of 2.5.0. Change-Id: Id70db79a8450d4f0125dd500f7f6ab8d103d98c3 (cherry picked from commit 59b36ecca8f60996a60cd52f816573ace9b39309) --- neutron/tests/contrib/gate_hook.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index 8fa392bd1d8..6301bb5d342 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -24,8 +24,10 @@ then configure_host_for_func_testing if [[ "$VENV" =~ "dsvm-functional" ]]; then - # Build from current branch-2.5 commit (2016-01-15) - OVS_BRANCH=eedd0ef239301f68964313e93dfd7ec41fc7814c + # 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="a35342879f1a7d8b1503d4945bd0791c58f5fc87" for package in openvswitch openvswitch-switch openvswitch-common; do if is_package_installed $package; then uninstall_package $package