diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index e4348039755..25b3d3cf3f9 100755 --- a/tools/configure_for_func_testing.sh +++ b/tools/configure_for_func_testing.sh @@ -97,13 +97,18 @@ function _install_base_deps { echo_summary "Installing base dependencies" INSTALL_TESTONLY_PACKAGES=True - PACKAGES=$(get_packages general,neutron,q-agt,q-l3,openvswitch) + PACKAGES=$(get_packages general,neutron,q-agt,q-l3) # Do not install 'python-' prefixed packages other than # python-dev*. Neutron's functional testing relies on deployment # to a tox env so there is no point in installing python # dependencies system-wide. PACKAGES=$(echo $PACKAGES | perl -pe 's|python-(?!dev)[^ ]*||g') install_package $PACKAGES + + source $NEUTRON_PATH/devstack/lib/ovs + remove_ovs_packages + OVS_BRANCH="v2.12.0" + compile_ovs False /usr /var }