Make configure_for_func_testing compatible with e.g. Centos
In the configure_for_func_testing script openvswitch is installed from source. We need to set proper flag (Q_BUILD_OVS_FROM_GIT) which is used in Devstack to tell Devstack to install it from source and not from packages. This patch also removes flag BUILD_OVS_FROM_SOURCE from the configure_for_func_testing file as it was only used in that file and was actually duplicating the Q_BUILD_OVS_FROM_GIT option used also in Devstack. Change-Id: I09c79d0e9700cc2bfdf71e5314ea660de75ac1d3
This commit is contained in:
parent
a2e44f16b6
commit
391726bd4c
@ -64,9 +64,9 @@ NEUTRON_DIR=${NEUTRON_DIR:=$REPO_BASE/$PROJECT_NAME}
|
||||
INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
|
||||
# The gate should automatically install dependencies.
|
||||
INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
|
||||
BUILD_OVS_FROM_SOURCE=${BUILD_OVS_FROM_SOURCE:-True}
|
||||
INSTALL_OVN=${INSTALL_OVN:-True}
|
||||
OVN_BRANCH=${OVN_BRANCH:-main}
|
||||
Q_BUILD_OVS_FROM_GIT=${Q_BUILD_OVS_FROM_GIT:-True}
|
||||
OVS_BRANCH=${OVS_BRANCH:-master}
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ function _install_base_deps {
|
||||
echo_summary "Installing base dependencies"
|
||||
|
||||
INSTALL_TESTONLY_PACKAGES=True
|
||||
if [[ "$BUILD_OVS_FROM_SOURCE" == "True" ]]; then
|
||||
if [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user