FLE with KMS in Docker support

Author: p

.evergreen/config/common.yml.erb

@@ -502,20 +502,6 @@ functions:
           ${PREPARE_SHELL}
           SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" MULTI_ATLASPROXY_SERVERLESS_URI="${MULTI_ATLASPROXY_SERVERLESS_URI}" SINGLE_ATLASPROXY_SERVERLESS_URI="${SINGLE_ATLASPROXY_SERVERLESS_URI}" .evergreen/run-tests-serverless.sh
 
-  "start kmip server":
-    - command: shell.exec
-      params:
-        background: true
-        shell: bash
-        working_dir: "src"
-        script: |
-          . .evergreen/csfle/activate_venv.sh
-          python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 7999 &
-          python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/expired.pem --port 8000 &
-          python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/wrong-host.pem --port 8001 &
-          python -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 8002 --require_client_cert &
-          python -u .evergreen/csfle/kms_kmip_server.py &
-
 pre:
   - func: "fetch source"
   - func: "fetch egos"
@@ -561,7 +547,6 @@ tasks:
   - name: "test-fle"
     commands:
       - func: "export FLE credentials"
-      - func: "start kmip server"
       - func: "run tests"
   - name: "test-aws-auth"
     commands:

.evergreen/run-tests.sh

@@ -134,6 +134,17 @@ elif test "$AUTH" = kerberos; then
 fi
 
 if test -n "$FLE"; then
+  # Start the KMS servers first so that they are launching while we are
+  # fetching libmongocrypt.
+  if test "$DOCKER_PRELOAD" != 1; then
+    . .evergreen/csfle/activate_venv.sh
+  fi
+  python3 -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 7999 &
+  python3 -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/expired.pem --port 8000 &
+  python3 -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/wrong-host.pem --port 8001 &
+  python3 -u .evergreen/csfle/kms_http_server.py --ca_file .evergreen/x509gen/ca.pem --cert_file .evergreen/x509gen/server.pem --port 8002 --require_client_cert &
+  python3 -u .evergreen/csfle/kms_kmip_server.py &
+  
   curl --retry 3 -fLo libmongocrypt-all.tar.gz "https://s3.amazonaws.com/mciuploads/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz"
   tar xf libmongocrypt-all.tar.gz