Make configure_for_func_testing compatible with e.g. Centos
This is basically revert of the [1] which was revert of the [2] but now it should not break our CI jobs. 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. [1] https://review.opendev.org/c/openstack/neutron/+/824750 [2] https://review.opendev.org/c/openstack/neutron/+/824750 Change-Id: I35715a047d23ed87312afd294cc898de7c164583
This commit is contained in:
parent
0a89986932
commit
ddf0568f39
@ -15,7 +15,7 @@
|
||||
STACK_USER=stack
|
||||
OVS_BRANCH={{ OVS_BRANCH }}
|
||||
OVN_BRANCH={{ OVN_BRANCH }}
|
||||
BUILD_OVS_FROM_SOURCE={{ BUILD_OVS_FROM_SOURCE }}
|
||||
Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }}
|
||||
INSTALL_OVN={{ INSTALL_OVN }}
|
||||
# This is DB USER used in e.g. pgsql db
|
||||
DATABASE_USER=openstack_citest
|
||||
|
@ -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
|
||||
|
@ -27,7 +27,7 @@
|
||||
- ^roles/.*$
|
||||
- ^rally-jobs/.*$
|
||||
vars:
|
||||
BUILD_OVS_FROM_SOURCE: True
|
||||
Q_BUILD_OVS_FROM_GIT: True
|
||||
INSTALL_OVN: True
|
||||
OVN_BRANCH: v21.06.0
|
||||
OVS_BRANCH: v2.16.0
|
||||
@ -51,7 +51,7 @@
|
||||
parent: neutron-functional
|
||||
vars:
|
||||
tox_envlist: dsvm-fullstack-gate
|
||||
BUILD_OVS_FROM_SOURCE: False
|
||||
Q_BUILD_OVS_FROM_GIT: False
|
||||
INSTALL_OVN: False
|
||||
zuul_copy_output:
|
||||
# We need to copy directory with logs to have it in job artifacts also,
|
||||
|
Loading…
x
Reference in New Issue
Block a user