Skip to content

Commit 4897ee4

Browse files
p-mongop
andauthored
RUBY-2832 Test FLE via docker (#2401)
Co-authored-by: Oleg Pudeyev <[email protected]>
1 parent 60af931 commit 4897ee4

File tree

5 files changed

+22
-2
lines changed

5 files changed

+22
-2
lines changed

.evergreen/config-atlas.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,10 @@ axes:
630630
display_name: debian10
631631
variables:
632632
DOCKER_DISTRO: debian10
633+
- id: ubuntu1804
634+
display_name: ubuntu1804
635+
variables:
636+
DOCKER_DISTRO: ubuntu1804
633637

634638
- id: "compressor"
635639
display_name: Compressor

.evergreen/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,10 @@ tasks:
475475
commands:
476476
- func: "export FLE credentials"
477477
- func: "run tests"
478+
- name: "test-fle-via-docker"
479+
commands:
480+
- func: "export FLE credentials"
481+
- func: "run tests via docker"
478482
- name: "test-aws-auth"
479483
commands:
480484
- func: "export AWS auth credentials"
@@ -664,6 +668,10 @@ axes:
664668
display_name: debian10
665669
variables:
666670
DOCKER_DISTRO: debian10
671+
- id: ubuntu1804
672+
display_name: ubuntu1804
673+
variables:
674+
DOCKER_DISTRO: ubuntu1804
667675

668676
- id: "compressor"
669677
display_name: Compressor

.evergreen/config/axes.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ axes:
175175
- id: docker-distro
176176
display_name: Docker Distro
177177
values:
178-
<% %w(debian92 debian10).each do |distro| %>
178+
<% %w(debian92 debian10 ubuntu1804).each do |distro| %>
179179
- id: <%= distro %>
180180
display_name: <%= distro %>
181181
variables:

.evergreen/config/common.yml.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,10 @@ tasks:
554554
commands:
555555
- func: "export FLE credentials"
556556
- func: "run tests"
557+
- name: "test-fle-via-docker"
558+
commands:
559+
- func: "export FLE credentials"
560+
- func: "run tests via docker"
557561
- name: "test-aws-auth"
558562
commands:
559563
- func: "export AWS auth credentials"

.evergreen/run-tests-docker.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ fi
1313
params=
1414
for var in MONGODB_VERSION TOPOLOGY RVM_RUBY \
1515
OCSP_ALGORITHM OCSP_STATUS OCSP_DELEGATE OCSP_MUST_STAPLE \
16-
OCSP_CONNECTIVITY OCSP_VERIFIER
16+
OCSP_CONNECTIVITY OCSP_VERIFIER FLE
1717
do
1818
value="${!var}"
1919
if test -n "$value"; then
2020
params="$params $var=${!var}"
2121
fi
2222
done
2323

24+
if test -f .env.private; then
25+
params="$params -a .env.private"
26+
fi
27+
2428
# OCSP verifier tests need debian10 so that ocsp mock works
2529
./.evergreen/test-on-docker -p -d $DOCKER_DISTRO $params

0 commit comments

Comments
 (0)