From 50f29f732461f6d7ea8cca79d4e30d64ec3480a7 Mon Sep 17 00:00:00 2001
From: Santosh Yadav <santosh.yadav198613@gmail.com>
Date: Sat, 23 Mar 2019 00:06:16 +0530
Subject: [PATCH] bug: Kill verdaccio in CI tasks cleanup

Fixes #6663
---
 tasks/e2e-behavior.sh          | 1 +
 tasks/e2e-installs.sh          | 1 +
 tasks/e2e-kitchensink-eject.sh | 1 +
 tasks/e2e-kitchensink.sh       | 1 +
 tasks/e2e-simple.sh            | 1 +
 5 files changed, 5 insertions(+)

diff --git a/tasks/e2e-behavior.sh b/tasks/e2e-behavior.sh
index 1ca2e012a2e..93a49e5b6b3 100755
--- a/tasks/e2e-behavior.sh
+++ b/tasks/e2e-behavior.sh
@@ -22,6 +22,7 @@ original_yarn_registry_url=`yarn config get registry`
 
 function cleanup {
   echo 'Cleaning up.'
+  ps -ef | grep 'verdaccio' | grep -v grep | awk '{print $2}' | xargs kill -9
   ps -ef | grep 'react-scripts' | grep -v grep | awk '{print $2}' | xargs kill -9
   cd "$root_path"
   npm set registry "$original_npm_registry_url"
diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
index 2009ae9a569..ee4ad248e2b 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -21,6 +21,7 @@ original_yarn_registry_url=`yarn config get registry`
 
 function cleanup {
   echo 'Cleaning up.'
+  ps -ef | grep 'verdaccio' | grep -v grep | awk '{print $2}' | xargs kill -9
   cd "$root_path"
   rm -rf "$temp_app_path"
   npm set registry "$original_npm_registry_url"
diff --git a/tasks/e2e-kitchensink-eject.sh b/tasks/e2e-kitchensink-eject.sh
index 9cb79e69376..fd37917db76 100755
--- a/tasks/e2e-kitchensink-eject.sh
+++ b/tasks/e2e-kitchensink-eject.sh
@@ -23,6 +23,7 @@ original_yarn_registry_url=`yarn config get registry`
 function cleanup {
   echo 'Cleaning up.'
   unset BROWSERSLIST
+  ps -ef | grep 'verdaccio' | grep -v grep | awk '{print $2}' | xargs kill -9
   ps -ef | grep 'react-scripts' | grep -v grep | awk '{print $2}' | xargs kill -9
   cd "$root_path"
   # TODO: fix "Device or resource busy" and remove ``|| $CI`
diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index b57e4550c88..d9810d67941 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -23,6 +23,7 @@ original_yarn_registry_url=`yarn config get registry`
 function cleanup {
   echo 'Cleaning up.'
   unset BROWSERSLIST
+  ps -ef | grep 'verdaccio' | grep -v grep | awk '{print $2}' | xargs kill -9
   ps -ef | grep 'react-scripts' | grep -v grep | awk '{print $2}' | xargs kill -9
   cd "$root_path"
   # TODO: fix "Device or resource busy" and remove ``|| $CI`
diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh
index 15564584d49..2b8345d1282 100755
--- a/tasks/e2e-simple.sh
+++ b/tasks/e2e-simple.sh
@@ -21,6 +21,7 @@ original_yarn_registry_url=`yarn config get registry`
 
 function cleanup {
   echo 'Cleaning up.'
+  ps -ef | grep 'verdaccio' | grep -v grep | awk '{print $2}' | xargs kill -9
   cd "$root_path"
   # Uncomment when snapshot testing is enabled by default:
   # rm ./packages/react-scripts/template/src/__snapshots__/App.test.js.snap