openstack/neutron
Code Issues Proposed changes

[Fullstack] Don't install OVN in the fullstack job

Browse Source 
It's not needed at all so if we avoid installation, especially from
sources, it may save us few minutes of the job's execution time.
It may also save some resources on the node.

To save a bit more time in the fullstack job's execution this patch also
disables compilation of the OVS from source in that job. We can use OVS
installed from packages provided by the distro instead.

Change-Id: Ic4b6740671e51f0d306967013e3d500f4d0cd6a5
This commit is contained in:
Slawek Kaplonski 2021-11-23 11:35:53 +01:00
parent 4b1bf15f7b
commit bedd24caff
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/configure_functional_tests/tasks/main.yaml
View File

@ -15,6 +15,8 @@
STACK_USER=stack STACK_USER=stack
OVS_BRANCH={{ OVS_BRANCH }} OVS_BRANCH={{ OVS_BRANCH }}
OVN_BRANCH={{ OVN_BRANCH }} OVN_BRANCH={{ OVN_BRANCH }}
BUILD_OVS_FROM_SOURCE={{ BUILD_OVS_FROM_SOURCE }}
INSTALL_OVN={{ INSTALL_OVN }}
# This is DB USER used in e.g. pgsql db # This is DB USER used in e.g. pgsql db
DATABASE_USER=openstack_citest DATABASE_USER=openstack_citest

8
tools/configure_for_func_testing.sh
View File

@ -65,6 +65,7 @@ INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
# The gate should automatically install dependencies. # The gate should automatically install dependencies.
INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE} INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
BUILD_OVS_FROM_SOURCE=${BUILD_OVS_FROM_SOURCE:-True} BUILD_OVS_FROM_SOURCE=${BUILD_OVS_FROM_SOURCE:-True}
INSTALL_OVN=${INSTALL_OVN:-True}
OVN_BRANCH=${OVN_BRANCH:-main} OVN_BRANCH=${OVN_BRANCH:-main}
OVS_BRANCH=${OVS_BRANCH:-master} OVS_BRANCH=${OVS_BRANCH:-master}
@ -112,9 +113,12 @@ function _install_base_deps {
install_package $PACKAGES install_package $PACKAGES
source $DEVSTACK_PATH/lib/neutron_plugins/ovn_agent source $DEVSTACK_PATH/lib/neutron_plugins/ovn_agent
echo_summary "OVN_BRANCH: ${OVN_BRANCH} OVS_BRANCH: ${OVS_BRANCH}" echo_summary "OVS_BRANCH: ${OVS_BRANCH}"
compile_ovs False /usr /var compile_ovs False /usr /var
compile_ovn False /usr /var if [[ "$INSTALL_OVN" == "True" ]]; then
echo_summary "OVN_BRANCH: ${OVN_BRANCH}"
compile_ovn False /usr /var
fi
else else
PACKAGES=$(get_packages general,neutron,q-agt,q-l3,openvswitch) PACKAGES=$(get_packages general,neutron,q-agt,q-l3,openvswitch)
PACKAGES=$(echo $PACKAGES | perl -pe 's|python-(?!dev)[^ ]*||g') PACKAGES=$(echo $PACKAGES | perl -pe 's|python-(?!dev)[^ ]*||g')

4
zuul.d/base.yaml
View File

@ -27,6 +27,8 @@
- ^roles/.*$ - ^roles/.*$
- ^rally-jobs/.*$ - ^rally-jobs/.*$
vars: vars:
BUILD_OVS_FROM_SOURCE: True
INSTALL_OVN: True
OVN_BRANCH: v21.06.0 OVN_BRANCH: v21.06.0
OVS_BRANCH: v2.16.0 OVS_BRANCH: v2.16.0
devstack_services: devstack_services:
@ -49,6 +51,8 @@
parent: neutron-functional parent: neutron-functional
vars: vars:
tox_envlist: dsvm-fullstack-gate tox_envlist: dsvm-fullstack-gate
BUILD_OVS_FROM_SOURCE: False
INSTALL_OVN: False
zuul_copy_output: zuul_copy_output:
# We need to copy directory with logs to have it in job artifacts also, # We need to copy directory with logs to have it in job artifacts also,
# /opt/stack/logs is default logs directory defined in neutron's # /opt/stack/logs is default logs directory defined in neutron's