CSHARP-2965: Minimize chances of cert removal timing out in tests

Author: vincentkam

evergreen/add-certs.sh evergreen/add-certs-if-needed.shevergreen/add-certs.sh renamed to evergreen/add-certs-if-needed.sh

@@ -3,13 +3,23 @@
 set -o xtrace   # Write all commands first to stderr
 set -o errexit  # Exit the script with an error if any of the commands fail
 
+# Supported/used environment variables:
+#     SSL                     Set to enable SSL. Values are "ssl" / "nossl" (default)
+#     OCSP_TLS_SHOULD_SUCCEED Set to test OCSP. Values are true/false/nil
+#     OCSP_ALGORITHM          Set to test OCSP. Values are rsa/ecdsa/nil
+
+SSL=${SSL:-nossl}
 OCSP_TLS_SHOULD_SUCCEED=${OCSP_TLS_SHOULD_SUCCEED:-nil}
 OCSP_ALGORITHM=${OCSP_ALGORITHM:-nil}
 
+if [[ "$SSL" != "ssl" ]]; then
+  exit 0
+fi
+
 if [[ "$OS" =~ Windows|windows ]]; then
     certutil.exe -addstore "Root" ${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem
 
-  if [ "$OCSP_TLS_SHOULD_SUCCEED" != "nil" ] && [ "$OCSP_ALGORITHM" != "nil" ]; then
+  if [[ "$OCSP_TLS_SHOULD_SUCCEED" != "nil" && "$OCSP_ALGORITHM" != "nil" ]]; then
     certutil.exe -addstore "Root" ${DRIVERS_TOOLS}/.evergreen/ocsp/${OCSP_ALGORITHM}/ca.pem
   fi
 fi

evergreen/evergreen.yml

@@ -239,9 +239,9 @@ functions:
           export FLE_AWS_ACCESS_KEY_ID=${FLE_AWS_ACCESS_KEY_ID}
           export FLE_AWS_SECRET_ACCESS_KEY=${FLE_AWS_SECRET_ACCESS_KEY}
           ${PREPARE_SHELL}
-          evergreen/add-certs.sh
+          SSL=${SSL} evergreen/add-certs-if-needed.sh
           AUTH=${AUTH} SSL=${SSL} MONGODB_URI="${MONGODB_URI}" TOPOLOGY=${TOPOLOGY} OS=${OS} COMPRESSOR=${COMPRESSOR} evergreen/run-tests.sh
-          evergreen/remove-certs.sh
+          echo "Skipping certificate removal..."
 
   run-atlas-connectivity-tests:
     - command: shell.exec
@@ -417,15 +417,16 @@ functions:
           ${PREPARE_SHELL}
           OCSP_TLS_SHOULD_SUCCEED="${OCSP_TLS_SHOULD_SUCCEED}" \
             OCSP_ALGORITHM=${OCSP_ALGORITHM} \
-            evergreen/add-certs.sh
+            SSL="ssl" \
+            evergreen/add-certs-if-needed.sh
           set +o xtrace
           AUTH="${AUTH}" \
             SSL="ssl" \
             TOPOLOGY="${TOPOLOGY}" \
             MONGODB_URI="${MONGODB_URI}" \
             OCSP_TLS_SHOULD_SUCCEED="${OCSP_TLS_SHOULD_SUCCEED}" \
               evergreen/run-tests.sh
-          evergreen/remove-certs.sh
+          echo "Skipping certificate removal..."
 
   run-valid-ocsp-server-ca-responder:
     - command: shell.exec