Stop dstat at the end of a job

We should stop the dstat process that was previously started in toci_gate_test.sh, so that processes aren't left running from tripleo-ci jobs. Change-Id: I200fe5f99d371fdde3b20518ffd10197680d46dd
slagle · Mar 30, 2017 · 096b6ab · 096b6ab
1 parent 1ef798b
commit 096b6ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh
@@ -432,3 +432,7 @@ function can_promote {
         return 1
     fi
 }
+
+function stop_dstat {
+	ps axjf | grep bin/dstat | grep -v grep | awk '{print $2;}' | sudo xargs -t -n 1 -r kill
+}
diff --git a/toci_instack_osinfra.sh b/toci_instack_osinfra.sh
@@ -52,7 +52,7 @@ sudo yum -y install python-requests
 # Open up port for delorean yum repo server
 sudo iptables -I INPUT -p tcp --dport 8766 -j ACCEPT
 
-trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci \$exit_val 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1" EXIT
+trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci \$exit_val 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1; stop_dstat" EXIT
 
 # Tempreverts/cherry-picks/pins go here.  For example:
 # temprevert tripleo-common af27127508eabf2b6873713e5e1507fa92b5f5b3 1623606

diff --git a/toci_instack_ovb.sh b/toci_instack_ovb.sh
@@ -62,7 +62,7 @@ done
 # Install some useful/necessary packages
 sudo yum -y install wget python-simplejson yum-plugin-priorities qemu-img
 
-trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci \$exit_val 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1" EXIT
+trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci \$exit_val 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1; stop_dstat" EXIT
 
 # Tempreverts/cherry-picks/pins go here.  For example:
 # temprevert tripleo-common af27127508eabf2b6873713e5e1507fa92b5f5b3 1623606