test(NODE-3777): always bootstrap kms servers

mongodb · Feb 8, 2022 · 8219832 · 8219832
1 parent c8c4d2e
commit 8219832
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -108,7 +108,6 @@ functions:
         args:
           - .evergreen/run-kms-servers.sh
         env:
-          CLIENT_ENCRYPTION: ${CLIENT_ENCRYPTION}
           DRIVERS_TOOLS: ${DRIVERS_TOOLS}
   run tests:
     - command: shell.exec

diff --git a/.evergreen/config.yml.in b/.evergreen/config.yml.in
@@ -128,7 +128,6 @@ functions:
         args:
           - .evergreen/run-kms-servers.sh
         env:
-          CLIENT_ENCRYPTION: ${CLIENT_ENCRYPTION}
           DRIVERS_TOOLS: ${DRIVERS_TOOLS}
   "run tests":
     - command: shell.exec

diff --git a/.evergreen/run-kms-servers.sh b/.evergreen/run-kms-servers.sh
@@ -1,9 +1,7 @@
-if [ -n "${CLIENT_ENCRYPTION}" ]; then
-  cd ${DRIVERS_TOOLS}/.evergreen/csfle
-  . ./activate_venv.sh
-  # by default it always runs on port 5698
-  ./kmstlsvenv/bin/python3 -u kms_kmip_server.py &
-  ./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
-  ./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
-  ./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert &
-fi
+cd ${DRIVERS_TOOLS}/.evergreen/csfle
+. ./activate_venv.sh
+# by default it always runs on port 5698
+./kmstlsvenv/bin/python3 -u kms_kmip_server.py &
+./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
+./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
+./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert &