Corrections to scripts

Author: papafe

evergreen/evergreen.yml

@@ -386,9 +386,15 @@ functions:
           ${PREPARE_SHELL}
           OS=${OS} \
             evergreen/add-ca-certs.sh
+          CLIENT_PEM_VAR_NAME="CLIENT_NO_USER_PEM" \
+          FRIENDLY_NAME="Drivers No-User Client Certificate" \
+          P12_FILENAME="client_no_user.p12" \
+          OUT_CLIENT_PASSWORD_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PASSWORD" \
+          OUT_CLIENT_PATH_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PATH" \
+          CLIENT_NO_USER_PEM=${DRIVERS_TOOLS}/CLIENT_NO_USER_CERT.pem \
+            source evergreen/convert-client-cert-to-pkcs12.sh
           MONGODB_URI="$ATLAS_X509_DEV" \
           CLIENT_PEM=${DRIVERS_TOOLS}/CLIENT_CERT.pem \
-          CLIENT_NO_USER_PEM=${DRIVERS_TOOLS}/CLIENT_NO_USER_CERT.pem \
           TOPOLOGY=${TOPOLOGY} \
           OS=${OS} \
           FRAMEWORK=${FRAMEWORK} \

evergreen/run-tests.sh

@@ -29,7 +29,6 @@ TOPOLOGY=${TOPOLOGY:-server}
 COMPRESSOR=${COMPRESSOR:-none}
 OCSP_TLS_SHOULD_SUCCEED=${OCSP_TLS_SHOULD_SUCCEED:-nil}
 CLIENT_PEM=${CLIENT_PEM:-nil}
-CLIENT_NO_USER_PEM=${CLIENT_NO_USER_PEM:-nil}
 PLATFORM=${PLATFORM:-nil}
 TARGET=${TARGET:-Test}
 FRAMEWORK=${FRAMEWORK:-nil}
@@ -134,16 +133,6 @@ if [[ "$CLIENT_PEM" != "nil" ]]; then
   CLIENT_PEM=${CLIENT_PEM} source evergreen/convert-client-cert-to-pkcs12.sh
 fi
 
-#TODO need to remove this from here
-if [[ "$CLIENT_NO_USER_PEM" != "nil" ]]; then
-  export CLIENT_PEM_VAR_NAME="CLIENT_NO_USER_PEM"
-  export FRIENDLY_NAME="Drivers No-User Client Certificate"
-  export P12_FILENAME="client_no_user.p12"
-  export OUT_CLIENT_PASSWORD_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PASSWORD"
-  export OUT_CLIENT_PATH_VAR="MONGO_X509_CLIENT_NO_USER_CERTIFICATE_PATH"
-  CLIENT_NO_USER_PEM=${CLIENT_NO_USER_PEM} source evergreen/convert-client-cert-to-pkcs12.sh
-fi
-
 if [[ -z "$MONGO_X509_CLIENT_CERTIFICATE_PATH" && -z "$MONGO_X509_CLIENT_CERTIFICATE_PASSWORD" ]]; then
     # technically the above condiion will be always true since CLIENT_PEM is always set and
     # convert-client-cert-to-pkcs12 always assigns these env variables, but leaving this condition in case