Merge "Enable dstat and memory_tracker in functional/fullstack jobs" into stable/xena

roles/configure_functional_tests/tasks/main.yaml

@@ -16,6 +16,7 @@
         OVS_BRANCH={{ OVS_BRANCH }}
         OVN_BRANCH={{ OVN_BRANCH }}
         Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }}
+        MEMORY_TRACKER={{ MEMORY_TRACKER }}
         # This is DB USER used in e.g. pgsql db
         DATABASE_USER=openstack_citest
 

tools/configure_for_func_testing.sh

@@ -23,6 +23,7 @@ USE_CONSTRAINT_ENV=${USE_CONSTRAINT_ENV:-True}
 MYSQL_USER=${MYSQL_USER:-root}
 DATABASE_USER=${DATABASE_USER:-openstack_citest}
 DATABASE_NAME=${DATABASE_NAME:-openstack_citest}
+MEMORY_TRACKER=${MEMORY_TRACKER:-False}
 
 
 if [[ "$IS_GATE" != "True" ]] && [[ "$#" -lt 1 ]]; then
@@ -275,6 +276,20 @@ function _install_post_devstack {
     fi
 
     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
 }
 
 

zuul.d/base.yaml

@@ -36,6 +36,7 @@
     vars:
       configure_swap_size: 8192
       Q_BUILD_OVS_FROM_GIT: True
+      MEMORY_TRACKER: True
       OVN_BRANCH: v21.06.0
       OVS_BRANCH: v2.16.0
       devstack_services: