From b95434816fcde25cad2ffaac666270631069a4d3 Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Thu, 1 Feb 2018 16:39:04 +0900 Subject: [PATCH] Pull in ubuntu cloud archive openvswitch pkg The environments for functional and fullstack tests are prepared differently than others and aren't using UCA. They should use the ubuntu cloud archive, too. Depends-On: Ie18833bfa30f1789e63cbe9c86f5ece3453f43fb Change-Id: I75374fce0e01bac874107abea0b7389382588905 --- tools/configure_for_func_testing.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index 901cd63d2ff..bc90630a7b7 100755 --- a/tools/configure_for_func_testing.sh +++ b/tools/configure_for_func_testing.sh @@ -79,14 +79,17 @@ function _init { # Allow the gate to override values set by stackrc. DEST=${GATE_DEST:-$DEST} STACK_USER=${GATE_STACK_USER:-$STACK_USER} -} + GetDistro + source $DEVSTACK_PATH/tools/fixup_stuff.sh + fixup_uca +} function _install_base_deps { echo_summary "Installing base dependencies" INSTALL_TESTONLY_PACKAGES=True - PACKAGES=$(get_packages general,neutron,q-agt,q-l3) + PACKAGES=$(get_packages general,neutron,q-agt,q-l3,openvswitch) # 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