From afe975270f62b3568dd1a65c6aa98452e3067838 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 23 Feb 2016 23:08:08 -0500 Subject: [PATCH] run_tests: run dstat before r10k'ing modules r10k install is randomling taking lot of time ot be installed [1]. This patch executes dstat before installing r10k & puppet modules, so we can see in dstat logs what is consumming CPU & memory during r10k setup. (1] http://goo.gl/XJ9xky) Change-Id: Ie98bede043339b47e9e928e5c964a6ba70090860 --- run_tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 89d113025..22ce78835 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -63,15 +63,15 @@ elif is_fedora; then $SUDO yum install -y dstat puppet fi -if [ "${MANAGE_PUPPET_MODULES}" = true ]; then - $SUDO ./install_modules.sh -fi - # use dstat to monitor system activity during integration testing if type "dstat" 2>/dev/null; then $SUDO dstat -tcmndrylpg --top-cpu-adv --top-io-adv --nocolor | $SUDO tee --append /var/log/dstat.log > /dev/null & fi +if [ "${MANAGE_PUPPET_MODULES}" = true ]; then + $SUDO ./install_modules.sh +fi + # Run puppet and assert something changes. set +e if [ "${MANAGE_REPOS}" = true ]; then