Revert "Make configure_for_func_testing compatible with e.g. Centos"

This reverts commit 391726bd4c0302ca3ce27f5de8e39ee4c6d91457.

Reason for revert: This patch is breaking CI testing, functional jobs. Variable
"BUILD_OVS_FROM_SOURCE" should be kept.

From a working CI job:
/home/zuul/src/opendev.org/openstack/neutron/tools/configure_for_func_testing.sh:_install_base_deps:106 :   [[ True == \T\r\u\e ]]

From a now broken CI job:
/home/zuul/src/opendev.org/openstack/neutron/tools/configure_for_func_testing.sh:_install_base_deps:106 :   [[ False == \T\r\u\e ]]

"BUILD_OVS_FROM_SOURCE: True" in the "neutron-functional" job definition.

Closes-Bug: #1957936

Change-Id: I564358c64c8ea7ae6039e9f8e6c0e90655fbb8eb
This commit is contained in:
Rodolfo Alonso 2022-01-14 16:38:09 +00:00
parent 391726bd4c
commit b5a7dbc67d

@ -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 [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
if [[ "$BUILD_OVS_FROM_SOURCE" == "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