openstack/neutron
Code Issues Proposed changes

Merge "Enable dstat and memory_tracker in functional/fullstack jobs"

Browse Source
This commit is contained in:
Zuul 2022-04-11 19:48:04 +00:00 committed by Gerrit Code Review
commit 1fa2e49f01
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
OVS_BRANCH={{ OVS_BRANCH }} OVS_BRANCH={{ OVS_BRANCH }}
OVN_BRANCH={{ OVN_BRANCH }} OVN_BRANCH={{ OVN_BRANCH }}
Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }} Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }}
MEMORY_TRACKER={{ MEMORY_TRACKER }}
INSTALL_OVN={{ INSTALL_OVN }} 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

15
tools/configure_for_func_testing.sh
View File

@ -23,6 +23,7 @@ USE_CONSTRAINT_ENV=${USE_CONSTRAINT_ENV:-True}
MYSQL_USER=${MYSQL_USER:-root} MYSQL_USER=${MYSQL_USER:-root}
DATABASE_USER=${DATABASE_USER:-openstack_citest} DATABASE_USER=${DATABASE_USER:-openstack_citest}
DATABASE_NAME=${DATABASE_NAME:-openstack_citest} DATABASE_NAME=${DATABASE_NAME:-openstack_citest}
MEMORY_TRACKER=${MEMORY_TRACKER:-False}
if [[ "$IS_GATE" != "True" ]] && [[ "$#" -lt 1 ]]; then if [[ "$IS_GATE" != "True" ]] && [[ "$#" -lt 1 ]]; then
@ -279,6 +280,20 @@ function _install_post_devstack {
fi fi
enable_kernel_bridge_firewall enable_kernel_bridge_firewall
# install/start memory tracker service if enabled
if [[ "$MEMORY_TRACKER" == "True" ]]; then
# is_service_enabled checks for service into ENABLED_SERVICES
ENABLED_SERVICES+=,dstat,memory_tracker
source $DEVSTACK_PATH/lib/dstat
if is_ubuntu; then
install_package pcp
else
install_package pcp-system-tools
fi
install_dstat
start_dstat
fi
} }

1
zuul.d/base.yaml
View File

@ -36,6 +36,7 @@
vars: vars:
configure_swap_size: 8192 configure_swap_size: 8192
Q_BUILD_OVS_FROM_GIT: True Q_BUILD_OVS_FROM_GIT: True
MEMORY_TRACKER: True
INSTALL_OVN: True INSTALL_OVN: True
OVN_BRANCH: v21.06.0 OVN_BRANCH: v21.06.0
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87" OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"