Added cleanup stage

Author: papafe

evergreen/cleanup-proxy.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -o xtrace   # Write all commands first to stderr
+
+# Environment variables used as input:
+#   OS                                               The current operating system
+
+echo "Attempt to kill proxy server process if present on ${OS}"
+if [[ "$OS" =~ Windows|windows ]]; then
+  tasklist -FI "IMAGENAME eq python.exe"
+  taskkill -F -FI "IMAGENAME eq python.exe"
+  # check that it's actually killed
+  tasklist -FI "IMAGENAME eq python.exe"
+else
+  ps -ax | grep socks5srv.py
+  pkill -f 'socks5srv.py' || echo 'socks5srv.py was already killed or not launched'
+  # check that it's actually killed
+  ps -ax | grep socks5srv.py
+fi

evergreen/evergreen.yml

@@ -1074,7 +1074,7 @@ functions:
           TARGET="TestSocks5Proxy" \
             evergreen/run-tests.sh
           OS=${OS} \
-            evergreen/cleanup-test-resources.sh
+            evergreen/cleanup-proxy.sh
 pre:
   - func: fetch-source
   - func: prepare-resources