summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2018-02-21 09:53:34 +0000
committerGitHub <noreply@github.com>2018-02-21 09:53:34 +0000
commit0125889022d79b031b5a461ab9411b0f4df07eed (patch)
treeb97316a4ae77df3e4740352e80f3d0f81473721d
parentf901ea8e232a3c098d21ef21cf6adc3c7cb9f9ba (diff)
parentea5ca5745a6c3dfa597a2d7655b96ffdbdef35da (diff)
downloadchef-0125889022d79b031b5a461ab9411b0f4df07eed.tar.gz
Merge pull request #6862 from chef/shain/test_killer
Kill any orphaned tests
-rwxr-xr-xci/verify-chef.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index 528152b3b6..3a9bcf2111 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -8,6 +8,9 @@ export TMPDIR
sudo rm -rf $TMPDIR
mkdir -p $TMPDIR
+# Verify that we kill any orphaned test processes. Kill any orphaned rspec processes.
+ps ax | egrep 'rspec' | grep -v grep | awk '{ print $1 }' | xargs sudo kill -s KILL || true
+
# $PROJECT_NAME is set by Jenkins, this allows us to use the same script to verify
# Chef and Angry Chef
PATH=/opt/$PROJECT_NAME/bin:$PATH