fixups

Author: blink1073

.evergreen/scripts/bootstrap-mongo-orchestration.sh

@@ -34,10 +34,10 @@ if [ -z "${TEST_CRYPT_SHARED:-}" ]; then
     export SKIP_CRYPT_SHARED=1
 fi
 
-MONGODB_VERSION=${VERSION} \
-    TOPOLOGY=${TOPOLOGY} \
-    AUTH=${AUTH:-noauth} \
-    SSL=${SSL:-nossl} \
+MONGODB_VERSION=${VERSION:-} \
+    TOPOLOGY=${TOPOLOGY:-} \
+    AUTH=${AUTH:-} \
+    SSL=${SSL:-} \
     STORAGE_ENGINE=${STORAGE_ENGINE:-} \
     DISABLE_TEST_COMMANDS=${DISABLE_TEST_COMMANDS:-} \
     ORCHESTRATION_FILE=${ORCHESTRATION_FILE:-} \

.evergreen/scripts/setup_tests.py

@@ -353,7 +353,7 @@ def handle_test_env() -> None:
             write_env("LD_LIBRARY_PATH", f"{CRYPT_SHARED_DIR}:${{LD_LIBRARY_PATH:-}}")
 
     if test_name == "kms":
-        from .setup_kms import setup_kms
+        from setup_kms import setup_kms
 
         setup_kms(sub_test_name)