Test FLE via docker

Author: p

.evergreen/config-atlas.yml

@@ -620,6 +620,10 @@ axes:
           display_name: debian10
           variables:
             DOCKER_DISTRO: debian10
+        - id: ubuntu1804
+          display_name: ubuntu1804
+          variables:
+            DOCKER_DISTRO: ubuntu1804
 
   - id: "compressor"
     display_name: Compressor

.evergreen/config.yml

@@ -475,6 +475,10 @@ tasks:
     commands:
       - func: "export FLE credentials"
       - func: "run tests"
+  - name: "test-fle-via-docker"
+    commands:
+      - func: "export FLE credentials"
+      - func: "run tests via docker"
   - name: "test-aws-auth"
     commands:
       - func: "export AWS auth credentials"
@@ -654,6 +658,10 @@ axes:
           display_name: debian10
           variables:
             DOCKER_DISTRO: debian10
+        - id: ubuntu1804
+          display_name: ubuntu1804
+          variables:
+            DOCKER_DISTRO: ubuntu1804
 
   - id: "compressor"
     display_name: Compressor
@@ -1277,8 +1285,6 @@ buildvariants:
   - matrix_name: "fle-4.4"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      # https://jira.mongodb.org/browse/RUBY-2832
-      # ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
       ruby: [ruby-3.0, ruby-2.7]
       topology: standalone
       mongodb-version: ['4.4']

.evergreen/config/axes.yml.erb

@@ -165,7 +165,7 @@ axes:
   - id: docker-distro
     display_name: Docker Distro
     values:
-      <% %w(debian92 debian10).each do |distro| %>
+      <% %w(debian92 debian10 ubuntu1804).each do |distro| %>
         - id: <%= distro %>
           display_name: <%= distro %>
           variables:

.evergreen/config/common.yml.erb

@@ -554,6 +554,10 @@ tasks:
     commands:
       - func: "export FLE credentials"
       - func: "run tests"
+  - name: "test-fle-via-docker"
+    commands:
+      - func: "export FLE credentials"
+      - func: "run tests via docker"
   - name: "test-aws-auth"
     commands:
       - func: "export AWS auth credentials"

.evergreen/config/standard.yml.erb

@@ -437,8 +437,6 @@ buildvariants:
   - matrix_name: "fle-4.4"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      # https://jira.mongodb.org/browse/RUBY-2832
-      # ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
       ruby: [ruby-3.0, ruby-2.7]
       topology: standalone
       mongodb-version: ['4.4']

.evergreen/run-tests-docker.sh

@@ -13,13 +13,17 @@ fi
 params=
 for var in MONGODB_VERSION TOPOLOGY RVM_RUBY \
   OCSP_ALGORITHM OCSP_STATUS OCSP_DELEGATE OCSP_MUST_STAPLE \
-  OCSP_CONNECTIVITY OCSP_VERIFIER
+  OCSP_CONNECTIVITY OCSP_VERIFIER FLE
 do
   value="${!var}"
   if test -n "$value"; then
     params="$params $var=${!var}"
   fi
 done
 
+if test -f .env.private; then
+  params="$params -a .env.private"
+fi
+
 # OCSP verifier tests need debian10 so that ocsp mock works
 ./.evergreen/test-on-docker -p -d $DOCKER_DISTRO $params